Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
24f3f960
Commit
24f3f960
authored
Feb 06, 2019
by
James Edwards-Jones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport build_auth_user for GroupSAML callback
parent
0ef68a58
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
app/controllers/omniauth_callbacks_controller.rb
app/controllers/omniauth_callbacks_controller.rb
+5
-1
No files found.
app/controllers/omniauth_callbacks_controller.rb
View file @
24f3f960
...
@@ -116,8 +116,12 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
...
@@ -116,8 +116,12 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
session
[
:service_tickets
][
provider
]
=
ticket
session
[
:service_tickets
][
provider
]
=
ticket
end
end
def
build_auth_user
(
auth_user_class
)
auth_user_class
.
new
(
oauth
)
end
def
sign_in_user_flow
(
auth_user_class
)
def
sign_in_user_flow
(
auth_user_class
)
auth_user
=
auth_user_class
.
new
(
oauth
)
auth_user
=
build_auth_user
(
auth_user_class
)
user
=
auth_user
.
find_and_update!
user
=
auth_user
.
find_and_update!
if
auth_user
.
valid_sign_in?
if
auth_user
.
valid_sign_in?
...
...
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