diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-02 18:25:42 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-02 18:25:42 +0300 |
| commit | 56dccc2e1089e2866d0442cac379b3f93c98a55f (patch) | |
| tree | 7600acfcf7de21ab4a5470c3653ea3ddcd91f13c /app/services | |
| parent | 983436375690348c88fa79e4974c5267afb5b0ce (diff) | |
| parent | d0af6047bcaa336a829d04786496db6d263ea0a4 (diff) | |
Merge branch 'dm-remove-private-token' into 'master'
Remove Private Tokens
Closes #38595 and #38447
See merge request gitlab-org/gitlab-ce!14838
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/access_token_validation_service.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/services/access_token_validation_service.rb b/app/services/access_token_validation_service.rb index 9c00ea789ec..46e19230328 100644 --- a/app/services/access_token_validation_service.rb +++ b/app/services/access_token_validation_service.rb @@ -39,11 +39,8 @@ class AccessTokenValidationService token_scopes = token.scopes.map(&:to_sym) required_scopes.any? do |scope| - if scope.respond_to?(:sufficient?) - scope.sufficient?(token_scopes, request) - else - API::Scope.new(scope).sufficient?(token_scopes, request) - end + scope = API::Scope.new(scope) unless scope.is_a?(API::Scope) + scope.sufficient?(token_scopes, request) end end end |