fix: Add tenant_id to claim build func

Author: KShivendu

supertokens_python/recipe/session/asyncio/__init__.py

@@ -102,7 +102,8 @@ async def create_new_session_without_request_response(
     final_access_token_payload = {**access_token_payload, "iss": issuer}
 
     for claim in claims_added_by_other_recipes:
-        update = await claim.build(user_id, user_context)
+        # TODO: Pass tenant id
+        update = await claim.build(user_id, "pass-tenant-id", user_context)
         final_access_token_payload = {**final_access_token_payload, **update}
 
     return await SessionRecipe.get_instance().recipe_implementation.create_new_session(

supertokens_python/recipe/session/interfaces.py

@@ -628,13 +628,12 @@ def get_value_from_payload(
         """Gets the value of the claim stored in the payload"""
 
     async def build(
-        self, user_id: str, user_context: Optional[Dict[str, Any]] = None
+        self, user_id: str, tenant_id: str, user_context: Optional[Dict[str, Any]] = None
     ) -> JSONObject:
         if user_context is None:
             user_context = {}
 
-        # TODO: change this to tenant_id
-        value = await resolve(self.fetch_value(user_id, "pass-tenant-id", user_context))
+        value = await resolve(self.fetch_value(user_id, tenant_id, user_context))
 
         if value is None:
             return {}

supertokens_python/recipe/session/recipe_implementation.py

@@ -383,8 +383,9 @@ async def fetch_and_set_claim(
         if session_info is None:
             return False
 
+        # TODO: Pass tenant id
         access_token_payload_update = await claim.build(
-            session_info.user_id, user_context
+            session_info.user_id, "pass-tenant-id", user_context
         )
         return await self.merge_into_access_token_payload(
             session_handle, access_token_payload_update, user_context

supertokens_python/recipe/session/session_class.py

@@ -220,7 +220,8 @@ async def fetch_and_set_claim(
         if user_context is None:
             user_context = {}
 
-        update = await claim.build(self.get_user_id(), user_context)
+        # TODO: Pass tenant id
+        update = await claim.build(self.get_user_id(), "pass-tenant-id", user_context)
         return await self.merge_into_access_token_payload(update, user_context)
 
     async def set_claim_value(

supertokens_python/recipe/session/session_request_functions.py

@@ -238,7 +238,8 @@ async def create_new_session_in_request(
     final_access_token_payload = {**access_token_payload, "iss": issuer}
 
     for claim in claims_added_by_other_recipes:
-        update = await claim.build(user_id, user_context)
+        # TODO: Pass tenant id
+        update = await claim.build(user_id, "pass-tenant-id", user_context)
         final_access_token_payload = {**final_access_token_payload, **update}
 
     log_debug_message("createNewSession: Access token payload built")

tests/sessions/claims/test_primitive_array_claim.py

@@ -57,21 +57,21 @@ def patch_get_timestamp_ms(pac_time_patch: Tuple[MockerFixture, int]):
 async def test_primitive_claim(timestamp: int):
     claim = PrimitiveArrayClaim("key", sync_fetch_value)
     ctx = {}
-    res = await claim.build("user_id", ctx)
+    res = await claim.build("user_id", "public", ctx)
     assert res == {"key": {"t": timestamp, "v": val}}
 
 
 async def test_primitive_claim_without_async_fetch_value(timestamp: int):
     claim = PrimitiveArrayClaim("key", async_fetch_value)
     ctx = {}
-    res = await claim.build("user_id", ctx)
+    res = await claim.build("user_id", "public", ctx)
     assert res == {"key": {"t": timestamp, "v": val}}
 
 
 async def test_primitive_claim_matching__add_to_payload():
     claim = PrimitiveArrayClaim("key", sync_fetch_value)
     ctx = {}
-    res = await claim.build("user_id", ctx)
+    res = await claim.build("user_id", "public", ctx)
     assert res == claim.add_to_payload_({}, val, {})
 
 

tests/sessions/claims/test_primitive_claim.py

@@ -23,21 +23,21 @@ def teardown_function(_):
 async def test_primitive_claim(timestamp: int):
     claim = PrimitiveClaim("key", sync_fetch_value)
     ctx = {}
-    res = await claim.build("user_id", ctx)
+    res = await claim.build("user_id", "public", ctx)
     assert res == {"key": {"t": timestamp, "v": val}}
 
 
 async def test_primitive_claim_without_async_fetch_value(timestamp: int):
     claim = PrimitiveClaim("key", async_fetch_value)
     ctx = {}
-    res = await claim.build("user_id", ctx)
+    res = await claim.build("user_id", "public", ctx)
     assert res == {"key": {"t": timestamp, "v": val}}
 
 
 async def test_primitive_claim_matching__add_to_payload():
     claim = PrimitiveClaim("key", sync_fetch_value)
     ctx = {}
-    res = await claim.build("user_id", ctx)
+    res = await claim.build("user_id", "public", ctx)
     assert res == claim.add_to_payload_({}, val, {})