refactor: Clean up usages of email verification in other recipes in favour of ev claims

Author: KShivendu

supertokens_python/recipe/emailpassword/__init__.py

@@ -26,7 +26,6 @@
 exceptions = ex
 InputOverrideConfig = utils.InputOverrideConfig
 InputResetPasswordUsingTokenFeature = utils.InputResetPasswordUsingTokenFeature
-# InputEmailVerificationConfig = utils.InputEmailVerificationConfig
 InputSignUpFeature = utils.InputSignUpFeature
 InputFormField = utils.InputFormField
 SMTPService = emaildelivery_services.SMTPService

supertokens_python/recipe/emailpassword/interfaces.py

@@ -144,7 +144,6 @@ def __init__(
         config: EmailPasswordConfig,
         recipe_implementation: RecipeInterface,
         app_info: AppInfo,
-        # email_verification_recipe_implementation: EmailVerificationRecipeInterface,
         email_delivery: EmailDeliveryIngredient[EmailTemplateVars],
     ):
         self.request: BaseRequest = request
@@ -153,56 +152,9 @@ def __init__(
         self.config: EmailPasswordConfig = config
         self.recipe_implementation: RecipeInterface = recipe_implementation
         self.app_info = app_info
-        # self.email_verification_recipe_implementation: EmailVerificationRecipeInterface = (
-        #     email_verification_recipe_implementation
-        # )
         self.email_delivery = email_delivery
 
 
-class EmailVerifyPostOkResult(APIResponse):
-    status: str = "OK"
-
-    def __init__(self, user: User):
-        self.user = user
-
-    def to_json(self) -> Dict[str, Any]:
-        return {
-            "status": self.status,
-            "user": {"id": self.user.user_id, "email": self.user.email},
-        }
-
-
-class EmailVerifyPostInvalidTokenError(APIResponse):
-    status: str = "EMAIL_VERIFICATION_INVALID_TOKEN_ERROR"
-
-    def to_json(self) -> Dict[str, Any]:
-        return {"status": self.status}
-
-
-class IsEmailVerifiedGetOkResult(APIResponse):
-    status: str = "OK"
-
-    def __init__(self, is_verified: bool):
-        self.is_verified = is_verified
-
-    def to_json(self) -> Dict[str, Any]:
-        return {"status": self.status, "isVerified": self.is_verified}
-
-
-class GenerateEmailVerifyTokenPostOkResult(APIResponse):
-    status: str = "OK"
-
-    def to_json(self) -> Dict[str, Any]:
-        return {"status": self.status}
-
-
-class GenerateEmailVerifyTokenPostEmailAlreadyVerifiedError(APIResponse):
-    status: str = "EMAIL_ALREADY_VERIFIED_ERROR"
-
-    def to_json(self) -> Dict[str, Any]:
-        return {"status": self.status}
-
-
 class EmailExistsGetOkResult(APIResponse):
     status: str = "OK"
 

supertokens_python/recipe/emailpassword/utils.py

@@ -287,31 +287,6 @@ async def func(user: EmailVerificationUser, user_context: Dict[str, Any]):
     return func
 
 
-# def validate_and_normalise_email_verification_config(
-#     recipe: EmailPasswordRecipe,
-#     config: Union[InputEmailVerificationConfig, None],
-#     override: InputOverrideConfig,
-# ) -> ParentRecipeEmailVerificationConfig:
-#     create_and_send_custom_email = None
-#     get_email_verification_url = None
-#     if config is None:
-#         config = InputEmailVerificationConfig()
-#     if config.create_and_send_custom_email is not None:
-#         create_and_send_custom_email = email_verification_create_and_send_custom_email(
-#             recipe, config.create_and_send_custom_email
-#         )
-#     if config.get_email_verification_url is not None:
-#         get_email_verification_url = email_verification_get_email_verification_url(
-#             recipe, config.get_email_verification_url
-#         )
-#     return ParentRecipeEmailVerificationConfig(
-#         get_email_for_user_id=recipe.get_email_for_user_id,
-#         create_and_send_custom_email=create_and_send_custom_email,
-#         get_email_verification_url=get_email_verification_url,
-#         override=override.email_verification_feature,
-#     )
-
-
 class InputOverrideConfig:
     def __init__(
         self,

supertokens_python/recipe/emailverification/interfaces.py

@@ -125,8 +125,7 @@ def to_json(self) -> Dict[str, Any]:
 
 
 class EmailVerifyPostInvalidTokenError(APIResponse):
-    def __init__(self):
-        self.status = "EMAIL_VERIFICATION_INVALID_TOKEN_ERROR"
+    status = "EMAIL_VERIFICATION_INVALID_TOKEN_ERROR"
 
     def to_json(self) -> Dict[str, Any]:
         return {"status": self.status}

supertokens_python/recipe/passwordless/api/implementation.py

@@ -274,18 +274,19 @@ async def consume_code_post(
 
         if user.email is not None:
             ev_instance = EmailVerificationRecipe.get_instance()
-            if ev_instance:
-                token_response = await ev_instance.recipe_implementation.create_email_verification_token(
+            token_response = (
+                await ev_instance.recipe_implementation.create_email_verification_token(
                     user.user_id,
                     user.email,
                     user_context,
                 )
+            )
 
-                if isinstance(token_response, CreateEmailVerificationTokenOkResult):
-                    await ev_instance.recipe_implementation.verify_email_using_token(
-                        token_response.token,
-                        user_context,
-                    )
+            if isinstance(token_response, CreateEmailVerificationTokenOkResult):
+                await ev_instance.recipe_implementation.verify_email_using_token(
+                    token_response.token,
+                    user_context,
+                )
 
         session = await create_new_session(
             api_options.request, user.user_id, {}, {}, user_context=user_context

supertokens_python/recipe/thirdparty/asyncio/__init__.py

@@ -16,7 +16,7 @@
 
 from supertokens_python.recipe.thirdparty.recipe import ThirdPartyRecipe
 
-from ..types import EmailTemplateVars, User
+from ..types import User
 
 
 async def get_user_by_id(
@@ -65,13 +65,3 @@ async def sign_in_up(
     return await ThirdPartyRecipe.get_instance().recipe_implementation.sign_in_up(
         third_party_id, third_party_user_id, email, email_verified, user_context
     )
-
-
-async def send_email(
-    input_: EmailTemplateVars, user_context: Union[None, Dict[str, Any]] = None
-):
-    if user_context is None:
-        user_context = {}
-    return await ThirdPartyRecipe.get_instance().email_delivery.ingredient_interface_impl.send_email(
-        input_, user_context
-    )

supertokens_python/recipe/thirdparty/recipe.py

@@ -32,7 +32,6 @@
     from .utils import SignInAndUpFeature, InputOverrideConfig
 
 from supertokens_python.exceptions import SuperTokensError, raise_general_exception
-from supertokens_python.ingredients.emaildelivery import EmailDeliveryIngredient
 from supertokens_python.recipe.emailverification import EmailVerificationRecipe
 
 from .api import (
@@ -42,14 +41,13 @@
 )
 from .constants import APPLE_REDIRECT_HANDLER, AUTHORISATIONURL, SIGNINUP
 from .exceptions import SuperTokensThirdPartyError
-from .types import ThirdPartyIngredients, EmailTemplateVars
+from .types import ThirdPartyIngredients
 from .utils import validate_and_normalise_user_input
 
 
 class ThirdPartyRecipe(RecipeModule):
     recipe_id = "thirdparty"
     __instance = None
-    email_delivery: EmailDeliveryIngredient[EmailTemplateVars]
 
     def __init__(
         self,

supertokens_python/recipe/thirdparty/syncio/__init__.py

@@ -15,7 +15,7 @@
 
 from supertokens_python.async_to_sync_wrapper import sync
 
-from ..types import EmailTemplateVars, User
+from ..types import User
 
 
 def get_user_by_id(
@@ -62,11 +62,3 @@ def sign_in_up(
             third_party_id, third_party_user_id, email, email_verified, user_context
         )
     )
-
-
-def send_email(
-    input_: EmailTemplateVars, user_context: Union[None, Dict[str, Any]] = None
-):
-    from supertokens_python.recipe.thirdparty.asyncio import send_email
-
-    return sync(send_email(input_, user_context))

supertokens_python/recipe/thirdparty/types.py

@@ -14,11 +14,6 @@
 from typing import Callable, Dict, List, Union
 
 from supertokens_python.framework.request import BaseRequest
-from supertokens_python.ingredients.emaildelivery.types import (
-    EmailDeliveryInterface,
-    SMTPServiceInterface,
-)
-from supertokens_python.recipe.emailverification import types as ev_types
 
 
 class ThirdPartyInfo:
@@ -79,14 +74,5 @@ def __init__(self, users: List[User], next_pagination_token: Union[str, None]):
         self.next_pagination_token = next_pagination_token
 
 
-# Export:
-EmailTemplateVars = ev_types.VerificationEmailTemplateVars
-VerificationEmailTemplateVars = ev_types.VerificationEmailTemplateVars
-
-SMTPOverrideInput = SMTPServiceInterface[EmailTemplateVars]
-
-EmailDeliveryOverrideInput = EmailDeliveryInterface[EmailTemplateVars]
-
-
 class ThirdPartyIngredients:
     pass

supertokens_python/recipe/thirdparty/utils.py

@@ -13,23 +13,16 @@
 # under the License.
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Awaitable, Callable, Dict, List, Set, Union
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Set, Union
 
 from supertokens_python.exceptions import raise_bad_input_exception
 
 from .interfaces import APIInterface, RecipeInterface
 
 if TYPE_CHECKING:
-    from .recipe import ThirdPartyRecipe
     from .provider import Provider
 
 from jwt import PyJWKClient, decode
-from supertokens_python.recipe.emailverification.utils import (
-    OverrideConfig as EmailVerificationOverrideConfig,
-)
-
-from ..emailverification.types import User as EmailVerificationUser
-from .types import User
 
 
 class SignInAndUpFeature:
@@ -76,50 +69,14 @@ def __init__(self, providers: List[Provider]):
         self.providers = providers
 
 
-def email_verification_create_and_send_custom_email(
-    recipe: ThirdPartyRecipe,
-    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: ThirdPartyRecipe,
-    get_email_verification_url: Callable[[User, Dict[str, 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,
         functions: Union[Callable[[RecipeInterface], RecipeInterface], None] = None,
         apis: Union[Callable[[APIInterface], APIInterface], None] = None,
-        email_verification_feature: Union[EmailVerificationOverrideConfig, None] = None,
     ):
         self.functions = functions
         self.apis = apis
-        self.email_verification_feature = email_verification_feature
 
 
 class OverrideConfig:

supertokens_python/recipe/thirdpartyemailpassword/types.py

@@ -40,7 +40,6 @@ def __init__(
 
 # Export:
 EmailTemplateVars = ep_types.EmailTemplateVars
-# VerificationEmailTemplateVars = ep_types.VerificationEmailTemplateVars
 PasswordResetEmailTemplateVars = ep_types.PasswordResetEmailTemplateVars
 
 SMTPOverrideInput = SMTPServiceInterface[EmailTemplateVars]

supertokens_python/recipe/thirdpartypasswordless/__init__.py

@@ -28,7 +28,6 @@
 from .smsdelivery import services as smsdelivery_services
 from .types import EmailTemplateVars, SMSTemplateVars
 
-InputEmailVerificationConfig = utils.InputEmailVerificationConfig
 InputOverrideConfig = utils.InputOverrideConfig
 exceptions = ex
 ContactConfig = passwordless.ContactConfig

supertokens_python/recipe/thirdpartypasswordless/types.py

@@ -25,7 +25,6 @@
     TwilioServiceInterface,
 )
 from ..passwordless import types as pless_types
-from ..thirdparty import types as tp_types
 from ..thirdparty.types import ThirdPartyInfo
 
 
@@ -50,9 +49,6 @@ def __init__(
 # Export:
 EmailTemplateVars = pless_types.EmailTemplateVars
 SMSTemplateVars = pless_types.SMSTemplateVars
-VerificationEmailTemplateVars = (
-    tp_types.VerificationEmailTemplateVars
-)  # TODO: Remove this.
 PasswordlessLoginEmailTemplateVars = pless_types.PasswordlessLoginEmailTemplateVars
 PasswordlessLoginSMSTemplateVars = pless_types.PasswordlessLoginSMSTemplateVars
 

supertokens_python/recipe/thirdpartypasswordless/utils.py

@@ -34,7 +34,6 @@
     BackwardCompatibilityService,
 )
 from supertokens_python.recipe.thirdpartypasswordless.types import SMSTemplateVars
-from supertokens_python.utils import deprecated_warn
 from typing_extensions import Literal
 
 from ..emailverification.types import User as EmailVerificationUser
@@ -60,24 +59,6 @@
 )
 
 
-class InputEmailVerificationConfig:
-    def __init__(
-        self,
-        get_email_verification_url: Union[
-            Callable[[User, Any], Awaitable[str]], None
-        ] = None,
-        create_and_send_custom_email: Union[
-            Callable[[User, str, Any], Awaitable[None]], None
-        ] = None,
-    ):
-        self.get_email_verification_url = get_email_verification_url
-        self.create_and_send_custom_email = create_and_send_custom_email
-        if create_and_send_custom_email:
-            deprecated_warn(
-                "create_and_send_custom_email is deprecated. Please use email delivery config instead"
-            )
-
-
 def email_verification_create_and_send_custom_email(
     recipe: ThirdPartyPasswordlessRecipe,
     create_and_send_custom_email: Callable[