fix: minor fixes

Author: sattvikc

supertokens_python/recipe/multitenancy/__init__.py

@@ -26,20 +26,20 @@
     from supertokens_python.supertokens import AppInfo
 
     from ...recipe_module import RecipeModule
-    from .interfaces import TypeGetTenantIdsForUserId, TypeGetAllowedDomainsForTenantId
+    from .interfaces import TypeGetTenantIdForUserId, TypeGetAllowedDomainsForTenantId
     from .utils import InputErrorHandlers, InputOverrideConfig
 
 
 def init(
-    get_tenant_ids_for_user_id: Union[TypeGetTenantIdsForUserId, None] = None,
+    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_ids_for_user_id,
+        get_tenant_id_for_user_id,
         get_allowed_domains_for_tenant_id,
         error_handlers,
         override,

supertokens_python/recipe/multitenancy/interfaces.py

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

supertokens_python/recipe/multitenancy/recipe.py

@@ -29,9 +29,9 @@
 from .interfaces import (
     APIInterface,
     APIOptions,
-    TypeGetTenantIdsForUserId,
+    TypeGetTenantIdForUserId,
     TypeGetAllowedDomainsForTenantId,
-    TenantIdsOkResult,
+    TenantIdOkResult,
     UnknownUserIdError,
 )
 
@@ -78,7 +78,7 @@ def __init__(
         self,
         recipe_id: str,
         app_info: AppInfo,
-        get_tenant_ids_for_user_id: Optional[TypeGetTenantIdsForUserId] = None,
+        get_tenant_id_for_user_id: Optional[TypeGetTenantIdForUserId] = None,
         get_allowed_domains_for_tenant_id: Optional[
             TypeGetAllowedDomainsForTenantId
         ] = None,
@@ -87,7 +87,7 @@ def __init__(
     ) -> None:
         super().__init__(recipe_id, app_info)
         self.config = validate_and_normalise_user_input(
-            get_tenant_ids_for_user_id,
+            get_tenant_id_for_user_id,
             get_allowed_domains_for_tenant_id,
             error_handlers,
             override,
@@ -109,8 +109,8 @@ def __init__(
             else self.config.override.apis(api_implementation)
         )
 
-        self.get_tenant_ids_for_user_id_funcs_from_other_recipes: List[
-            TypeGetTenantIdsForUserId
+        self.get_tenant_id_for_user_id_funcs_from_other_recipes: List[
+            TypeGetTenantIdForUserId
         ] = []
 
         self.static_third_party_providers: List[ProviderInput] = []
@@ -169,7 +169,7 @@ def get_all_cors_headers(self) -> List[str]:
 
     @staticmethod
     def init(
-        get_tenant_ids_for_user_id: Union[TypeGetTenantIdsForUserId, None] = None,
+        get_tenant_id_for_user_id: Union[TypeGetTenantIdForUserId, None] = None,
         get_allowed_domains_for_tenant_id: Union[
             TypeGetAllowedDomainsForTenantId, None
         ] = None,
@@ -181,7 +181,7 @@ def func(app_info: AppInfo):
                 MultitenancyRecipe.__instance = MultitenancyRecipe(
                     MultitenancyRecipe.recipe_id,
                     app_info,
-                    get_tenant_ids_for_user_id,
+                    get_tenant_id_for_user_id,
                     get_allowed_domains_for_tenant_id,
                     error_handlers,
                     override,
@@ -219,23 +219,23 @@ def reset():
             raise_general_exception("calling testing function in non testing env")
         MultitenancyRecipe.__instance = None
 
-    async def get_tenant_ids_for_user_id(
+    async def get_tenant_id_for_user_id(
         self, user_id: str, user_context: Dict[str, Any]
-    ) -> Union[TenantIdsOkResult, UnknownUserIdError]:
-        if self.config.get_tenant_ids_for_user_id is not None:
-            res = await self.config.get_tenant_ids_for_user_id(user_id, user_context)
+    ) -> 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_ids_for_user_id_funcs_from_other_recipes:
+        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_ids_for_user_id_func(self, f: TypeGetTenantIdsForUserId):
-        self.get_tenant_ids_for_user_id_funcs_from_other_recipes.append(f)
+    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):
@@ -286,12 +286,12 @@ 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_ids_for_user_id(
+            tenant_ids_res = await recipe.get_tenant_id_for_user_id(
                 user_id, user_context
             )
 
-            if isinstance(tenant_ids_res, TenantIdsOkResult):
-                for tenant_id in tenant_ids_res.tenant_ids:
+            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 (
                             []

supertokens_python/recipe/multitenancy/utils.py

@@ -25,7 +25,7 @@
 if TYPE_CHECKING:
     from typing import Union
     from .interfaces import (
-        TypeGetTenantIdsForUserId,
+        TypeGetTenantIdForUserId,
         TypeGetAllowedDomainsForTenantId,
         RecipeInterface,
         APIInterface,
@@ -125,19 +125,19 @@ def __init__(
 class MultitenancyConfig:
     def __init__(
         self,
-        get_tenant_ids_for_user_id: Union[TypeGetTenantIdsForUserId, None],
+        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_ids_for_user_id = get_tenant_ids_for_user_id
+        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_ids_for_user_id: Optional[TypeGetTenantIdsForUserId],
+    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 +155,7 @@ def validate_and_normalise_user_input(
         override = InputOverrideConfig()
 
     return MultitenancyConfig(
-        get_tenant_ids_for_user_id,
+        get_tenant_id_for_user_id,
         get_allowed_domains_for_tenant_id,
         error_handlers,
         OverrideConfig(override.functions, override.apis),

supertokens_python/recipe/thirdparty/recipe.py

@@ -19,7 +19,7 @@
 from supertokens_python.normalised_url_path import NormalisedURLPath
 from supertokens_python.querier import Querier
 from supertokens_python.recipe.multitenancy.interfaces import (
-    TenantIdsOkResult,
+    TenantIdOkResult,
     UnknownUserIdError as MTUnknownUserIdError,
 )
 from supertokens_python.recipe_module import APIHandled, RecipeModule
@@ -92,8 +92,8 @@ def callback():
             mt_recipe = MultitenancyRecipe.get_instance_optional()
             if mt_recipe:
                 mt_recipe.static_third_party_providers = self.providers
-                mt_recipe.add_get_tenant_ids_for_user_id_func(
-                    self.get_tenant_ids_for_user_id
+                mt_recipe.add_get_tenant_id_for_user_id_func(
+                    self.get_tenant_id_for_user_id
                 )
 
         PostSTInitCallbacks.add_post_init_callback(callback)
@@ -212,7 +212,7 @@ async def get_email_for_user_id(self, user_id: str, user_context: Dict[str, Any]
 
         return UnknownUserIdError()
 
-    async def get_tenant_ids_for_user_id(
+    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(
@@ -221,4 +221,4 @@ async def get_tenant_ids_for_user_id(
         if user_info is None:
             return MTUnknownUserIdError()
 
-        return TenantIdsOkResult(user_info.tenant_ids)
+        return TenantIdOkResult(user_info.tenant_ids)

supertokens_python/recipe/thirdparty/types.py

@@ -14,7 +14,6 @@
 from typing import Any, Callable, Dict, List, Union
 
 from supertokens_python.framework.request import BaseRequest
-from supertokens_python.recipe.multitenancy.constants import DEFAULT_TENANT_ID
 
 
 class ThirdPartyInfo:
@@ -43,15 +42,13 @@ def __init__(
         self.email: str = email
         self.time_joined: int = time_joined
         self.third_party_info: ThirdPartyInfo = third_party_info
-        self.tenant_ids: List[str] = []
+        self.tenant_id: Union[str, None] = None
 
         self._update_tenant_ids()
 
     def _update_tenant_ids(self):
-        if "|" in self.user_id:
-            self.tenant_ids = [self.user_id.split("|")[1]]
-        else:
-            self.tenant_ids = [DEFAULT_TENANT_ID]
+        if "|" in self.third_party_info.user_id:
+            self.tenant_id = self.third_party_info.user_id.split("|")[1]
 
 
 class UserInfoEmail:

supertokens_python/recipe/thirdpartyemailpassword/types.py

@@ -20,7 +20,6 @@
     SMTPServiceInterface,
 )
 from supertokens_python.recipe.emailpassword import types as ep_types
-from supertokens_python.recipe.multitenancy.constants import DEFAULT_TENANT_ID
 
 from ..thirdparty.types import ThirdPartyInfo
 
@@ -37,14 +36,14 @@ def __init__(
         self.email = email
         self.time_joined = time_joined
         self.third_party_info = third_party_info
-        self.tenant_ids = [DEFAULT_TENANT_ID]
+        self.tenant_id: Union[str, None] = None
 
         self._update_tenant_ids()
 
     def _update_tenant_ids(self):
         if self.third_party_info is not None:
             if "|" in self.third_party_info.user_id:
-                self.tenant_ids = [self.third_party_info.user_id.split("|")[1]]
+                self.tenant_id = self.third_party_info.user_id.split("|")[1]
 
 
 # Export:

supertokens_python/recipe/thirdpartypasswordless/types.py

@@ -42,6 +42,14 @@ def __init__(
         self.phone_number: Union[str, None] = phone_number
         self.time_joined: int = time_joined
         self.third_party_info: Union[ThirdPartyInfo, None] = third_party_info
+        self.tenant_id: Union[str, None] = None
+
+        self._update_tenant_ids()
+
+    def _update_tenant_ids(self):
+        if self.third_party_info is not None:
+            if "|" in self.third_party_info.user_id:
+                self.tenant_id = self.third_party_info.user_id.split("|")[1]
 
 
 _T = TypeVar("_T")

supertokens_python/recipe/thirdpartypasswordless/utils.py

@@ -29,7 +29,7 @@
     ContactEmailOrPhoneConfig,
     ContactPhoneOnlyConfig,
 )
-from supertokens_python.recipe.thirdparty.provider import Provider, ProviderInput
+from supertokens_python.recipe.thirdparty.provider import ProviderInput
 from supertokens_python.recipe.thirdpartypasswordless.emaildelivery.services.backward_compatibility import (
     BackwardCompatibilityService,
 )