Merge pull request #71 from indigo-dc/fix-63

handle non-conforming entitlements in entitlement claim
indigo-dc · Aug 19, 2022 · 553d55b · 553d55b
2 parents 1169320 + ae001b8
commit 553d55b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/flaat/access_tokens.py b/flaat/access_tokens.py
@@ -45,7 +45,7 @@ class AccessTokenInfo:
     """ Infos about the verification of the JWT.
     If set to `None`, then the JWT data is unverified."""
 
-    def __init__(self, complete_decode, verification=Optional[dict]):
+    def __init__(self, complete_decode, verification):
         self.header = complete_decode.get("header", {})
         self.body = complete_decode.get("payload", {})
         self.signature = _base64_url_encode(complete_decode.get("signature", b""))

diff --git a/flaat/requirements.py b/flaat/requirements.py
@@ -319,7 +319,7 @@ def _parse(self, raw: str):
     def _matches(
         self, required: aarc_entitlement.Base, available: aarc_entitlement.Base
     ) -> bool:
-        return available.satisfies(required)
+        return available is not None and available.satisfies(required)
 
 
 def _get_claim_requirement(