diff options
author | Rémy Coutable <remy@rymai.me> | 2018-05-18 14:00:44 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-05-18 16:30:53 +0200 |
commit | dfdbf198b34075d0d7c88130ba3a082083e905c1 (patch) | |
tree | 49537b43451b628d7778882f5152c81a2c1ac25e | |
parent | 37cd2b9b4dcf4c0145fd1bc2e19c8e903b4fd4fa (diff) | |
download | gitlab-ce-dfdbf198b34075d0d7c88130ba3a082083e905c1.tar.gz |
Minimize CE/EE difference in Gitlab::Auth::UserAuthFinders
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r-- | lib/gitlab/auth/user_auth_finders.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/gitlab/auth/user_auth_finders.rb b/lib/gitlab/auth/user_auth_finders.rb index cf02030c577..4dc23f977da 100644 --- a/lib/gitlab/auth/user_auth_finders.rb +++ b/lib/gitlab/auth/user_auth_finders.rb @@ -1,9 +1,5 @@ module Gitlab module Auth - # - # Exceptions - # - AuthenticationError = Class.new(StandardError) MissingTokenError = Class.new(AuthenticationError) TokenNotFoundError = Class.new(AuthenticationError) @@ -61,6 +57,12 @@ module Gitlab private + def route_authentication_setting + return {} unless respond_to?(:route_setting) + + route_setting(:authentication) || {} + end + def access_token strong_memoize(:access_token) do find_oauth_access_token || find_personal_access_token |