diff options
author | Timothy Andrew <mail@timothyandrew.net> | 2016-12-05 22:55:53 +0530 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2016-12-16 16:29:32 +0530 |
commit | b303948ff549ce57d3b6985c2c366dfcdc5a2ca3 (patch) | |
tree | 3d286b8704e63cf8c26b10a1f0c538d77f24ab6b /lib/api | |
parent | f706a973c26f9de9a1f1599d532b33e9e66a80bb (diff) | |
download | gitlab-ce-b303948ff549ce57d3b6985c2c366dfcdc5a2ca3.tar.gz |
Convert AccessTokenValidationService into a class.
- Previously, AccessTokenValidationService was a module, and all its public
methods accepted a token. It makes sense to convert it to a class which accepts
a token during initialization.
- Also rename the `sufficient_scope?` method to `include_any_scope?`
- Based on feedback from @rymai
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/api_guard.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/api_guard.rb b/lib/api/api_guard.rb index 563224a580f..df6db140d0e 100644 --- a/lib/api/api_guard.rb +++ b/lib/api/api_guard.rb @@ -47,7 +47,7 @@ module API access_token = find_access_token return nil unless access_token - case AccessTokenValidationService.validate(access_token, scopes: scopes) + case AccessTokenValidationService.new(access_token).validate(scopes: scopes) when AccessTokenValidationService::INSUFFICIENT_SCOPE raise InsufficientScopeError.new(scopes) @@ -96,7 +96,7 @@ module API access_token = PersonalAccessToken.active.find_by_token(token_string) return unless access_token - if AccessTokenValidationService.sufficient_scope?(access_token, scopes) + if AccessTokenValidationService.new(access_token).include_any_scope?(scopes) User.find(access_token.user_id) end end |