zaikio-jwt_auth 2.3.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69257f2c9dcf661babfc6b5600c0b4b724c32b4e92ffb6743e47a560e020a81c
-  data.tar.gz: 0b61afe2f4587ba84ac3e922bcb67024b8ec9f53b69cdbf155c17b4c556388d6
+  metadata.gz: d747cb5921e0b8c6f7b9424d15add0cf5d0471ee01d6db77ec2bb82577db794e
+  data.tar.gz: a38ec5412d24766df3bc6dee455a59a2ab9326216988545ecdc614ab46b7426e
 SHA512:
-  metadata.gz: 7717ef3559a647592cca0568e09531fdd8854c61d2dcdfb64077faec8bf0bd31e3dc87336b62dd0fa6b6673cbc6de4dfc5fb94d3371e2c9598e295d18e4d8578
-  data.tar.gz: 82094718a024d29a023220560517c77d59bc29b7d4dc293419b23ee9204bd936f6d14e76c4b2698c95a71ca0f72bddbb6bc2387d70b801f85da86b2ad2b86b5f
+  metadata.gz: a7f3053aef038da812f845c77ac2fd5fa132a7ee77dd0d0ef638e1b81ac1c635a713af36f9c682806a12b44e2bf221602814011c678c92c5a966b816422e903e
+  data.tar.gz: fd8660695b98ccdca7d20142a9066f2287285a5ddf836c360e504a250163e95d9b9e5f31b11b3856a3de75c403c287b9a882eba0a9b6b30f7fd4e4ab9d307b90

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.
@@ -70,7 +70,7 @@ module Zaikio
         rescue Errno::ECONNREFUSED, Net::ReadTimeout, BadResponseError
           Zaikio::JWTAuth.configuration.logger
                          .info("Error updating DirectoryCache(#{directory_path}), enqueueing job to update")
-          UpdateJob.set(wait: 10.seconds).perform_later(directory_path)
+          UpdateJob.perform_later(directory_path)
           nil
         end
 

data/lib/zaikio/jwt_auth/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module JWTAuth
-    VERSION = "2.3.0".freeze
+    VERSION = "2.4.1".freeze
   end
 end

data/lib/zaikio/jwt_auth.rb

@@ -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.3.0
+  version: 2.4.1
 platform: ruby
 authors:
 - crispymtn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-09 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob