fix: handle tenant not found error

KShivendu · KShivendu · commit 248678b7dd46 · 2023-08-10T17:50:19.000+05:30
diff --git a/supertokens_python/recipe/multitenancy/api/implementation.py b/supertokens_python/recipe/multitenancy/api/implementation.py
@@ -44,6 +44,9 @@ async def login_methods_get(
             tenant_id, user_context
         )
 
+        if tenant_config_res 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
 
@@ -61,6 +64,11 @@ async def login_methods_get(
                     client_type,
                     user_context,
                 )
+
+                if provider_instance is None:
+                    # because creating instance from the merged provider list itself
+                    raise Exception("Should never come here")
+
                 final_provider_list.append(
                     ThirdPartyProvider(
                         provider_instance.id, provider_instance.config.name
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
@@ -216,6 +216,9 @@ async def login_methods_get(
             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.third_party.providers
 
@@ -233,6 +236,10 @@ async def login_methods_get(
                     client_type,
                     user_context,
                 )
+
+                if provider_instance is None:
+                    raise Exception("Should never come here")
+
             except ClientTypeNotFoundError:
                 continue
             final_provider_list.append(
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/supertokens_python/recipe/thirdpartyemailpassword/recipeimplementation/third_party_recipe_implementation.py b/supertokens_python/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/supertokens_python/recipe/thirdpartypasswordless/recipeimplementation/third_party_recipe_implementation.py b/supertokens_python/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
         )
diff --git a/tests/multitenancy/test_tenants_crud.py b/tests/multitenancy/test_tenants_crud.py
@@ -75,18 +75,21 @@ async def test_tenant_crud():
     assert len(tenants.tenants) == 4
 
     t1_config = await get_tenant("t1")
+    assert t1_config is not None
     assert t1_config.emailpassword.enabled is True
     assert t1_config.passwordless.enabled is False
     assert t1_config.third_party.enabled is False
     assert t1_config.core_config == {}
 
     t2_config = await get_tenant("t2")
+    assert t2_config is not None
     assert t2_config.emailpassword.enabled is False
     assert t2_config.passwordless.enabled is True
     assert t2_config.third_party.enabled is False
     assert t2_config.core_config == {}
 
     t3_config = await get_tenant("t3")
+    assert t3_config is not None
     assert t3_config.emailpassword.enabled is False
     assert t3_config.passwordless.enabled is False
     assert t3_config.third_party.enabled is True
@@ -95,6 +98,7 @@ async def test_tenant_crud():
     # update tenant1 to add passwordless:
     await create_or_update_tenant("t1", TenantConfig(passwordless_enabled=True))
     t1_config = await get_tenant("t1")
+    assert t1_config is not None
     assert t1_config.emailpassword.enabled is True
     assert t1_config.passwordless.enabled is True
     assert t1_config.third_party.enabled is False
@@ -103,6 +107,8 @@ async def test_tenant_crud():
     # update tenant1 to add thirdparty:
     await create_or_update_tenant("t1", TenantConfig(third_party_enabled=True))
     t1_config = await get_tenant("t1")
+    assert t1_config is not None
+    assert t1_config is not None
     assert t1_config.emailpassword.enabled is True
     assert t1_config.passwordless.enabled is True
     assert t1_config.third_party.enabled is True
@@ -131,6 +137,7 @@ async def test_tenant_thirdparty_config():
     )
 
     tenant_config = await get_tenant("t1")
+    assert tenant_config is not None
 
     assert len(tenant_config.third_party.providers) == 1
     provider = tenant_config.third_party.providers[0]
@@ -189,6 +196,7 @@ async def generate_fake_email(_: str, __: str, ___: Dict[str, Any]):
     )
 
     tenant_config = await get_tenant("t1")
+    assert tenant_config is not None
     assert len(tenant_config.third_party.providers) == 1
     provider = tenant_config.third_party.providers[0]
     assert provider.third_party_id == "google"
@@ -232,6 +240,7 @@ async def generate_fake_email(_: str, __: str, ___: Dict[str, Any]):
     await delete_third_party_config("t1", "google")
 
     tenant_config = await get_tenant("t1")
+    assert tenant_config is not None
     assert len(tenant_config.third_party.providers) == 0
 
 
diff --git a/tests/thirdparty/test_multitenancy.py b/tests/thirdparty/test_multitenancy.py
@@ -201,19 +201,25 @@ async def test_get_provider():
     )
 
     provider1 = await get_provider("t1", "google", None)
-    assert provider1.provider.config.third_party_id == "google"
+    assert provider1 is not None
+    assert provider1.config.third_party_id == "google"
 
     provider2 = await get_provider("t1", "facebook", None)
-    assert provider2.provider.config.third_party_id == "facebook"
+    assert provider2 is not None
+    assert provider2.config.third_party_id == "facebook"
 
     provider3 = await get_provider("t2", "facebook", None)
-    assert provider3.provider.config.third_party_id == "facebook"
+    assert provider3 is not None
+    assert provider3.config.third_party_id == "facebook"
 
     provider4 = await get_provider("t2", "discord", None)
-    assert provider4.provider.config.third_party_id == "discord"
+    assert provider4 is not None
+    assert provider4.config.third_party_id == "discord"
 
     provider5 = await get_provider("t3", "discord", None)
-    assert provider5.provider.config.third_party_id == "discord"
+    assert provider5 is not None
+    assert provider5.config.third_party_id == "discord"
 
     provider6 = await get_provider("t3", "linkedin", None)
-    assert provider6.provider.config.third_party_id == "linkedin"
+    assert provider6 is not None
+    assert provider6.config.third_party_id == "linkedin"
