Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
2e32a51433aa
Commit
a4620e89
authored
May 18, 2018
by
Rémy Coutable
Browse files
Minimize CE/EE difference in Gitlab::Auth::UserAuthFinders
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
7a491e2f1dc9
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/gitlab/auth/user_auth_finders.rb
View file @
2e32a514
module
Gitlab
module
Gitlab
module
Auth
module
Auth
#
# Exceptions
#
AuthenticationError
=
Class
.
new
(
StandardError
)
AuthenticationError
=
Class
.
new
(
StandardError
)
MissingTokenError
=
Class
.
new
(
AuthenticationError
)
MissingTokenError
=
Class
.
new
(
AuthenticationError
)
TokenNotFoundError
=
Class
.
new
(
AuthenticationError
)
TokenNotFoundError
=
Class
.
new
(
AuthenticationError
)
...
@@ -61,6 +57,12 @@ def validate_access_token!(scopes: [])
...
@@ -61,6 +57,12 @@ def validate_access_token!(scopes: [])
private
private
def
route_authentication_setting
return
{}
unless
respond_to?
(
:route_setting
)
route_setting
(
:authentication
)
||
{}
end
def
access_token
def
access_token
strong_memoize
(
:access_token
)
do
strong_memoize
(
:access_token
)
do
find_oauth_access_token
||
find_personal_access_token
find_oauth_access_token
||
find_personal_access_token
...
...
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