zaikio-jwt_auth 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f46dba4c35870df1d25710905ff3451588f23f1fa8d02e304d9555c6816319c
-  data.tar.gz: 42124c9514465ee6bd6a7a069402730cd0049ec6c9be2fea0e6348107176be6b
+  metadata.gz: 2973a0c217c47da109e5a5023a7a430a153c8b61dae1a0ab21d24511420c209a
+  data.tar.gz: adbf5e6c3beb55f437ba68f04966186b0b6c886d4cb78b0db3ce294dc8d99710
 SHA512:
-  metadata.gz: '018c6eb5215993e066d7f4b080250df0f1e02788675c86ce6da62d75a378c7f96e0d63b7b94cd81dea5ecc01d7c0fda8775691fb90ca05ab250708e0dbb3a4ba'
-  data.tar.gz: 0cfdfc49f7c07fb39c076b693371bff9cc444e3a39aeb740bb281208cb9acf9651e84ad77662bd871399cda5b2d2666a515b0c86b39bec5f75bc06b1184427c9
+  metadata.gz: 7a30f36608a792d86bd839402b17b3ad6b0ae4aa2554f53f23bf80c70526763a756a2cc727c8b5043687535353886f63e80759a84999d2e1b399cb6646a8da52
+  data.tar.gz: f40fa02553e687c3d2d653e35c0c4a6d43e2bcc14e2f46328127ae78960e9d8a95303cb735aa65f43797d6a29613d1d3fa3891cb88c31027377ff49ea2fbf4ce

data/lib/zaikio/jwt_auth/directory_cache.rb

@@ -5,7 +5,7 @@ require "logger"
 module Zaikio
   module JWTAuth
     class DirectoryCache
-      class UpdateJob < ::ActiveJob::Base
+      class UpdateJob < ::ActiveJob::Base # rubocop:disable Rails/ApplicationJob
         def perform(directory_path)
           DirectoryCache.fetch(directory_path)
           true # This job will always re-queue until it succeeds.

data/lib/zaikio/jwt_auth/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module JWTAuth
-    VERSION = "2.4.0".freeze
+    VERSION = "2.5.0".freeze
   end
 end

data/lib/zaikio/jwt_auth.rb

@@ -119,7 +119,7 @@ module Zaikio
       end
 
       def update_revoked_access_tokens_by_webhook
-        return unless params[:name] == "directory.revoked_access_token"
+        return unless %w[directory.revoked_access_token zaikio.revoked_access_token].include?(params[:name])
 
         DirectoryCache.update("api/v1/revoked_access_tokens.json", expires_after: 60.minutes) do |data|
           data["revoked_token_ids"] << params[:payload][:access_token_id]
@@ -131,8 +131,8 @@ module Zaikio
 
       private
 
-      def find_scope_configuration(scope_configurations)
-        scope_configurations.find do |scope_configuration|
+      def find_scope_configurations(scope_configurations)
+        scope_configurations.select do |scope_configuration|
           action_matches = action_matches_config?(scope_configuration)
 
           if action_matches && scope_configuration[:if] && !instance_exec(&scope_configuration[:if])
@@ -169,21 +169,23 @@ module Zaikio
       end
 
       def show_error_if_authorize_by_jwt_scopes_fails(token_data)
-        configuration = find_scope_configuration(self.class.authorize_by_jwt_scopes)
+        configurations = find_scope_configurations(self.class.authorize_by_jwt_scopes)
 
-        return if token_data.scope_by_configurations?(
-          configuration,
-          action_name
-        )
+        return if configurations.empty?
 
-        details = nil
+        configuration = configurations.find do |scope_configuration|
+          token_data.scope_by_configurations?(
+            scope_configuration,
+            action_name
+          )
+        end
 
-        if configuration
-          required_scopes = required_scopes(token_data, configuration)
+        return if configuration
 
-          details = "This endpoint requires one of the following scopes: #{required_scopes.join(', ')} but your " \
-          "access token only includes the following scopes: #{token_data.scope.join(', ')} - #{DOCS_LINK}"
-        end
+        required_scopes = required_scopes(token_data, configuration || configurations.first)
+
+        details = "This endpoint requires one of the following scopes: #{required_scopes.join(', ')} but your " \
+        "access token only includes the following scopes: #{token_data.scope.join(', ')} - #{DOCS_LINK}"
 
         render_error(["unpermitted_scope", details])
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-jwt_auth
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - crispymtn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob