fix: updated for tenantId in core

Author: sattvikc

supertokens_python/recipe/multitenancy/__init__.py

@@ -26,20 +26,18 @@
     from supertokens_python.supertokens import AppInfo
 
     from ...recipe_module import RecipeModule
-    from .interfaces import TypeGetTenantIdForUserId, TypeGetAllowedDomainsForTenantId
+    from .interfaces import TypeGetAllowedDomainsForTenantId
     from .utils import InputErrorHandlers, InputOverrideConfig
 
 
 def init(
-    get_tenant_id_for_user_id: Union[TypeGetTenantIdForUserId, None] = None,
     get_allowed_domains_for_tenant_id: Union[
         TypeGetAllowedDomainsForTenantId, None
     ] = None,
     error_handlers: Union[InputErrorHandlers, None] = None,
     override: Union[InputOverrideConfig, None] = None,
 ) -> Callable[[AppInfo], RecipeModule]:
     return recipe.MultitenancyRecipe.init(
-        get_tenant_id_for_user_id,
         get_allowed_domains_for_tenant_id,
         error_handlers,
         override,

supertokens_python/recipe/multitenancy/interfaces.py

@@ -254,21 +254,7 @@ async def login_methods_get(
         pass
 
 
-class TenantIdOkResult:
-    def __init__(self, tenant_id: str):
-        self.tenant_id = tenant_id
-
-
-class UnknownUserIdError(Exception):
-    pass
-
-
-TypeGetTenantIdForUserId = Callable[
-    [str, Dict[str, Any]],
-    Awaitable[Union[TenantIdOkResult, UnknownUserIdError]],
-]
-
 TypeGetAllowedDomainsForTenantId = Callable[
-    [str, Dict[str, Any]],
+    [Union[str, None], Dict[str, Any]],
     Awaitable[List[str]],
 ]

supertokens_python/recipe/multitenancy/recipe.py

@@ -29,10 +29,7 @@
 from .interfaces import (
     APIInterface,
     APIOptions,
-    TypeGetTenantIdForUserId,
     TypeGetAllowedDomainsForTenantId,
-    TenantIdOkResult,
-    UnknownUserIdError,
 )
 
 from .recipe_implementation import RecipeImplementation
@@ -78,7 +75,6 @@ def __init__(
         self,
         recipe_id: str,
         app_info: AppInfo,
-        get_tenant_id_for_user_id: Optional[TypeGetTenantIdForUserId] = None,
         get_allowed_domains_for_tenant_id: Optional[
             TypeGetAllowedDomainsForTenantId
         ] = None,
@@ -87,7 +83,6 @@ def __init__(
     ) -> None:
         super().__init__(recipe_id, app_info)
         self.config = validate_and_normalise_user_input(
-            get_tenant_id_for_user_id,
             get_allowed_domains_for_tenant_id,
             error_handlers,
             override,
@@ -109,10 +104,6 @@ def __init__(
             else self.config.override.apis(api_implementation)
         )
 
-        self.get_tenant_id_for_user_id_funcs_from_other_recipes: List[
-            TypeGetTenantIdForUserId
-        ] = []
-
         self.static_third_party_providers: List[ProviderInput] = []
 
     def is_error_from_this_recipe_based_on_instance(self, err: Exception) -> bool:
@@ -169,7 +160,6 @@ def get_all_cors_headers(self) -> List[str]:
 
     @staticmethod
     def init(
-        get_tenant_id_for_user_id: Union[TypeGetTenantIdForUserId, None] = None,
         get_allowed_domains_for_tenant_id: Union[
             TypeGetAllowedDomainsForTenantId, None
         ] = None,
@@ -181,7 +171,6 @@ def func(app_info: AppInfo):
                 MultitenancyRecipe.__instance = MultitenancyRecipe(
                     MultitenancyRecipe.recipe_id,
                     app_info,
-                    get_tenant_id_for_user_id,
                     get_allowed_domains_for_tenant_id,
                     error_handlers,
                     override,
@@ -219,24 +208,6 @@ def reset():
             raise_general_exception("calling testing function in non testing env")
         MultitenancyRecipe.__instance = None
 
-    async def get_tenant_id_for_user_id(
-        self, user_id: str, user_context: Dict[str, Any]
-    ) -> Union[TenantIdOkResult, UnknownUserIdError]:
-        if self.config.get_tenant_id_for_user_id is not None:
-            res = await self.config.get_tenant_id_for_user_id(user_id, user_context)
-            if not isinstance(res, UnknownUserIdError):
-                return res
-
-        for f in self.get_tenant_id_for_user_id_funcs_from_other_recipes:
-            res = await f(user_id, user_context)
-            if not isinstance(res, UnknownUserIdError):
-                return res
-
-        return UnknownUserIdError()
-
-    def add_get_tenant_id_for_user_id_func(self, f: TypeGetTenantIdForUserId):
-        self.get_tenant_id_for_user_id_funcs_from_other_recipes.append(f)
-
 
 class APIImplementation(APIInterface):
     async def login_methods_get(
@@ -286,23 +257,19 @@ class AllowedDomainsClaimClass(PrimitiveArrayClaim[List[str]]):
     def __init__(self):
         async def fetch_value(user_id: str, user_context: Dict[str, Any]) -> List[str]:
             recipe = MultitenancyRecipe.get_instance()
-            tenant_ids_res = await recipe.get_tenant_id_for_user_id(
-                user_id, user_context
+            tenant_id = (
+                None  # TODO fetch value will be passed with tenant_id as well later
             )
 
-            if isinstance(tenant_ids_res, TenantIdOkResult):
-                for tenant_id in tenant_ids_res.tenant_id:
-                    if recipe.config.get_allowed_domains_for_tenant_id is None:
-                        return (
-                            []
-                        )  # User did not provide a function to get allowed domains, but is using a validator. So we don't allow any domains by default
-
-                    domains_res = await recipe.config.get_allowed_domains_for_tenant_id(
-                        tenant_id, user_context
-                    )
-                    return domains_res
+            if recipe.config.get_allowed_domains_for_tenant_id is None:
+                return (
+                    []
+                )  # User did not provide a function to get allowed domains, but is using a validator. So we don't allow any domains by default
 
-            raise Exception("UNKNOWN_USER_ID")
+            domains_res = await recipe.config.get_allowed_domains_for_tenant_id(
+                tenant_id, user_context
+            )
+            return domains_res
 
         super().__init__(
             key="st-tenant-domains",

supertokens_python/recipe/multitenancy/utils.py

@@ -25,7 +25,6 @@
 if TYPE_CHECKING:
     from typing import Union
     from .interfaces import (
-        TypeGetTenantIdForUserId,
         TypeGetAllowedDomainsForTenantId,
         RecipeInterface,
         APIInterface,
@@ -125,19 +124,16 @@ def __init__(
 class MultitenancyConfig:
     def __init__(
         self,
-        get_tenant_id_for_user_id: Union[TypeGetTenantIdForUserId, None],
         get_allowed_domains_for_tenant_id: Optional[TypeGetAllowedDomainsForTenantId],
         error_handlers: ErrorHandlers,
         override: OverrideConfig,
     ):
-        self.get_tenant_id_for_user_id = get_tenant_id_for_user_id
         self.get_allowed_domains_for_tenant_id = get_allowed_domains_for_tenant_id
         self.error_handlers = error_handlers
         self.override = override
 
 
 def validate_and_normalise_user_input(
-    get_tenant_id_for_user_id: Optional[TypeGetTenantIdForUserId],
     get_allowed_domains_for_tenant_id: Optional[TypeGetAllowedDomainsForTenantId],
     error_handlers: Union[ErrorHandlers, None] = None,
     override: Union[InputOverrideConfig, None] = None,
@@ -155,7 +151,6 @@ def validate_and_normalise_user_input(
         override = InputOverrideConfig()
 
     return MultitenancyConfig(
-        get_tenant_id_for_user_id,
         get_allowed_domains_for_tenant_id,
         error_handlers,
         OverrideConfig(override.functions, override.apis),

supertokens_python/recipe/thirdparty/providers/custom.py

@@ -16,7 +16,6 @@
     get_actual_client_id_from_development_client_id,
     is_using_oauth_development_client_id,
 )
-from supertokens_python.recipe.multitenancy.constants import DEFAULT_TENANT_ID
 
 from ..types import RawUserInfoFromProvider, UserInfo, UserInfoEmail
 from ..provider import (
@@ -191,7 +190,6 @@ def _normalize_input(self):
             async def default_generate_fake_email(
                 third_party_user_id: str, _: Dict[str, Any]
             ) -> str:
-                third_party_user_id = third_party_user_id.replace("|", ".")
                 return f"{third_party_user_id}@{self.input_config.third_party_id}.fakeemail.com"
 
             self.input_config.generate_fake_email = default_generate_fake_email
@@ -361,12 +359,6 @@ async def get_user_info(
             self.config, raw_user_info_from_provider
         )
 
-        if (
-            self.config.tenant_id is not None
-            and self.config.tenant_id != DEFAULT_TENANT_ID
-        ):
-            user_info_result.third_party_user_id += "|" + self.config.tenant_id
-
         return UserInfo(
             third_party_user_id=user_info_result.third_party_user_id,
             email=user_info_result.email,

supertokens_python/recipe/thirdparty/recipe.py

@@ -18,10 +18,6 @@
 
 from supertokens_python.normalised_url_path import NormalisedURLPath
 from supertokens_python.querier import Querier
-from supertokens_python.recipe.multitenancy.interfaces import (
-    TenantIdOkResult,
-    UnknownUserIdError as MTUnknownUserIdError,
-)
 from supertokens_python.recipe_module import APIHandled, RecipeModule
 
 from .api.implementation import APIImplementation
@@ -92,9 +88,6 @@ def callback():
             mt_recipe = MultitenancyRecipe.get_instance_optional()
             if mt_recipe:
                 mt_recipe.static_third_party_providers = self.providers
-                mt_recipe.add_get_tenant_id_for_user_id_func(
-                    self.get_tenant_id_for_user_id
-                )
 
         PostSTInitCallbacks.add_post_init_callback(callback)
 
@@ -211,14 +204,3 @@ async def get_email_for_user_id(self, user_id: str, user_context: Dict[str, Any]
             return GetEmailForUserIdOkResult(user_info.email)
 
         return UnknownUserIdError()
-
-    async def get_tenant_id_for_user_id(
-        self, user_id: str, user_context: Dict[str, Any]
-    ):
-        user_info = await self.recipe_implementation.get_user_by_id(
-            user_id, user_context
-        )
-        if user_info is None:
-            return MTUnknownUserIdError()
-
-        return TenantIdOkResult(user_info.tenant_ids)

supertokens_python/recipe/thirdparty/recipe_implementation.py

@@ -57,6 +57,7 @@ async def get_user_by_id(
                     response["user"]["thirdParty"]["userId"],
                     response["user"]["thirdParty"]["id"],
                 ),
+                response["user"].get("tenantId"),
             )
         return None
 
@@ -79,6 +80,7 @@ async def get_users_by_email(
                     ThirdPartyInfo(
                         user["thirdParty"]["userId"], user["thirdParty"]["id"]
                     ),
+                    response["user"].get("tenantId"),
                 )
             )
         return users
@@ -105,6 +107,7 @@ async def get_user_by_thirdparty_info(
                     response["user"]["thirdParty"]["userId"],
                     response["user"]["thirdParty"]["id"],
                 ),
+                response["user"].get("tenantId"),
             )
         return None
 
@@ -134,6 +137,7 @@ async def sign_in_up(
                     response["user"]["thirdParty"]["userId"],
                     response["user"]["thirdParty"]["id"],
                 ),
+                response["user"].get("tenantId"),
             ),
             response["createdNewUser"],
             oauth_tokens,
@@ -164,6 +168,7 @@ async def manually_create_or_update_user(
                     response["user"]["thirdParty"]["userId"],
                     response["user"]["thirdParty"]["id"],
                 ),
+                response["user"].get("tenantId"),
             ),
             response["createdNewUser"],
         )

supertokens_python/recipe/thirdparty/types.py

@@ -37,18 +37,13 @@ def __init__(
         email: str,
         time_joined: int,
         third_party_info: ThirdPartyInfo,
+        tenant_id: Union[str, None],
     ):
         self.user_id: str = user_id
         self.email: str = email
         self.time_joined: int = time_joined
         self.third_party_info: ThirdPartyInfo = third_party_info
-        self.tenant_id: Union[str, None] = None
-
-        self._update_tenant_ids()
-
-    def _update_tenant_ids(self):
-        if "|" in self.third_party_info.user_id:
-            self.tenant_id = self.third_party_info.user_id.split("|")[1]
+        self.tenant_id = tenant_id
 
 
 class UserInfoEmail:

supertokens_python/recipe/thirdpartyemailpassword/api/thirdparty_api_implementation.py

@@ -74,6 +74,7 @@ async def sign_in_up_post(
                         result.user.email,
                         result.user.time_joined,
                         result.user.third_party_info,
+                        result.user.tenant_id,
                     ),
                     result.created_new_user,
                     result.session,

supertokens_python/recipe/thirdpartyemailpassword/recipeimplementation/third_party_recipe_implementation.py

@@ -44,6 +44,7 @@ async def get_user_by_id(
             email=user.email,
             time_joined=user.time_joined,
             third_party_info=user.third_party_info,
+            tenant_id=user.tenant_id,
         )
 
     async def get_users_by_email(
@@ -60,6 +61,7 @@ async def get_users_by_email(
                         email=user.email,
                         time_joined=user.time_joined,
                         third_party_info=user.third_party_info,
+                        tenant_id=user.tenant_id,
                     )
                 )
 
@@ -82,6 +84,7 @@ async def get_user_by_thirdparty_info(
             email=user.email,
             time_joined=user.time_joined,
             third_party_info=user.third_party_info,
+            tenant_id=user.tenant_id,
         )
 
     async def sign_in_up(
@@ -111,6 +114,7 @@ async def sign_in_up(
                 result.user.email,
                 result.user.time_joined,
                 result.user.third_party_info,
+                result.user.tenant_id,
             ),
             result.created_new_user,
             oauth_tokens,
@@ -142,6 +146,7 @@ async def manually_create_or_update_user(
                 result.user.email,
                 result.user.time_joined,
                 result.user.third_party_info,
+                result.user.tenant_id,
             ),
             result.created_new_user,
         )