Implement review comments from @DouweM for !12300.

- Use a struct for scopes, so we can call `scope.if` instead of `scope[:if]`

- Refactor the "remove scopes whose :if condition returns false" logic to use a
  `select` rather than a `reject`.

1 files changed, 2 insertions, 2 deletions

diff --git a/app/services/access_token_validation_service.rb b/app/services/access_token_validation_service.rb
index 450e90d947d..ee2e93a0d63 100644
--- a/app/services/access_token_validation_service.rb
+++ b/app/services/access_token_validation_service.rb
@@ -33,10 +33,10 @@ class AccessTokenValidationService
       true
     else
       # Remove any scopes whose `if` condition does not return `true`
-      scopes = scopes.reject { |scope| scope[:if].presence && !scope[:if].call(request) }
+      scopes = scopes.select { |scope| scope.if.nil? || scope.if.call(request) }
 
       # Check whether the token is allowed access to any of the required scopes.
-      passed_scope_names = scopes.map { |scope| scope[:name].to_sym }
+      passed_scope_names = scopes.map { |scope| scope.name.to_sym }
       token_scope_names = token.scopes.map(&:to_sym)
       Set.new(passed_scope_names).intersection(Set.new(token_scope_names)).present?
     end