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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
ae06ea33
Commit
ae06ea33
authored
Feb 28, 2019
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Override oath token finder
parent
ecf209b5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
ee/lib/ee/gitlab/auth/user_auth_finders.rb
ee/lib/ee/gitlab/auth/user_auth_finders.rb
+12
-0
No files found.
ee/lib/ee/gitlab/auth/user_auth_finders.rb
View file @
ae06ea33
...
...
@@ -5,6 +5,7 @@ module EE
module
Auth
module
UserAuthFinders
extend
ActiveSupport
::
Concern
extend
::
Gitlab
::
Utils
::
Override
JOB_TOKEN_HEADER
=
"HTTP_JOB_TOKEN"
.
freeze
JOB_TOKEN_PARAM
=
:job_token
...
...
@@ -22,6 +23,17 @@ module EE
job
.
user
end
override
:find_oauth_access_token
def
find_oauth_access_token
return
if
scim_request?
super
end
def
scim_request?
current_request
.
path
.
starts_with?
(
"/api/scim/"
)
end
end
end
end
...
...
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