nexus_cqrs_auth 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81a584f66bd17223f77be8efc9e55cd688776ef5bbafda83a287dcfdd9d56930
-  data.tar.gz: 482568a0f4bcb831714d0a97939d24392b174c0ccd14d12a61322501ed708fe7
+  metadata.gz: a4e4dd0ea8f63b000ef78595be9e6241dc162d50e644c24c7291a8150fa6e98f
+  data.tar.gz: 6f14589729a606b05c4792d8b3e7ca04d182f2961c9454303a77c2a4ea138e48
 SHA512:
-  metadata.gz: bc0c0a9191fa3b5972264806b164fdaa8c67f1c290d7918700de636f6d2d32dfe250392c98bdf06ca5fbee919c87a7b0f31c857534b14934137e0f154d9d4594
-  data.tar.gz: 69b83b159ef8202a0fe65b21aeb5848e5aa3e326f6677033c51c72507b97fb2c5bb6d428279dc6f5b4a0330fa6c06395cf669305fa7863e1fdaa3fc486f149ff
+  metadata.gz: fd99e19cd0512e8905ae4d8d454ef6f70d428731e0d2b6afef7d3e7f023d91f5be2fb44443bcbdb2fec23c3fb67c2e0e635f1a8406a61d2bce153e10908f0aec
+  data.tar.gz: 0a47018533846a9c4500331e9c2ade3147d3059533f3dc2de1492a5d88d24c8c0f43520d6b1ec1bc4f777d4b542b54803708c47b19bdfe9619a85ff884904bb8

data/lib/nexus_cqrs_auth/helper.rb

@@ -5,13 +5,22 @@ require 'strings-case'
 module NexusCqrsAuth
   include Pundit
   def authorize(command, record, query = nil, policy_class: nil)
+
+    # Populate the query from the command, or the params if it's being overriden
     query ||= Strings::Case.snakecase(command.demodularised_class_name) + '?'
-    @command_user = command.metadata[:current_user]
-    @global_permissions = command.metadata[:global_permissions]
-    super_ = super(record, query, policy_class: policy_class)
-    @command_user = nil
-    @global_permissions = nil
-    super_
+
+    # Retreive the policy class object from the type of record we are passing in
+    policy_class ||= PolicyFinder.new(record).policy
+
+    # Pull context variables from command
+    user = command.metadata[:current_user]
+    global_permissions = command.metadata[:global_permissions]
+
+    # Instantiate new policy class, with context
+    policy = policy_class.new(UserContext.new(user, global_permissions), record)
+    raise NotAuthorizedError, query: query, record: record, policy: policy unless policy.public_send(query)
+
+    record.is_a?(Array) ? record.last : record
   end
 
   # Helper method for creating a permissions provider object from a query object. This allows certain permissions
@@ -21,7 +30,7 @@ module NexusCqrsAuth
   end
 
   def pundit_user
-    UserContext.new(@command_user, @global_permissions)
+    nil
   end
 
   def current_user

data/lib/nexus_cqrs_auth/permission_provider.rb

@@ -22,7 +22,7 @@ module NexusCqrsAuth
       # check entity-specific permissions
       unless permission_model.nil?
         return true if permission_model.where(permission: permission_key, entity_id: entity_id,
-user_id: @user_id).exists?
+user_id: @user_id.id).exists?
       end
 
       false

data/lib/nexus_cqrs_auth/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module NexusCqrsAuth
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexus_cqrs_auth
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Chris Harrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-30 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nexus_cqrs