Renames confirmed_oauth_email to oauth_email

Refactors the way oauth_email is used to cover more cases (fixes pending specs)

app/controllers/users/omniauth_callbacks_controller.rb

@@ -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
 

app/controllers/users/registrations_controller.rb

@@ -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

app/models/user.rb

@@ -52,16 +52,16 @@ class User < ActiveRecord::Base
   # Get the existing user by email if the provider gives us a verified email.
   def self.first_or_initialize_for_oauth(auth)
     oauth_email           = auth.info.email
-    confirmed_oauth_email = oauth_email if auth.info.verified || auth.info.verified_email
-    oauth_user            = User.find_by(email: confirmed_oauth_email) if confirmed_oauth_email.present?
+    oauth_email_confirmed = auth.info.verified || auth.info.verified_email
+    oauth_user            = User.find_by(email: oauth_email) if oauth_email_confirmed
 
     oauth_user || User.new(
       username:  auth.info.name || auth.uid,
       email: oauth_email,
-      confirmed_oauth_email: confirmed_oauth_email,
+      oauth_email: oauth_email,
       password: Devise.friendly_token[0,20],
       terms_of_service: '1',
-      confirmed_at: confirmed_oauth_email.present? ? DateTime.now : nil
+      confirmed_at: oauth_email_confirmed ? DateTime.now : nil
     )
   end
 
@@ -174,11 +174,6 @@ class User < ActiveRecord::Base
     !erased? && !registering_with_oauth
   end
 
-  # Deactivates the email uniqueness validation when registering with oauth
-  def email_changed?
-    !registering_with_oauth && super
-  end
-
   def has_official_email?
     domain = Setting['email_domain_for_officials']
     !email.blank? && ( (email.end_with? "@#{domain}") || (email.end_with? ".#{domain}") )