Remove get_link_domain_and_path function and ev logic from other recipes

Author: KShivendu

supertokens_python/recipe/emailpassword/utils.py

@@ -24,12 +24,10 @@
     BackwardCompatibilityService,
 )
 
-from ..emailverification.types import User as EmailVerificationUser
 from .interfaces import APIInterface, RecipeInterface
 from .types import InputFormField, NormalisedFormField, EmailTemplateVars, User
 
 if TYPE_CHECKING:
-    from .recipe import EmailPasswordRecipe
     from supertokens_python.supertokens import AppInfo
 
 from typing import Dict
@@ -233,40 +231,6 @@ def validate_and_normalise_reset_password_using_token_config(
     )
 
 
-def email_verification_create_and_send_custom_email(
-    recipe: EmailPasswordRecipe,
-    create_and_send_custom_email: Callable[
-        [User, str, Dict[str, Any]], Awaitable[None]
-    ],
-) -> Callable[[EmailVerificationUser, str, Dict[str, Any]], Awaitable[None]]:
-    async def func(
-        user: EmailVerificationUser, link: str, user_context: Dict[str, Any]
-    ):
-        user_info = await recipe.recipe_implementation.get_user_by_id(
-            user.user_id, user_context
-        )
-        if user_info is None:
-            raise Exception("Unknown User ID provided")
-        return await create_and_send_custom_email(user_info, link, user_context)
-
-    return func
-
-
-def email_verification_get_email_verification_url(
-    recipe: EmailPasswordRecipe,
-    get_email_verification_url: Callable[[User, Any], Awaitable[str]],
-) -> Callable[[EmailVerificationUser, Any], Awaitable[str]]:
-    async def func(user: EmailVerificationUser, user_context: Dict[str, Any]):
-        user_info = await recipe.recipe_implementation.get_user_by_id(
-            user.user_id, user_context
-        )
-        if user_info is None:
-            raise Exception("Unknown User ID provided")
-        return await get_email_verification_url(user_info, user_context)
-
-    return func
-
-
 class InputOverrideConfig:
     def __init__(
         self,
@@ -346,7 +310,6 @@ def get_email_delivery_config(
             app_info=app_info,
             recipe_interface_impl=ep_recipe,
             reset_password_using_token_feature=reset_password_using_token_feature,
-            # email_verification_feature=email_verification_feature,
         )
         if email_delivery is not None and email_delivery.override is not None:
             override = email_delivery.override

supertokens_python/recipe/passwordless/__init__.py

@@ -55,9 +55,6 @@ def init(
         "USER_INPUT_CODE", "MAGIC_LINK", "USER_INPUT_CODE_AND_MAGIC_LINK"
     ],
     override: Union[InputOverrideConfig, None] = None,
-    get_link_domain_and_path: Union[
-        Callable[[PhoneOrEmailInput, Dict[str, Any]], Awaitable[str]], None
-    ] = None,
     get_custom_user_input_code: Union[
         Callable[[Dict[str, Any]], Awaitable[str]], None
     ] = None,
@@ -68,7 +65,6 @@ def init(
         contact_config,
         flow_type,
         override,
-        get_link_domain_and_path,
         get_custom_user_input_code,
         email_delivery,
         sms_delivery,

supertokens_python/recipe/passwordless/recipe.py

@@ -52,7 +52,6 @@
 from .utils import (
     ContactConfig,
     OverrideConfig,
-    PhoneOrEmailInput,
     validate_and_normalise_user_input,
 )
 from ..emailverification import EmailVerificationRecipe
@@ -90,9 +89,6 @@ def __init__(
         ],
         ingredients: PasswordlessIngredients,
         override: Union[OverrideConfig, None] = None,
-        get_link_domain_and_path: Union[
-            Callable[[PhoneOrEmailInput, Dict[str, Any]], Awaitable[str]], None
-        ] = None,
         get_custom_user_input_code: Union[
             Callable[[Dict[str, Any]], Awaitable[str]], None
         ] = None,
@@ -109,7 +105,6 @@ def __init__(
             contact_config,
             flow_type,
             override,
-            get_link_domain_and_path,
             get_custom_user_input_code,
             email_delivery,
             sms_delivery,
@@ -235,9 +230,6 @@ def init(
             "USER_INPUT_CODE", "MAGIC_LINK", "USER_INPUT_CODE_AND_MAGIC_LINK"
         ],
         override: Union[OverrideConfig, None] = None,
-        get_link_domain_and_path: Union[
-            Callable[[PhoneOrEmailInput, Dict[str, Any]], Awaitable[str]], None
-        ] = None,
         get_custom_user_input_code: Union[
             Callable[[Dict[str, Any]], Awaitable[str]], None
         ] = None,
@@ -258,7 +250,6 @@ def func(app_info: AppInfo):
                     flow_type,
                     ingredients,
                     override,
-                    get_link_domain_and_path,
                     get_custom_user_input_code,
                     email_delivery,
                     sms_delivery,

supertokens_python/recipe/passwordless/utils.py

@@ -62,17 +62,6 @@ async def default_validate_phone_number(value: str):
         return "Phone number is invalid"
 
 
-def default_get_link_domain_and_path(app_info: AppInfo):
-    async def get_link_domain_and_path(_: PhoneOrEmailInput, __: Dict[str, Any]) -> str:
-        return (
-            app_info.website_domain.get_as_string_dangerous()
-            + app_info.website_base_path.get_as_string_dangerous()
-            + "/verify"
-        )
-
-    return get_link_domain_and_path
-
-
 async def default_validate_email(value: str):
     pattern = r"^(([^<>()\[\]\\.,;:\s@\"]+(\.[^<>()\[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$"
     if fullmatch(pattern, value) is None:
@@ -211,9 +200,6 @@ def __init__(
         flow_type: Literal[
             "USER_INPUT_CODE", "MAGIC_LINK", "USER_INPUT_CODE_AND_MAGIC_LINK"
         ],
-        get_link_domain_and_path: Callable[
-            [PhoneOrEmailInput, Dict[str, Any]], Awaitable[str]
-        ],
         get_email_delivery_config: Callable[
             [], EmailDeliveryConfigWithService[PasswordlessLoginEmailTemplateVars]
         ],
@@ -230,7 +216,6 @@ def __init__(
             "USER_INPUT_CODE", "MAGIC_LINK", "USER_INPUT_CODE_AND_MAGIC_LINK"
         ] = flow_type
         self.get_custom_user_input_code = get_custom_user_input_code
-        self.get_link_domain_and_path = get_link_domain_and_path
         self.get_email_delivery_config = get_email_delivery_config
         self.get_sms_delivery_config = get_sms_delivery_config
 
@@ -242,9 +227,6 @@ def validate_and_normalise_user_input(
         "USER_INPUT_CODE", "MAGIC_LINK", "USER_INPUT_CODE_AND_MAGIC_LINK"
     ],
     override: Union[OverrideConfig, None] = None,
-    get_link_domain_and_path: Union[
-        Callable[[PhoneOrEmailInput, Dict[str, Any]], Awaitable[str]], None
-    ] = None,
     get_custom_user_input_code: Union[
         Callable[[Dict[str, Any]], Awaitable[str]], None
     ] = None,
@@ -259,9 +241,6 @@ def validate_and_normalise_user_input(
     if override is None:
         override = OverrideConfig()
 
-    if get_link_domain_and_path is None:
-        get_link_domain_and_path = default_get_link_domain_and_path(app_info)
-
     def get_email_delivery_config() -> EmailDeliveryConfigWithService[
         PasswordlessLoginEmailTemplateVars
     ]:
@@ -330,7 +309,6 @@ def get_sms_delivery_config() -> SMSDeliveryConfigWithService[
         contact_config=contact_config,
         override=OverrideConfig(functions=override.functions, apis=override.apis),
         flow_type=flow_type,
-        get_link_domain_and_path=get_link_domain_and_path,
         get_email_delivery_config=get_email_delivery_config,
         get_sms_delivery_config=get_sms_delivery_config,
         get_custom_user_input_code=get_custom_user_input_code,

supertokens_python/recipe/thirdpartyemailpassword/utils.py

@@ -13,7 +13,7 @@
 # under the License.
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Awaitable, Callable, Dict, List, Union
+from typing import TYPE_CHECKING, Callable, List, Union
 
 from supertokens_python.ingredients.emaildelivery.types import (
     EmailDeliveryConfig,
@@ -28,49 +28,14 @@
     InputResetPasswordUsingTokenFeature,
     InputSignUpFeature,
 )
-from ..emailverification.types import User as EmailVerificationUser
 from .emaildelivery.services.backward_compatibility import BackwardCompatibilityService
 from .interfaces import APIInterface, RecipeInterface
-from .types import EmailTemplateVars, User
+from .types import EmailTemplateVars
 
 if TYPE_CHECKING:
     from .recipe import ThirdPartyEmailPasswordRecipe
 
 
-def email_verification_create_and_send_custom_email(
-    recipe: ThirdPartyEmailPasswordRecipe,
-    create_and_send_custom_email: Callable[
-        [User, str, Dict[str, Any]], Awaitable[None]
-    ],
-) -> Callable[[EmailVerificationUser, str, Dict[str, Any]], Awaitable[None]]:
-    async def func(
-        user: EmailVerificationUser, link: str, user_context: Dict[str, Any]
-    ):
-        user_info = await recipe.recipe_implementation.get_user_by_id(
-            user.user_id, user_context
-        )
-        if user_info is None:
-            raise Exception("Unknown User ID provided")
-        return await create_and_send_custom_email(user_info, link, user_context)
-
-    return func
-
-
-def email_verification_get_email_verification_url(
-    recipe: ThirdPartyEmailPasswordRecipe,
-    get_email_verification_url: Callable[[User, Any], Awaitable[str]],
-) -> Callable[[EmailVerificationUser, Any], Awaitable[str]]:
-    async def func(user: EmailVerificationUser, user_context: Dict[str, Any]):
-        user_info = await recipe.recipe_implementation.get_user_by_id(
-            user.user_id, user_context
-        )
-        if user_info is None:
-            raise Exception("Unknown User ID provided")
-        return await get_email_verification_url(user_info, user_context)
-
-    return func
-
-
 class InputOverrideConfig:
     def __init__(
         self,

supertokens_python/recipe/thirdpartypasswordless/__init__.py

@@ -56,9 +56,6 @@ def init(
     flow_type: Literal[
         "USER_INPUT_CODE", "MAGIC_LINK", "USER_INPUT_CODE_AND_MAGIC_LINK"
     ],
-    get_link_domain_and_path: Union[
-        Callable[[PhoneOrEmailInput, Dict[str, Any]], Awaitable[str]], None
-    ] = None,
     get_custom_user_input_code: Union[
         Callable[[Dict[str, Any]], Awaitable[str]], None
     ] = None,
@@ -70,7 +67,6 @@ def init(
     return ThirdPartyPasswordlessRecipe.init(
         contact_config,
         flow_type,
-        get_link_domain_and_path,
         get_custom_user_input_code,
         email_delivery,
         sms_delivery,

supertokens_python/recipe/thirdpartypasswordless/recipe.py

@@ -28,7 +28,7 @@
 )
 from supertokens_python.recipe_module import APIHandled, RecipeModule
 
-from ..passwordless.utils import ContactConfig, PhoneOrEmailInput
+from ..passwordless.utils import ContactConfig
 from .api.implementation import APIImplementation
 from .api.passwordless_api_impementation import (
     get_interface_impl as get_passwordless_interface_impl,
@@ -88,9 +88,6 @@ def __init__(
             "USER_INPUT_CODE", "MAGIC_LINK", "USER_INPUT_CODE_AND_MAGIC_LINK"
         ],
         ingredients: ThirdPartyPasswordlessIngredients,
-        get_link_domain_and_path: Union[
-            Callable[[PhoneOrEmailInput, Dict[str, Any]], Awaitable[str]], None
-        ] = None,
         get_custom_user_input_code: Union[
             Callable[[Dict[str, Any]], Awaitable[str]], None
         ] = None,
@@ -107,7 +104,6 @@ def __init__(
             contact_config=contact_config,
             flow_type=flow_type,
             get_custom_user_input_code=get_custom_user_input_code,
-            get_link_domain_and_path=get_link_domain_and_path,
             override=override,
             providers=providers,
             email_delivery=email_delivery,
@@ -175,7 +171,6 @@ def apis_override_passwordless(
                 PlessOverrideConfig(
                     func_override_passwordless, apis_override_passwordless
                 ),
-                self.config.get_link_domain_and_path,
                 self.config.get_custom_user_input_code,
             )
 
@@ -276,9 +271,6 @@ def init(
         flow_type: Literal[
             "USER_INPUT_CODE", "MAGIC_LINK", "USER_INPUT_CODE_AND_MAGIC_LINK"
         ],
-        get_link_domain_and_path: Union[
-            Callable[[PhoneOrEmailInput, Dict[str, Any]], Awaitable[str]], None
-        ] = None,
         get_custom_user_input_code: Union[
             Callable[[Dict[str, Any]], Awaitable[str]], None
         ] = None,
@@ -296,7 +288,6 @@ def func(app_info: AppInfo):
                     contact_config,
                     flow_type,
                     ingredients,
-                    get_link_domain_and_path,
                     get_custom_user_input_code,
                     override,
                     providers,