Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
66df2f1de13e
Commit
b0617c91
authored
Apr 23, 2018
by
James Edwards-Jones
Browse files
Backport IdentityLinker#failed? from GroupSaml callback flow
parent
348d1e41cfd2
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/controllers/omniauth_callbacks_controller.rb
View file @
66df2f1d
...
...
@@ -82,7 +82,7 @@ def omniauth_flow(auth_module, identity_linker: nil)
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
...
...
lib/gitlab/auth/omniauth_identity_linker_base.rb
View file @
66df2f1d
...
...
@@ -17,6 +17,10 @@ def changed?
@changed
end
def
failed?
error_message
.
present?
end
def
error_message
identity
.
validate
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment