small changes

Author: rishabhpoddar

supertokens_python/recipe/multifactorauth/api/implementation.py

@@ -14,7 +14,10 @@
 from __future__ import annotations
 import importlib
 
-from typing import Any, Dict, List, Union, TYPE_CHECKING
+from typing import Any, Dict, List, Union
+from supertokens_python.recipe.multifactorauth.multi_factor_auth_claim import (
+    MultiFactorAuthClaim,
+)
 
 from supertokens_python.recipe.session import SessionContainer
 from supertokens_python.recipe.multitenancy.asyncio import get_tenant
@@ -33,11 +36,6 @@
     ResyncSessionAndFetchMFAInfoPUTOkResult,
 )
 
-if TYPE_CHECKING:
-    from ..multi_factor_auth_claim import (
-        MultiFactorAuthClaimClass as MultiFactorAuthClaimType,
-    )
-
 
 class APIImplementation(APIInterface):
     async def resync_session_and_fetch_mfa_info_put(
@@ -47,10 +45,6 @@ async def resync_session_and_fetch_mfa_info_put(
         user_context: Dict[str, Any],
     ) -> Union[ResyncSessionAndFetchMFAInfoPUTOkResult, GeneralErrorResponse]:
 
-        mfa = importlib.import_module("supertokens_python.recipe.multifactorauth")
-
-        MultiFactorAuthClaim: MultiFactorAuthClaimType = mfa.MultiFactorAuthClaim
-
         module = importlib.import_module(
             "supertokens_python.recipe.multifactorauth.utils"
         )

supertokens_python/recipe/multifactorauth/utils.py

@@ -12,9 +12,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from __future__ import annotations
-import importlib
-
 from typing import TYPE_CHECKING, List, Optional, Union, Dict, Any
+from supertokens_python.recipe.multitenancy.asyncio import get_tenant
+from supertokens_python.recipe.multitenancy.recipe import MultitenancyRecipe
 from supertokens_python.recipe.session import SessionContainer
 from supertokens_python.recipe.session.asyncio import get_session_information
 from supertokens_python.recipe.session.exceptions import UnauthorisedError
@@ -35,9 +35,6 @@
     from supertokens_python.recipe.multifactorauth.multi_factor_auth_claim import (
         MultiFactorAuthClaimClass,
     )
-    from supertokens_python.recipe.multitenancy.recipe import (
-        MultitenancyRecipe as MTRecipeType,
-    )
 
 
 def validate_and_normalise_user_input(
@@ -203,16 +200,7 @@ async def user_getter():
     async def get_required_secondary_factors_for_tenant(
         tenant_id: str, user_context: Dict[str, Any]
     ) -> List[str]:
-
-        MultitenancyRecipe = importlib.import_module(
-            "supertokens_python.recipe.multitenancy.recipe"
-        )
-
-        mt_recipe: MTRecipeType = MultitenancyRecipe.get_instance()
-
-        tenant_info = await mt_recipe.recipe_implementation.get_tenant(
-            tenant_id=tenant_id, user_context=user_context
-        )
+        tenant_info = await get_tenant(tenant_id, user_context)
         if tenant_info is None:
             raise UnauthorisedError("Tenant not found")
         return (
@@ -276,14 +264,8 @@ async def is_valid_first_factor(
     tenant_id: str, factor_id: str, user_context: Dict[str, Any]
 ) -> Literal["OK", "INVALID_FIRST_FACTOR_ERROR", "TENANT_NOT_FOUND_ERROR"]:
 
-    MultitenancyRecipe = importlib.import_module(
-        "supertokens_python.recipe.multitenancy.recipe"
-    )
-
-    mt_recipe: MTRecipeType = MultitenancyRecipe.get_instance()
-    tenant_info = await mt_recipe.recipe_implementation.get_tenant(
-        tenant_id=tenant_id, user_context=user_context
-    )
+    mt_recipe = MultitenancyRecipe.get_instance()
+    tenant_info = await get_tenant(tenant_id=tenant_id, user_context=user_context)
     if tenant_info is None:
         return "TENANT_NOT_FOUND_ERROR"
 

supertokens_python/supertokens.py

@@ -13,7 +13,6 @@
 # under the License.
 
 from __future__ import annotations
-import importlib
 
 from os import environ
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Set, Union, Tuple
@@ -277,11 +276,9 @@ def make_recipe(recipe: Callable[[AppInfo], RecipeModule]) -> RecipeModule:
         self.recipe_modules: List[RecipeModule] = list(map(make_recipe, recipe_list))
 
         if not multitenancy_found:
-            module = importlib.import_module(
-                "supertokens_python.recipe.multitenancy.recipe"
-            )
+            from supertokens_python.recipe.multitenancy.recipe import MultitenancyRecipe
 
-            self.recipe_modules.append(module.init()(self.app_info))
+            self.recipe_modules.append(MultitenancyRecipe.init()(self.app_info))
         if totp_found and not multi_factor_auth_found:
             raise Exception("Please initialize the MultiFactorAuth recipe to use TOTP.")
         if not user_metadata_found: