Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
-rw-r--r--app/controllers/omniauth_callbacks_controller.rb18
1 files changed, 17 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index f22cf3ad3d7..755ce3463c4 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -75,6 +75,14 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
end
end
+ def salesforce
+ if oauth.dig('extra', 'email_verified')
+ handle_omniauth
+ else
+ fail_salesforce_login
+ end
+ end
+
private
def omniauth_flow(auth_module, identity_linker: nil)
@@ -174,7 +182,15 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
end
def fail_auth0_login
- flash[:alert] = _('Wrong extern UID provided. Make sure Auth0 is configured correctly.')
+ fail_login_with_message(_('Wrong extern UID provided. Make sure Auth0 is configured correctly.'))
+ end
+
+ def fail_salesforce_login
+ fail_login_with_message(_('Email not verified. Please verify your email in Salesforce.'))
+ end
+
+ def fail_login_with_message(message)
+ flash[:alert] = message
redirect_to new_user_session_path
end