Merge pull request #383 from supertokens/fix/ev-sendemail

fix: Emailverification send email functions with multitenancy

Author: KShivendu

supertokens_python/recipe/dashboard/api/userdetails/user_email_verify_token_post.py

@@ -2,28 +2,15 @@
 
 from supertokens_python.exceptions import raise_bad_input_exception
 from supertokens_python.recipe.emailverification.asyncio import (
-    create_email_verification_token,
-    send_email,
+    send_email_verification_email,
+    SendEmailVerificationEmailAlreadyVerifiedError,
 )
-from supertokens_python.recipe.emailverification.interfaces import (
-    CreateEmailVerificationTokenEmailAlreadyVerifiedError,
-    CreateEmailVerificationTokenOkResult,
-)
-from supertokens_python.recipe.emailverification.recipe import (
-    EmailVerificationRecipe,
-    GetEmailForUserIdOkResult,
-)
-from supertokens_python.recipe.emailverification.types import (
-    VerificationEmailTemplateVars,
-    VerificationEmailTemplateVarsUser,
-)
-from supertokens_python.recipe.emailverification.utils import get_email_verify_link
 
 from ...interfaces import (
     APIInterface,
     APIOptions,
-    UserEmailVerifyTokenPostAPIEmailAlreadyVerifiedErrorResponse,
     UserEmailVerifyTokenPostAPIOkResponse,
+    UserEmailVerifyTokenPostAPIEmailAlreadyVerifiedErrorResponse,
 )
 
 
@@ -44,34 +31,9 @@ async def handle_email_verify_token_post(
             "Required parameter 'userId' is missing or has an invalid type"
         )
 
-    email_response = await EmailVerificationRecipe.get_instance().get_email_for_user_id(
-        user_id, user_context
-    )
-
-    if not isinstance(email_response, GetEmailForUserIdOkResult):
-        raise Exception("Should not come here")
+    res = await send_email_verification_email(user_id, None, tenant_id, user_context)
 
-    email_verification_token = await create_email_verification_token(
-        user_id, tenant_id=tenant_id, user_context=user_context
-    )
-
-    if isinstance(
-        email_verification_token, CreateEmailVerificationTokenEmailAlreadyVerifiedError
-    ):
+    if isinstance(res, SendEmailVerificationEmailAlreadyVerifiedError):
         return UserEmailVerifyTokenPostAPIEmailAlreadyVerifiedErrorResponse()
 
-    assert isinstance(email_verification_token, CreateEmailVerificationTokenOkResult)
-
-    email_verify_link = get_email_verify_link(
-        api_options.app_info, email_verification_token.token, user_id, tenant_id
-    )
-
-    await send_email(
-        VerificationEmailTemplateVars(
-            user=VerificationEmailTemplateVarsUser(user_id, email_response.email),
-            email_verify_link=email_verify_link,
-            tenant_id=tenant_id,
-        )
-    )
-
     return UserEmailVerifyTokenPostAPIOkResponse()

supertokens_python/recipe/emailverification/asyncio/__init__.py

@@ -16,6 +16,10 @@
     GetEmailForUserIdOkResult,
     EmailDoesNotExistError,
     CreateEmailVerificationTokenEmailAlreadyVerifiedError,
+    CreateEmailVerificationLinkOkResult,
+    CreateEmailVerificationLinkEmailAlreadyVerifiedError,
+    SendEmailVerificationEmailOkResult,
+    SendEmailVerificationEmailAlreadyVerifiedError,
     UnverifyEmailOkResult,
     CreateEmailVerificationTokenOkResult,
     RevokeEmailVerificationTokensOkResult,
@@ -25,6 +29,12 @@
 
 from supertokens_python.recipe.multitenancy.constants import DEFAULT_TENANT_ID
 
+from supertokens_python.recipe.emailverification.utils import get_email_verify_link
+from supertokens_python.recipe.emailverification.types import (
+    VerificationEmailTemplateVars,
+    VerificationEmailTemplateVarsUser,
+)
+
 
 async def create_email_verification_token(
     user_id: str,
@@ -145,3 +155,80 @@ async def send_email(
     return await EmailVerificationRecipe.get_instance().email_delivery.ingredient_interface_impl.send_email(
         input_, user_context
     )
+
+
+async def create_email_verification_link(
+    user_id: str,
+    email: Optional[str],
+    tenant_id: Optional[str] = None,
+    user_context: Optional[Dict[str, Any]] = None,
+) -> Union[
+    CreateEmailVerificationLinkOkResult,
+    CreateEmailVerificationLinkEmailAlreadyVerifiedError,
+]:
+    if user_context is None:
+        user_context = {}
+
+    recipe_instance = EmailVerificationRecipe.get_instance()
+    app_info = recipe_instance.get_app_info()
+
+    email_verification_token = await create_email_verification_token(
+        user_id, email, tenant_id, user_context
+    )
+    if isinstance(
+        email_verification_token, CreateEmailVerificationTokenEmailAlreadyVerifiedError
+    ):
+        return CreateEmailVerificationLinkEmailAlreadyVerifiedError()
+
+    return CreateEmailVerificationLinkOkResult(
+        link=get_email_verify_link(
+            app_info,
+            email_verification_token.token,
+            recipe_instance.get_recipe_id(),
+            tenant_id or DEFAULT_TENANT_ID,
+        )
+    )
+
+
+async def send_email_verification_email(
+    user_id: str,
+    email: Optional[str],
+    tenant_id: Optional[str] = None,
+    user_context: Optional[Dict[str, Any]] = None,
+) -> Union[
+    SendEmailVerificationEmailOkResult,
+    SendEmailVerificationEmailAlreadyVerifiedError,
+]:
+    if user_context is None:
+        user_context = {}
+
+    if email is None:
+        recipe_instance = EmailVerificationRecipe.get_instance()
+
+        email_info = await recipe_instance.get_email_for_user_id(user_id, user_context)
+        if isinstance(email_info, GetEmailForUserIdOkResult):
+            email = email_info.email
+        elif isinstance(email_info, EmailDoesNotExistError):
+            return SendEmailVerificationEmailAlreadyVerifiedError()
+        else:
+            raise Exception("Unknown User ID provided without email")
+
+    email_verification_link = await create_email_verification_link(
+        user_id, email, tenant_id, user_context
+    )
+
+    if isinstance(
+        email_verification_link, CreateEmailVerificationLinkEmailAlreadyVerifiedError
+    ):
+        return SendEmailVerificationEmailAlreadyVerifiedError()
+
+    await send_email(
+        VerificationEmailTemplateVars(
+            user=VerificationEmailTemplateVarsUser(user_id, email),
+            email_verify_link=email_verification_link.link,
+            tenant_id=tenant_id,
+        ),
+        user_context,
+    )
+
+    return SendEmailVerificationEmailOkResult()

supertokens_python/recipe/emailverification/interfaces.py

@@ -30,15 +30,38 @@
 
 
 class CreateEmailVerificationTokenOkResult:
+    status = "OK"
+
     def __init__(self, token: str):
         self.token = token
 
 
 class CreateEmailVerificationTokenEmailAlreadyVerifiedError:
-    pass
+    status = "EMAIL_ALREADY_VERIFIED_ERROR"
+
+
+class CreateEmailVerificationLinkEmailAlreadyVerifiedError:
+    status = "EMAIL_ALREADY_VERIFIED_ERROR"
+
+
+class CreateEmailVerificationLinkOkResult:
+    status = "OK"
+
+    def __init__(self, link: str):
+        self.link = link
+
+
+class SendEmailVerificationEmailAlreadyVerifiedError:
+    status = "EMAIL_ALREADY_VERIFIED_ERROR"
+
+
+class SendEmailVerificationEmailOkResult:
+    status = "OK"
 
 
 class VerifyEmailUsingTokenOkResult:
+    status = "OK"
+
     def __init__(self, user: User):
         self.user = user
 

supertokens_python/recipe/emailverification/syncio/__init__.py

@@ -87,3 +87,29 @@ def send_email(
     from supertokens_python.recipe.emailverification.asyncio import send_email
 
     return sync(send_email(input_, user_context))
+
+
+def create_email_verification_link(
+    user_id: str,
+    email: Optional[str],
+    tenant_id: Optional[str] = None,
+    user_context: Optional[Dict[str, Any]] = None,
+):
+    from supertokens_python.recipe.emailverification.asyncio import (
+        create_email_verification_link,
+    )
+
+    return sync(create_email_verification_link(user_id, email, tenant_id, user_context))
+
+
+def send_email_verification_email(
+    user_id: str,
+    email: Optional[str],
+    tenant_id: Optional[str] = None,
+    user_context: Optional[Dict[str, Any]] = None,
+):
+    from supertokens_python.recipe.emailverification.asyncio import (
+        send_email_verification_email,
+    )
+
+    return sync(send_email_verification_email(user_id, email, tenant_id, user_context))