consul/grecia
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

29
app/controllers/users/omniauth_callbacks_controller.rb
View File

@@ -32,23 +32,26 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
# If there are no problems with the email/username, then they were provided by oauth or they
# correspond to an existing user. Associate the identity and sign in
if @user.save
unless @user.save
# If either the username or email have provoked a failure, we save the user anyway (but marked for revision)
# This mark will be detected by applicationcontroller and the user will be redirected to finish_signup
@user.registering_with_oauth = true
unless @user.save
# If we still can't save the user, the email might be invalidating devise's validatable "unique"
# constraint. Set email to nil and try again (we'll reset later using oauth_email)
@user.email = nil
@user.save
end
end
if @user.persisted?
identity.update(user: @user)
sign_in_and_redirect @user, event: :authentication
set_flash_message(:notice, :success, kind: "#{provider}".capitalize) if is_navigational_format?
else
# If either the username or email have provoked a failure, we save the user anyway (but marked for revision)
# This mark will be detected by applicationcontroller and the user will be redirected to finish_signup
@user.registering_with_oauth = true
if @user.save
identity.update(user: @user)
sign_in_and_redirect @user, event: :authentication
set_flash_message(:notice, :success, kind: "#{provider}".capitalize) if is_navigational_format?
else
# If the failure is because something else happens, just present the "new user" form
session["devise.#{provider}_data"] = auth
redirect_to new_user_registration_url
end
# If the failure is because something else happens, just present the "new user" form
session["devise.#{provider}_data"] = auth
redirect_to new_user_registration_url
end
end