Merge branch 'fix/test-multitenancy' into fix/thirdparty-config-mt

Author: KShivendu

supertokens_python/always_initialised_recipes.py

@@ -223,8 +223,9 @@ async def fetch_and_set_claim(
         if user_context is None:
             user_context = {}
 
-        # TODO: Pass tenant id
-        update = await claim.build(self.get_user_id(), "pass-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_class.py

@@ -46,7 +46,6 @@
     send_non_200_response_with_message,
 )
 
-
 if TYPE_CHECKING:
     from .recipe_module import RecipeModule
     from supertokens_python.framework.request import BaseRequest
@@ -152,8 +151,6 @@ def __init__(
         mode: Union[Literal["asgi", "wsgi"], None],
         telemetry: Union[bool, None],
     ):
-        from .always_initialised_recipes import DEFAULT_MULTITENANCY_RECIPE
-
         if not isinstance(app_info, InputAppInfo):  # type: ignore
             raise ValueError("app_info must be an instance of InputAppInfo")
 
@@ -189,21 +186,21 @@ def __init__(
                 "Please provide at least one recipe to the supertokens.init function call"
             )
 
+        from supertokens_python.recipe.multitenancy.recipe import MultitenancyRecipe
+
         multitenancy_found = False
 
         def make_recipe(recipe: Callable[[AppInfo], RecipeModule]) -> RecipeModule:
             nonlocal multitenancy_found
             recipe_module = recipe(self.app_info)
-            if recipe_module.get_recipe_id() == "multitenancy":
+            if recipe_module.get_recipe_id() == MultitenancyRecipe.recipe_id:
                 multitenancy_found = True
             return recipe_module
 
         self.recipe_modules: List[RecipeModule] = list(map(make_recipe, recipe_list))
 
-        if callable(DEFAULT_MULTITENANCY_RECIPE) and not multitenancy_found:
-            recipe = DEFAULT_MULTITENANCY_RECIPE(  # pylint: disable=not-callable
-                self.app_info
-            )
+        if not multitenancy_found:
+            recipe = MultitenancyRecipe.init()(self.app_info)
             self.recipe_modules.append(recipe)
 
         self.telemetry = (