Merge pull request #399 from supertokens/tenantid-global-claim-validator

fix: Add tenant id in global claim validators

Author: rishabhpoddar

supertokens_python/recipe/session/asyncio/__init__.py

@@ -152,6 +152,7 @@ async def validate_claims_for_session_handle(
     )
     global_claim_validators = await resolve(
         recipe_impl.get_global_claim_validators(
+            session_info.tenant_id,
             session_info.user_id,
             claim_validators_added_by_other_recipes,
             user_context,
@@ -187,6 +188,7 @@ async def validate_claims_for_session_handle(
 
 
 async def validate_claims_in_jwt_payload(
+    tenant_id: str,
     user_id: str,
     jwt_payload: JSONObject,
     override_global_claim_validators: Optional[
@@ -211,6 +213,7 @@ async def validate_claims_in_jwt_payload(
     )
     global_claim_validators = await resolve(
         recipe_impl.get_global_claim_validators(
+            tenant_id,
             user_id,
             claim_validators_added_by_other_recipes,
             user_context,

supertokens_python/recipe/session/interfaces.py

@@ -154,6 +154,7 @@ async def create_new_session(
     @abstractmethod
     def get_global_claim_validators(
         self,
+        tenant_id: str,
         user_id: str,
         claim_validators_added_by_other_recipes: List[SessionClaimValidator],
         user_context: Dict[str, Any],

supertokens_python/recipe/session/recipe_implementation.py

@@ -437,6 +437,7 @@ async def get_claim_value(
 
     def get_global_claim_validators(
         self,
+        tenant_id: str,
         user_id: str,
         claim_validators_added_by_other_recipes: List[SessionClaimValidator],
         user_context: Dict[str, Any],

supertokens_python/recipe/session/syncio/__init__.py

@@ -385,6 +385,7 @@ def validate_claims_for_session_handle(
 
 
 def validate_claims_in_jwt_payload(
+    tenant_id: str,
     user_id: str,
     jwt_payload: JSONObject,
     override_global_claim_validators: Optional[
@@ -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
+            tenant_id,
+            user_id,
+            jwt_payload,
+            override_global_claim_validators,
+            user_context,
         )
     )

supertokens_python/recipe/session/utils.py

@@ -480,6 +480,7 @@ async def get_required_claim_validators(
     )
     global_claim_validators = await resolve(
         SessionRecipe.get_instance().recipe_implementation.get_global_claim_validators(
+            session.get_tenant_id(),
             session.get_user_id(),
             claim_validators_added_by_other_recipes,
             user_context,

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],
         ):