kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Backport IdentityLinker#failed? from GroupSaml callback flow

Browse source
This commit is contained in:
James Edwards-Jones 2018-04-23 00:05:12 +01:00
parent 4bf47cd76f
commit 7425f2b322
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/omniauth_callbacks_controller.rb
View file

@ -82,7 +82,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
if identity_linker.changed?
redirect_identity_linked
elsif identity_linker.error_message.present?
elsif identity_linker.failed?
redirect_identity_link_failed(identity_linker.error_message)
else
redirect_identity_exists

4
lib/gitlab/auth/omniauth_identity_linker_base.rb
View file

@ -17,6 +17,10 @@ module Gitlab
@changed
end
def failed?
error_message.present?
end
def error_message
identity.validate