zaikio-jwt_auth 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7b4d20c732061b0d41453bfa9f8b6b92bbeb6ff07dc146d17b0fd833356ca4a
-  data.tar.gz: c18a3da38ad85e0a04915ef11f865de78ea358ee8fa456d1244dde0bb3809d46
+  metadata.gz: aa5cedf782b4972795398012fb5d50f5156995a34951a077b49ab8c72d47af6c
+  data.tar.gz: 2e76b158eaddb1c7993412883fe0926af121ac1e959c8f0ff6e9fdc4a71fd17c
 SHA512:
-  metadata.gz: df04a88a338e76b4ce746043e33ab172aa804d1e6b5079849325650ac0fe9f29f7c6d7b0aa9327e70f090b7e08c3acac21b9ad05da80356cf76c336c8f815d71
-  data.tar.gz: 58d19b43b1c68be4c983f3b03eaacac1d46ea3fdee6946b1151182ada650860c537761406db3352881103d5185b4827a835384de7288e4181174e856e1ca2da5
+  metadata.gz: 0c837c489820a0bfe172813a22e0a974bb5686724826db11a76c88cf08085c2ca250124310dedc95146e640b6755ad32e18490a35cf617270c736ab63fbe46b1
+  data.tar.gz: da668d14415c81d38a08b8d1bed52390b7040476301ac049a43c63a8e96eb973b229ebd5ad689b215b244b99dd18edbc0e3ff78f24eb84d1245babb977b09cdf

data/lib/zaikio/jwt_auth.rb

@@ -107,7 +107,8 @@ module Zaikio
       def show_error_if_authorize_by_jwt_scopes_fails(token_data)
         return if token_data.scope_by_configurations?(
           self.class.authorize_by_jwt_scopes,
-          action_name
+          action_name,
+          self
         )
 
         render_error("unpermitted_scope")

data/lib/zaikio/jwt_auth/token_data.rb

@@ -35,14 +35,16 @@ module Zaikio
 
       # scope_options is an array of objects with:
       # scope, app_name (optional), except/only (array, optional)
-      def scope_by_configurations?(scope_configurations, action_name)
+      def scope_by_configurations?(scope_configurations, action_name, context)
         configuration = scope_configurations.find do |scope_configuration|
-          if scope_configuration[:only]
-            Array(scope_configuration[:only]).any? { |a| a.to_s == action_name }
-          elsif scope_configuration[:except]
-            Array(scope_configuration[:except]).none? { |a| a.to_s == action_name }
+          action_matches = action_matches_config?(scope_configuration, action_name)
+
+          if action_matches && scope_configuration[:if] && !context.instance_exec(&scope_configuration[:if])
+            false
+          elsif action_matches && scope_configuration[:unless] && context.instance_exec(&scope_configuration[:unless])
+            false
           else
-            true
+            action_matches
           end
         end
 
@@ -51,6 +53,16 @@ module Zaikio
         scope?(configuration[:scopes], action_name, configuration[:app_name])
       end
 
+      def action_matches_config?(scope_configuration, action_name)
+        if scope_configuration[:only]
+          Array(scope_configuration[:only]).any? { |a| a.to_s == action_name }
+        elsif scope_configuration[:except]
+          Array(scope_configuration[:except]).none? { |a| a.to_s == action_name }
+        else
+          true
+        end
+      end
+
       def scope?(allowed_scopes, action_name, app_name = nil)
         app_name ||= Zaikio::JWTAuth.configuration.app_name
         Array(allowed_scopes).map(&:to_s).any? do |allowed_scope|

data/lib/zaikio/jwt_auth/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module JWTAuth
-    VERSION = "0.1.6".freeze
+    VERSION = "0.1.7".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Crispy Mountain GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.0.2.2
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement