refactor: Add tenant_id in functions and update tests accordingly

Author: KShivendu

supertokens_python/recipe/emailpassword/api/implementation.py

@@ -170,6 +170,7 @@ async def sign_in_post(
         user = result.user
         session = await create_new_session(
             api_options.request,
+            user.tenant_id,
             user.user_id,
             access_token_payload={},
             session_data_in_database={},
@@ -209,6 +210,7 @@ async def sign_up_post(
         user = result.user
         session = await create_new_session(
             api_options.request,
+            user.tenant_id,
             user.user_id,
             access_token_payload={},
             session_data_in_database={},

supertokens_python/recipe/passwordless/api/implementation.py

@@ -289,6 +289,7 @@ async def consume_code_post(
 
         session = await create_new_session(
             api_options.request,
+            user.tenant_id,
             user.user_id,
             {},
             {},

supertokens_python/recipe/session/asyncio/__init__.py

@@ -48,6 +48,7 @@
 
 async def create_new_session(
     request: Any,
+    tenant_id: str,
     user_id: str,
     access_token_payload: Union[Dict[str, Any], None] = None,
     session_data_in_database: Union[Dict[str, Any], None] = None,
@@ -66,6 +67,7 @@ async def create_new_session(
 
     return await create_new_session_in_request(
         request,
+        tenant_id,
         user_context,
         recipe_instance,
         access_token_payload,
@@ -77,6 +79,7 @@ async def create_new_session(
 
 
 async def create_new_session_without_request_response(
+    tenant_id: str,
     user_id: str,
     access_token_payload: Union[Dict[str, Any], None] = None,
     session_data_in_database: Union[Dict[str, Any], None] = None,
@@ -106,6 +109,7 @@ async def create_new_session_without_request_response(
         final_access_token_payload = {**final_access_token_payload, **update}
 
     return await SessionRecipe.get_instance().recipe_implementation.create_new_session(
+        tenant_id,
         user_id,
         final_access_token_payload,
         session_data_in_database,

supertokens_python/recipe/session/interfaces.py

@@ -69,6 +69,7 @@ def __init__(
         expiry: int,
         custom_claims_in_access_token_payload: Dict[str, Any],
         time_created: int,
+        tenant_id: str,
     ):
         self.session_handle: str = session_handle
         self.user_id: str = user_id
@@ -78,6 +79,7 @@ def __init__(
             str, Any
         ] = custom_claims_in_access_token_payload
         self.time_created: int = time_created
+        self.tenant_id: str = tenant_id
 
 
 class ReqResInfo:
@@ -133,6 +135,7 @@ def __init__(self):
     @abstractmethod
     async def create_new_session(
         self,
+        tenant_id: str,
         user_id: str,
         access_token_payload: Optional[Dict[str, Any]],
         session_data_in_database: Optional[Dict[str, Any]],
@@ -383,6 +386,7 @@ def __init__(
         user_data_in_access_token: Optional[Dict[str, Any]],
         req_res_info: Optional[ReqResInfo],
         access_token_updated: bool,
+        tenant_id: str,
     ):
         self.recipe_implementation = recipe_implementation
         self.config = config
@@ -395,6 +399,7 @@ def __init__(
         self.user_data_in_access_token = user_data_in_access_token
         self.req_res_info: Optional[ReqResInfo] = req_res_info
         self.access_token_updated = access_token_updated
+        self.tenant_id = tenant_id
 
         self.response_mutators: List[ResponseMutator] = []
 

supertokens_python/recipe/session/recipe_implementation.py

@@ -60,6 +60,7 @@ def __init__(self, querier: Querier, config: SessionConfig, app_info: AppInfo):
 
     async def create_new_session(
         self,
+        tenant_id: str,
         user_id: str,
         access_token_payload: Optional[Dict[str, Any]],
         session_data_in_database: Optional[Dict[str, Any]],
@@ -95,6 +96,7 @@ async def create_new_session(
             payload,
             None,
             True,
+            tenant_id,
         )
 
         return new_session
@@ -262,6 +264,7 @@ async def get_session(
             payload,
             None,
             access_token_updated,
+            response.session.tenantId,
         )
 
         return session
@@ -384,7 +387,7 @@ async def fetch_and_set_claim(
             return False
 
         access_token_payload_update = await claim.build(
-            session_info.user_id, tenant_id, user_context
+            session_info.user_id, session_info.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

@@ -11,7 +11,7 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from typing import Any, Dict, List, TypeVar, Union
+from typing import Any, Dict, List, TypeVar, Union, Optional
 
 from supertokens_python.recipe.session.exceptions import (
     raise_invalid_claims_exception,
@@ -133,6 +133,9 @@ async def update_session_data_in_database(
     def get_user_id(self, user_context: Union[Dict[str, Any], None] = None) -> str:
         return self.user_id
 
+    def get_tenant_id(self, user_context: Optional[Dict[str, Any]] = None) -> str:
+        return self.tenant_id
+
     def get_access_token_payload(
         self, user_context: Union[Dict[str, Any], None] = None
     ) -> Dict[str, Any]:
@@ -220,7 +223,9 @@ async def fetch_and_set_claim(
         if user_context is None:
             user_context = {}
 
-        update = await claim.build(self.get_user_id(), tenant_id, user_context)
+        update = await claim.build(
+            self.get_user_id(), self.get_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_functions.py

@@ -66,11 +66,13 @@ def __init__(
         userId: str,
         userDataInJWT: Dict[str, Any],
         expiryTime: int,
+        tenantId: str,
     ) -> None:
         self.handle = handle
         self.userId = userId
         self.userDataInJWT = userDataInJWT
         self.expiryTime = expiryTime
+        self.tenantId = tenantId
 
 
 class GetSessionAPIResponseAccessToken:
@@ -254,6 +256,7 @@ async def get_session(
                 access_token_info["userId"],
                 access_token_info["userData"],
                 access_token_info["expiryTime"],
+                access_token_info["tenantId"],
             )
         )
 
@@ -292,6 +295,7 @@ async def get_session(
                         "expiryTime"
                     ]  # if the token didn't pass validation, but we got here, it means it was a v2 token that we didn't have the key cached for.
                 ),  # This will throw error if others are none and 'expiryTime' key doesn't exist in the payload
+                response["session"]["tenantId"],
             ),
             GetSessionAPIResponseAccessToken(
                 response["accessToken"]["token"],
@@ -455,5 +459,6 @@ async def get_session_information(
             response["expiry"],
             response["userDataInJWT"],
             response["timeCreated"],
+            response["tenantId"],
         )
     return None

supertokens_python/recipe/session/session_request_functions.py

@@ -210,6 +210,7 @@ async def get_session_from_request(
 
 async def create_new_session_in_request(
     request: Any,
+    tenant_id: str,
     user_context: Dict[str, Any],
     recipe_instance: SessionRecipe,
     access_token_payload: Dict[str, Any],
@@ -275,6 +276,7 @@ async def create_new_session_in_request(
 
     disable_anti_csrf = output_transfer_method == "header"
     session = await recipe_instance.recipe_implementation.create_new_session(
+        tenant_id,
         user_id,
         final_access_token_payload,
         session_data_in_database,

supertokens_python/recipe/session/syncio/__init__.py

@@ -40,6 +40,7 @@
 
 def create_new_session(
     request: Any,
+    tenant_id: str,
     user_id: str,
     access_token_payload: Union[Dict[str, Any], None] = None,
     session_data_in_database: Union[Dict[str, Any], None] = None,
@@ -52,6 +53,7 @@ def create_new_session(
     return sync(
         async_create_new_session(
             request,
+            tenant_id,
             user_id,
             access_token_payload,
             session_data_in_database,
@@ -61,6 +63,7 @@ def create_new_session(
 
 
 def create_new_session_without_request_response(
+    tenant_id: str,
     user_id: str,
     access_token_payload: Union[Dict[str, Any], None] = None,
     session_data_in_database: Union[Dict[str, Any], None] = None,
@@ -73,6 +76,7 @@ def create_new_session_without_request_response(
 
     return sync(
         async_create_new_session_without_request_response(
+            tenant_id,
             user_id,
             access_token_payload,
             session_data_in_database,

supertokens_python/recipe/thirdparty/api/implementation.py

@@ -126,6 +126,7 @@ async def sign_in_up_post(
         user = signinup_response.user
         session = await create_new_session(
             api_options.request,
+            user.tenant_id,
             user.user_id,
             user_context=user_context,
         )