Commit a4620e89 authored by Rémy Coutable's avatar Rémy Coutable
Browse files

Minimize CE/EE difference in Gitlab::Auth::UserAuthFinders


Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 7a491e2f1dc9
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment