Return better error when account exists when attempting oauth account create.

1 files changed, 9 insertions, 4 deletions

diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index 0c87fe0d9ae..477743b34c8 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -45,14 +45,19 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
       # Create user if does not exist
       # and allow_single_sign_on is true
-      if Gitlab.config.omniauth['allow_single_sign_on']
-        @user ||= Gitlab::OAuth::User.create(oauth)
+      if Gitlab.config.omniauth['allow_single_sign_on'] && !@user
+        @user, errors = Gitlab::OAuth::User.create(oauth)
       end
 
-      if @user
+      if @user && !errors
         sign_in_and_redirect(@user)
       else
-        flash[:notice] = "There's no such user!"
+        if errors
+          error_message = errors.map{ |attribute, message| "#{attribute} #{message}" }.join(", ")
+          flash[:notice] = "There was a problem creating your account. #{error_message}"
+        else
+          flash[:notice] = "There's no such user!"
+        end
         redirect_to new_user_session_path
       end
     end