zaikio-jwt_auth 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0559a98a2221978a8a5c35e6968d667d9c17287b1421500ae0062bad169c0ece'
-  data.tar.gz: be9a95f5684dd8329f1b5446400ad8704f46422a364de01675538f3001c0bf59
+  metadata.gz: d7b4d20c732061b0d41453bfa9f8b6b92bbeb6ff07dc146d17b0fd833356ca4a
+  data.tar.gz: c18a3da38ad85e0a04915ef11f865de78ea358ee8fa456d1244dde0bb3809d46
 SHA512:
-  metadata.gz: d4f1a51bed19e09d9ca09eb873377639f6f197f289742d74e17a6d6fba3e130608547530ca65daa6ab40c3faad4a00a8b695582fee084d78b8e96e897165301f
-  data.tar.gz: bf0eab6e6761239b33ae00d565ffc0b884fd70ddea3d589a91a0a1c7b2bf124e955048e8a5eebfbc7e42d1b37ed41fd96b0d6139b5f19ce5b60358bf69525612
+  metadata.gz: df04a88a338e76b4ce746043e33ab172aa804d1e6b5079849325650ac0fe9f29f7c6d7b0aa9327e70f090b7e08c3acac21b9ad05da80356cf76c336c8f815d71
+  data.tar.gz: 58d19b43b1c68be4c983f3b03eaacac1d46ea3fdee6946b1151182ada650860c537761406db3352881103d5185b4827a835384de7288e4181174e856e1ca2da5

data/lib/zaikio/jwt_auth.rb

@@ -49,7 +49,11 @@ module Zaikio
       end
 
       def authorize_by_jwt_scopes(scopes = nil, options = {})
-        @authorize_by_jwt_scopes ||= options.merge(scopes: scopes)
+        @authorize_by_jwt_scopes ||= []
+
+        @authorize_by_jwt_scopes << options.merge(scopes: scopes) if scopes
+
+        @authorize_by_jwt_scopes
       end
     end
 
@@ -101,8 +105,10 @@ module Zaikio
       end
 
       def show_error_if_authorize_by_jwt_scopes_fails(token_data)
-        scope_data = self.class.authorize_by_jwt_scopes
-        return if !scope_data[:scopes] || token_data.scope?(scope_data[:scopes], action_name, scope_data[:app_name])
+        return if token_data.scope_by_configurations?(
+          self.class.authorize_by_jwt_scopes,
+          action_name
+        )
 
         render_error("unpermitted_scope")
       end

data/lib/zaikio/jwt_auth/token_data.rb

@@ -33,6 +33,24 @@ module Zaikio
         @payload["jti"]
       end
 
+      # scope_options is an array of objects with:
+      # scope, app_name (optional), except/only (array, optional)
+      def scope_by_configurations?(scope_configurations, action_name)
+        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 }
+          else
+            true
+          end
+        end
+
+        return true unless configuration
+
+        scope?(configuration[:scopes], action_name, configuration[:app_name])
+      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.5".freeze
+    VERSION = "0.1.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Crispy Mountain GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj