Add warrant object support in check many (#18)

* Clean up unused imports

* Allow warrant objects along with dicts when checking multiple warrants

* Add type hint for subject param in check

Author: stanleyphu

test/test_live.py

@@ -684,10 +684,11 @@ def test_batch_create_delete_warrants(self):
         )
         self.assertEqual(user_has_permission2, False)
 
+        perm1_warrant = warrant.Warrant({"objectType": "permission", "objectId": permission1.id, "relation": "member", "subject": warrant.Subject("user", new_user.id)})
         user_has_permissions = warrant.Authz.check_many(
             warrant.CheckOp.ALL_OF,
             [
-                {"objectType": permission1.object_type, "objectId": permission1.id, "relation": "member", "subject": {"objectType": new_user.object_type, "objectId": new_user.id}},
+                perm1_warrant,
                 {"objectType": permission2.object_type, "objectId": permission2.id, "relation": "member", "subject": {"objectType": new_user.object_type, "objectId": new_user.id}}
             ],
             opts={"Warrant-Token": "latest"}
@@ -721,7 +722,7 @@ def test_batch_create_delete_warrants(self):
         user_has_permissions = warrant.Authz.check_many(
             warrant.CheckOp.ALL_OF,
             [
-                {"objectType": permission1.object_type, "objectId": permission1.id, "relation": "member", "subject": {"objectType": new_user.object_type, "objectId": new_user.id}},
+                perm1_warrant,
                 {"objectType": permission2.object_type, "objectId": permission2.id, "relation": "member", "subject": {"objectType": new_user.object_type, "objectId": new_user.id}}
             ],
             opts={"Warrant-Token": "latest"}

warrant/authz.py

@@ -1,17 +1,36 @@
 import warrant
-from warrant import APIResource, Subject
+from warrant import APIResource, Subject, Warrant
 from enum import Enum
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List
 
 
 class CheckOp(str, Enum):
     ANY_OF = "anyOf"
     ALL_OF = "allOf"
 
 
+def map_warrant(warrant):
+    if isinstance(warrant, Warrant):
+        subject = {
+            "objectType": warrant.subject.object_type,
+            "objectId": warrant.subject.object_id
+        }
+        if warrant.subject.relation != "":
+            subject["relation"] = warrant.subject.relation
+
+        return {
+            "objectType": warrant.object_type,
+            "objectId": warrant.object_id,
+            "relation": warrant.relation,
+            "subject": subject
+        }
+    else:
+        return warrant
+
+
 class Authz(APIResource):
     @classmethod
-    def check(cls, object_type: str, object_id: str, relation: str, subject, context: Dict[str, Any] = {}, opts: Dict[str, Any] = {}) -> bool:
+    def check(cls, object_type: str, object_id: str, relation: str, subject: Subject | Dict[str, Any], context: Dict[str, Any] = {}, opts: Dict[str, Any] = {}) -> bool:
         warrantToCheck = {
             "objectType": object_type,
             "objectId": object_id,
@@ -38,10 +57,11 @@ def check(cls, object_type: str, object_id: str, relation: str, subject, context
         return False
 
     @classmethod
-    def check_many(cls, op: CheckOp, warrants: List[Dict[str, Any]], opts: Dict[str, Any] = {}):
+    def check_many(cls, op: CheckOp, warrants: List[Dict[str, Any] | Warrant], opts: Dict[str, Any] = {}):
+        mapped_warrants = list(map(map_warrant, warrants))
         payload = {
             "op": op,
-            "warrants": warrants
+            "warrants": mapped_warrants
         }
         json_resp = cls._post(uri="/v2/check", json_payload=payload, opts=opts)
         code = json_resp["code"]

warrant/feature.py

@@ -1,5 +1,5 @@
-from warrant import APIResource, Subject, Warrant, Object, constants, ListResult
-from typing import Any, Dict, List, Optional
+from warrant import Subject, Warrant, Object, constants, ListResult
+from typing import Any, Dict, Optional
 
 
 class Feature(Object):

warrant/permission.py

@@ -1,5 +1,5 @@
-from warrant import APIResource, Subject, Warrant, Object, constants, ListResult
-from typing import Any, Dict, List, Optional
+from warrant import Subject, Warrant, Object, constants, ListResult
+from typing import Any, Dict, Optional
 
 
 class Permission(Object):

warrant/pricing_tier.py

@@ -1,5 +1,5 @@
-from warrant import APIResource, Feature, Subject, Warrant, Object, constants, ListResult
-from typing import Any, Dict, List, Optional
+from warrant import Feature, Subject, Warrant, Object, constants, ListResult
+from typing import Any, Dict
 
 
 class PricingTier(Object):

warrant/role.py

@@ -1,5 +1,5 @@
-from warrant import APIResource, Permission, Subject, Warrant, Object, constants, ListResult
-from typing import Any, Dict, List, Optional
+from warrant import Permission, Subject, Warrant, Object, constants, ListResult
+from typing import Any, Dict, Optional
 
 
 class Role(Object):

warrant/tenant.py

@@ -1,4 +1,4 @@
-from warrant import APIResource, PricingTier, Feature, User, Authz, Subject, Warrant, Object, ListResult
+from warrant import PricingTier, Feature, User, Authz, Subject, Warrant, Object, ListResult
 from typing import Any, Dict, List, Optional
 
 

warrant/user.py

@@ -1,5 +1,5 @@
-from warrant import APIResource, PricingTier, Feature, Role, Permission, Authz, Subject, Warrant, Object, constants, ListResult
-from typing import Any, Dict, List, Optional, Sequence
+from warrant import PricingTier, Feature, Role, Permission, Authz, Subject, Warrant, Object, constants, ListResult
+from typing import Any, Dict, List, Optional
 
 
 class User(Object):

warrant/warrant.py

@@ -1,5 +1,5 @@
-from warrant import APIResource, WarrantException, ListResult
-from typing import Any, Dict, List, Optional
+from warrant import APIResource, ListResult
+from typing import Any, Dict, Optional
 
 
 class Subject(object):