consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renames confirmed_oauth_email to oauth_email

Browse Source 
Refactors the way oauth_email is used to cover more cases (fixes pending specs)
This commit is contained in:
kikito
2016-01-26 12:44:55 +01:00
parent 92786764b7
commit a606c7aa8d
5 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/users/registrations_controller.rb
View File

@@ -25,6 +25,7 @@ class Users::RegistrationsController < Devise::RegistrationsController
def finish_signup
current_user.registering_with_oauth = false
current_user.email = current_user.oauth_email if current_user.email.blank?
current_user.validate
end
@@ -32,12 +33,12 @@ class Users::RegistrationsController < Devise::RegistrationsController
current_user.registering_with_oauth = false
if current_user.update(sign_up_params)
if current_user.confirmed_oauth_email != current_user.email
if current_user.oauth_email != current_user.email
current_user.update(confirmed_at: nil)
current_user.send_confirmation_instructions
end
if current_user.confirmed_oauth_email.present?
current_user.update(confirmed_oauth_email: nil)
if current_user.oauth_email.present?
current_user.update(oauth_email: nil)
end
sign_in_and_redirect current_user, event: :authentication