fix: Add tenant id in global claim validators

supertokens · Aug 10, 2023 · a0ecabf · a0ecabf
1 parent 5287c18
commit a0ecabf
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 1 deletion.
diff --git a/supertokens_python/recipe/session/asyncio/__init__.py b/supertokens_python/recipe/session/asyncio/__init__.py
@@ -153,6 +153,7 @@ async def validate_claims_for_session_handle(
     global_claim_validators = await resolve(
         recipe_impl.get_global_claim_validators(
             session_info.user_id,
+            session_info.tenant_id,
             claim_validators_added_by_other_recipes,
             user_context,
         )
@@ -188,6 +189,7 @@ async def validate_claims_for_session_handle(
 
 async def validate_claims_in_jwt_payload(
     user_id: str,
+    tenant_id: str,
     jwt_payload: JSONObject,
     override_global_claim_validators: Optional[
         Callable[
@@ -212,6 +214,7 @@ async def validate_claims_in_jwt_payload(
     global_claim_validators = await resolve(
         recipe_impl.get_global_claim_validators(
             user_id,
+            tenant_id,
             claim_validators_added_by_other_recipes,
             user_context,
         )

diff --git a/supertokens_python/recipe/session/interfaces.py b/supertokens_python/recipe/session/interfaces.py
@@ -155,6 +155,7 @@ async def create_new_session(
     def get_global_claim_validators(
         self,
         user_id: str,
+        tenant_id: str,
         claim_validators_added_by_other_recipes: List[SessionClaimValidator],
         user_context: Dict[str, Any],
     ) -> MaybeAwaitable[List[SessionClaimValidator]]:

diff --git a/supertokens_python/recipe/session/recipe_implementation.py b/supertokens_python/recipe/session/recipe_implementation.py
@@ -438,6 +438,7 @@ async def get_claim_value(
     def get_global_claim_validators(
         self,
         user_id: str,
+        tenant_id: str,
         claim_validators_added_by_other_recipes: List[SessionClaimValidator],
         user_context: Dict[str, Any],
     ) -> MaybeAwaitable[List[SessionClaimValidator]]:

diff --git a/supertokens_python/recipe/session/syncio/__init__.py b/supertokens_python/recipe/session/syncio/__init__.py
@@ -386,6 +386,7 @@ def validate_claims_for_session_handle(
 
 def validate_claims_in_jwt_payload(
     user_id: str,
+    tenant_id: str,
     jwt_payload: JSONObject,
     override_global_claim_validators: Optional[
         Callable[
@@ -401,6 +402,10 @@ def validate_claims_in_jwt_payload(
 
     return sync(
         async_validate_claims_in_jwt_payload(
-            user_id, jwt_payload, override_global_claim_validators, user_context
+            user_id,
+            tenant_id,
+            jwt_payload,
+            override_global_claim_validators,
+            user_context,
         )
     )
diff --git a/supertokens_python/recipe/session/utils.py b/supertokens_python/recipe/session/utils.py
@@ -481,6 +481,7 @@ async def get_required_claim_validators(
     global_claim_validators = await resolve(
         SessionRecipe.get_instance().recipe_implementation.get_global_claim_validators(
             session.get_user_id(),
+            session.get_tenant_id(),
             claim_validators_added_by_other_recipes,
             user_context,
         )

diff --git a/tests/sessions/claims/test_verify_session.py b/tests/sessions/claims/test_verify_session.py
@@ -47,6 +47,7 @@ def st_init_generator_with_overriden_global_validators(
     def session_function_override(oi: RecipeInterface) -> RecipeInterface:
         async def new_get_global_claim_validators(
             _user_id: str,
+            _tenant_id: str,
             _claim_validators_added_by_other_recipes: List[SessionClaimValidator],
             _user_context: Dict[str, Any],
         ):
@@ -73,6 +74,7 @@ def st_init_generator_with_claim_validator(claim_validator: SessionClaimValidato
     def session_function_override(oi: RecipeInterface) -> RecipeInterface:
         async def new_get_global_claim_validators(
             _user_id: str,
+            _tenant_id: str,
             claim_validators_added_by_other_recipes: List[SessionClaimValidator],
             _user_context: Dict[str, Any],
         ):