Merge pull request #403 from supertokens/handle-tenant-not-found

fix: handle tenant not found error
supertokens · Aug 14, 2023 · f95a9d1 · f95a9d1
2 parents 87b74e7 + 01b87ec
commit f95a9d1
Show file tree

Hide file tree

Showing 18 changed files with 77 additions and 111 deletions.
diff --git a/supertokens_python/recipe/multitenancy/api/implementation.py b/supertokens_python/recipe/multitenancy/api/implementation.py
@@ -40,12 +40,16 @@ async def login_methods_get(
         api_options: APIOptions,
         user_context: Dict[str, Any],
     ) -> Union[LoginMethodsGetOkResult, GeneralErrorResponse]:
-        tenant_config_res = await api_options.recipe_implementation.get_tenant(
+
+        tenant_config = await api_options.recipe_implementation.get_tenant(
             tenant_id, user_context
         )
 
+        if tenant_config is None:
+            raise Exception("Tenant not found")
+
         provider_inputs_from_static = api_options.static_third_party_providers
-        provider_configs_from_core = tenant_config_res.third_party.providers
+        provider_configs_from_core = tenant_config.third_party.providers
 
         merged_providers = merge_providers_from_core_and_static(
             provider_configs_from_core, provider_inputs_from_static
@@ -61,24 +65,22 @@ async def login_methods_get(
                     client_type,
                     user_context,
                 )
-                final_provider_list.append(
-                    ThirdPartyProvider(
-                        provider_instance.id, provider_instance.config.name
-                    )
-                )
-            except Exception as e:
-                if isinstance(e, ClientTypeNotFoundError):
-                    continue
-                raise e
+
+                if provider_instance is None:
+                    raise Exception("Should never come here")
+
+            except ClientTypeNotFoundError:
+                continue
+            final_provider_list.append(
+                ThirdPartyProvider(provider_instance.id, provider_instance.config.name)
+            )
 
         return LoginMethodsGetOkResult(
             email_password=LoginMethodEmailPassword(
-                tenant_config_res.emailpassword.enabled
-            ),
-            passwordless=LoginMethodPasswordless(
-                tenant_config_res.passwordless.enabled
+                tenant_config.emailpassword.enabled
             ),
+            passwordless=LoginMethodPasswordless(tenant_config.passwordless.enabled),
             third_party=LoginMethodThirdParty(
-                tenant_config_res.third_party.enabled, final_provider_list
+                tenant_config.third_party.enabled, final_provider_list
             ),
         )
diff --git a/supertokens_python/recipe/multitenancy/asyncio/__init__.py b/supertokens_python/recipe/multitenancy/asyncio/__init__.py
@@ -61,7 +61,7 @@ async def delete_tenant(
 
 async def get_tenant(
     tenant_id: str, user_context: Optional[Dict[str, Any]] = None
-) -> GetTenantOkResult:
+) -> Optional[GetTenantOkResult]:
     if user_context is None:
         user_context = {}
     recipe = MultitenancyRecipe.get_instance()

diff --git a/supertokens_python/recipe/multitenancy/interfaces.py b/supertokens_python/recipe/multitenancy/interfaces.py
@@ -217,7 +217,7 @@ async def delete_tenant(
     @abstractmethod
     async def get_tenant(
         self, tenant_id: str, user_context: Dict[str, Any]
-    ) -> GetTenantOkResult:
+    ) -> Optional[GetTenantOkResult]:
         pass
 
     @abstractmethod

diff --git a/supertokens_python/recipe/multitenancy/recipe.py b/supertokens_python/recipe/multitenancy/recipe.py
@@ -27,7 +27,6 @@
 from ...post_init_callbacks import PostSTInitCallbacks
 
 from .interfaces import (
-    APIInterface,
     APIOptions,
     TypeGetAllowedDomainsForTenantId,
 )
@@ -42,19 +41,12 @@
 
 from supertokens_python.normalised_url_path import NormalisedURLPath
 from supertokens_python.querier import Querier
-from supertokens_python.types import GeneralErrorResponse
+from supertokens_python.recipe.multitenancy.api.implementation import APIImplementation
 
 
 from .api import handle_login_methods_api
 from .constants import LOGIN_METHODS
 from .exceptions import MultitenancyError
-from .interfaces import (
-    LoginMethodsGetOkResult,
-    ThirdPartyProvider,
-    LoginMethodEmailPassword,
-    LoginMethodPasswordless,
-    LoginMethodThirdParty,
-)
 from .utils import (
     InputOverrideConfig,
     validate_and_normalise_user_input,
@@ -196,58 +188,6 @@ def reset():
         MultitenancyRecipe.__instance = None
 
 
-class APIImplementation(APIInterface):
-    async def login_methods_get(
-        self,
-        tenant_id: str,
-        client_type: Optional[str],
-        api_options: APIOptions,
-        user_context: Dict[str, Any],
-    ) -> Union[LoginMethodsGetOkResult, GeneralErrorResponse]:
-        from supertokens_python.recipe.thirdparty.providers.config_utils import (
-            find_and_create_provider_instance,
-            merge_providers_from_core_and_static,
-        )
-        from supertokens_python.recipe.thirdparty.exceptions import (
-            ClientTypeNotFoundError,
-        )
-
-        tenant_config = await api_options.recipe_implementation.get_tenant(
-            tenant_id, user_context
-        )
-
-        provider_inputs_from_static = api_options.static_third_party_providers
-        provider_configs_from_core = tenant_config.third_party.providers
-
-        merged_providers = merge_providers_from_core_and_static(
-            provider_configs_from_core, provider_inputs_from_static
-        )
-
-        final_provider_list: List[ThirdPartyProvider] = []
-
-        for provider_input in merged_providers:
-            try:
-                provider_instance = await find_and_create_provider_instance(
-                    merged_providers,
-                    provider_input.config.third_party_id,
-                    client_type,
-                    user_context,
-                )
-            except ClientTypeNotFoundError:
-                continue
-            final_provider_list.append(
-                ThirdPartyProvider(provider_instance.id, provider_instance.config.name)
-            )
-
-        return LoginMethodsGetOkResult(
-            LoginMethodEmailPassword(tenant_config.emailpassword.enabled),
-            LoginMethodPasswordless(tenant_config.passwordless.enabled),
-            LoginMethodThirdParty(
-                tenant_config.third_party.enabled, final_provider_list
-            ),
-        )
-
-
 class AllowedDomainsClaimClass(PrimitiveArrayClaim[List[str]]):
     def __init__(self):
         default_max_age_in_sec = 60 * 60

diff --git a/supertokens_python/recipe/multitenancy/recipe_implementation.py b/supertokens_python/recipe/multitenancy/recipe_implementation.py
@@ -160,13 +160,16 @@ async def delete_tenant(
 
     async def get_tenant(
         self, tenant_id: Optional[str], user_context: Dict[str, Any]
-    ) -> GetTenantOkResult:
+    ) -> Optional[GetTenantOkResult]:
         res = await self.querier.send_get_request(
             NormalisedURLPath(
                 f"{tenant_id or DEFAULT_TENANT_ID}/recipe/multitenancy/tenant"
             ),
         )
 
+        if res["status"] == "TENANT_NOT_FOUND_ERROR":
+            return None
+
         tenant_config = parse_tenant_config(res)
 
         return GetTenantOkResult(

diff --git a/supertokens_python/recipe/thirdparty/api/authorisation_url.py b/supertokens_python/recipe/thirdparty/api/authorisation_url.py
@@ -19,7 +19,7 @@
 if TYPE_CHECKING:
     from supertokens_python.recipe.thirdparty.interfaces import APIOptions, APIInterface
 
-from supertokens_python.exceptions import raise_bad_input_exception
+from supertokens_python.exceptions import raise_bad_input_exception, BadInputError
 from supertokens_python.utils import send_200_response
 
 
@@ -53,7 +53,12 @@ async def handle_authorisation_url_api(
         user_context=user_context,
     )
 
-    provider = provider_response.provider
+    if provider_response is None:
+        raise BadInputError(
+            f"the provider {third_party_id} could not be found in the configuration"
+        )
+
+    provider = provider_response
     result = await api_implementation.authorisation_url_get(
         provider=provider,
         redirect_uri_on_provider_dashboard=redirect_uri_on_provider_dashboard,

diff --git a/supertokens_python/recipe/thirdparty/api/signinup.py b/supertokens_python/recipe/thirdparty/api/signinup.py
@@ -19,7 +19,7 @@
 if TYPE_CHECKING:
     from supertokens_python.recipe.thirdparty.interfaces import APIOptions, APIInterface
 
-from supertokens_python.exceptions import raise_bad_input_exception
+from supertokens_python.exceptions import raise_bad_input_exception, BadInputError
 from supertokens_python.utils import send_200_response
 
 
@@ -64,7 +64,12 @@ async def handle_sign_in_up_api(
         user_context=user_context,
     )
 
-    provider = provider_response.provider
+    if provider_response is None:
+        raise BadInputError(
+            f"the provider {third_party_id} could not be found in the configuration"
+        )
+
+    provider = provider_response
 
     result = await api_implementation.sign_in_up_post(
         provider=provider,

diff --git a/supertokens_python/recipe/thirdparty/interfaces.py b/supertokens_python/recipe/thirdparty/interfaces.py
@@ -114,7 +114,7 @@ async def get_provider(
         client_type: Optional[str],
         tenant_id: str,
         user_context: Dict[str, Any],
-    ) -> GetProviderOkResult:
+    ) -> Optional[Provider]:
         pass
 
 

diff --git a/supertokens_python/recipe/thirdparty/providers/config_utils.py b/supertokens_python/recipe/thirdparty/providers/config_utils.py
@@ -262,13 +262,11 @@ async def find_and_create_provider_instance(
     third_party_id: str,
     client_type: Optional[str],
     user_context: Dict[str, Any],
-) -> Provider:
+) -> Optional[Provider]:
     for provider_input in providers:
         if provider_input.config.third_party_id == third_party_id:
             provider_instance = create_provider(provider_input)
             await fetch_and_set_config(provider_instance, client_type, user_context)
             return provider_instance
 
-    raise Exception(
-        f"the provider {third_party_id} could not be found in the configuration"
-    )
+    return None
diff --git a/supertokens_python/recipe/thirdparty/recipe_implementation.py b/supertokens_python/recipe/thirdparty/recipe_implementation.py
@@ -27,7 +27,6 @@
     from supertokens_python.querier import Querier
 
 from .interfaces import (
-    GetProviderOkResult,
     ManuallyCreateOrUpdateUserOkResult,
     RecipeInterface,
     SignInUpOkResult,
@@ -189,6 +188,9 @@ async def get_provider(
             user_context=user_context,
         )
 
+        if tenant_config is None:
+            raise Exception("Tenant not found")
+
         merged_providers = merge_providers_from_core_and_static(
             provider_configs_from_core=tenant_config.third_party.providers,
             provider_inputs_from_static=self.providers,
@@ -198,6 +200,4 @@ async def get_provider(
             merged_providers, third_party_id, client_type, user_context
         )
 
-        return GetProviderOkResult(
-            provider,
-        )
+        return provider
diff --git a/supertokens_python/recipe/thirdpartyemailpassword/interfaces.py b/supertokens_python/recipe/thirdpartyemailpassword/interfaces.py
@@ -149,7 +149,7 @@ async def thirdparty_get_provider(
         client_type: Optional[str],
         tenant_id: str,
         user_context: Dict[str, Any],
-    ) -> ThirdPartyInterfaces.GetProviderOkResult:
+    ) -> Optional[ThirdPartyInterfaces.Provider]:
         pass
 
     @abstractmethod

diff --git a/supertokens_python/recipe/thirdpartyemailpassword/recipeimplementation/implementation.py b/supertokens_python/recipe/thirdpartyemailpassword/recipeimplementation/implementation.py
@@ -16,8 +16,7 @@
 from typing import TYPE_CHECKING, Any, Dict, List, Union, Callable, Optional
 
 import supertokens_python.recipe.emailpassword.interfaces as EPInterfaces
-from supertokens_python.recipe.thirdparty.interfaces import GetProviderOkResult
-from supertokens_python.recipe.thirdparty.provider import ProviderInput
+from supertokens_python.recipe.thirdparty.provider import ProviderInput, Provider
 from supertokens_python.recipe.thirdparty.types import RawUserInfoFromProvider
 from supertokens_python.recipe.emailpassword.utils import EmailPasswordConfig
 
@@ -276,7 +275,7 @@ async def thirdparty_get_provider(
         client_type: Optional[str],
         tenant_id: str,
         user_context: Dict[str, Any],
-    ) -> GetProviderOkResult:
+    ) -> Optional[Provider]:
         if self.tp_get_provider is None:
             raise Exception("No thirdparty provider configured")
 

diff --git a/.../recipe/thirdpartyemailpassword/recipeimplementation/third_party_recipe_implementation.py b/.../recipe/thirdpartyemailpassword/recipeimplementation/third_party_recipe_implementation.py
@@ -16,11 +16,11 @@
 from typing import Any, Dict, List, Optional, Union
 
 from supertokens_python.recipe.thirdparty.interfaces import (
-    GetProviderOkResult,
     ManuallyCreateOrUpdateUserOkResult,
     RecipeInterface,
     SignInUpOkResult,
 )
+from supertokens_python.recipe.thirdparty.provider import Provider
 from supertokens_python.recipe.thirdparty.types import RawUserInfoFromProvider, User
 from supertokens_python.recipe.thirdpartyemailpassword.interfaces import (
     RecipeInterface as ThirdPartyEmailPasswordRecipeInterface,
@@ -164,7 +164,7 @@ async def get_provider(
         client_type: Optional[str],
         tenant_id: str,
         user_context: Dict[str, Any],
-    ) -> GetProviderOkResult:
+    ) -> Optional[Provider]:
         return await self.recipe_implementation.thirdparty_get_provider(
             third_party_id,
             client_type,

diff --git a/supertokens_python/recipe/thirdpartypasswordless/interfaces.py b/supertokens_python/recipe/thirdpartypasswordless/interfaces.py
@@ -136,7 +136,7 @@ async def thirdparty_get_provider(
         client_type: Optional[str],
         tenant_id: str,
         user_context: Dict[str, Any],
-    ) -> ThirdPartyInterfaces.GetProviderOkResult:
+    ) -> Optional[ThirdPartyInterfaces.Provider]:
         pass
 
     @abstractmethod

diff --git a/supertokens_python/recipe/thirdpartypasswordless/recipeimplementation/implementation.py b/supertokens_python/recipe/thirdpartypasswordless/recipeimplementation/implementation.py
@@ -15,7 +15,7 @@
 
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
 
-from supertokens_python.recipe.thirdparty.provider import ProviderInput
+from supertokens_python.recipe.thirdparty.provider import ProviderInput, Provider
 from supertokens_python.recipe.thirdparty.types import RawUserInfoFromProvider
 
 from ...passwordless.interfaces import (
@@ -42,7 +42,6 @@
     UpdateUserUnknownUserIdError,
 )
 from ...thirdparty.interfaces import (
-    GetProviderOkResult,
     ManuallyCreateOrUpdateUserOkResult,
     SignInUpOkResult,
 )
@@ -296,7 +295,7 @@ async def thirdparty_get_provider(
         client_type: Optional[str],
         tenant_id: str,
         user_context: Dict[str, Any],
-    ) -> GetProviderOkResult:
+    ) -> Optional[Provider]:
         if self.tp_get_provider is None:
             raise Exception("No thirdparty provider configured")
         return await self.tp_get_provider(

diff --git a/...n/recipe/thirdpartypasswordless/recipeimplementation/third_party_recipe_implementation.py b/...n/recipe/thirdpartypasswordless/recipeimplementation/third_party_recipe_implementation.py
@@ -16,14 +16,14 @@
 from typing import Any, Dict, List, Optional, Union
 
 from supertokens_python.recipe.thirdparty.interfaces import (
-    GetProviderOkResult,
     ManuallyCreateOrUpdateUserOkResult,
     RecipeInterface,
     SignInUpOkResult,
 )
 from supertokens_python.recipe.thirdparty.types import RawUserInfoFromProvider, User
 
 from ..interfaces import RecipeInterface as ThirdPartyPasswordlessRecipeInterface
+from ...thirdparty.provider import Provider
 
 
 class RecipeImplementation(RecipeInterface):
@@ -138,7 +138,7 @@ async def get_provider(
         client_type: Optional[str],
         tenant_id: str,
         user_context: Dict[str, Any],
-    ) -> GetProviderOkResult:
+    ) -> Optional[Provider]:
         return await self.recipe_implementation.thirdparty_get_provider(
             third_party_id, client_type, tenant_id, user_context
         )