refactor: Remove redundant API Implementation

Author: KShivendu

supertokens_python/recipe/multitenancy/api/implementation.py

@@ -40,15 +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_res is None:
+        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
@@ -66,27 +67,20 @@ async def login_methods_get(
                 )
 
                 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
-                    )
-                )
-            except Exception as e:
-                if isinstance(e, ClientTypeNotFoundError):
-                    continue
-                raise e
+            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
             ),
         )

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,65 +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
-        )
-
-        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
-
-        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,
-                )
-
-                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(
-            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