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

Corrects the logic dealing with confirmations of users via oauth

Browse Source
This commit is contained in:
kikito
2016-01-25 12:13:25 +01:00
parent 248bff712c
commit 98f99954e7
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,10 +30,16 @@ class Users::RegistrationsController < Devise::RegistrationsController
def do_finish_signup
current_user.registering_with_oauth = false
current_user.validate
should_send_confirmation = current_user.errors.include? :email
if current_user.update(sign_up_params)
current_user.send_confirmation_instructions if should_send_confirmation
if current_user.confirmed_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)
end
sign_in_and_redirect current_user, event: :authentication
else
render :finish_signup