test: Fix test failures related to tpep recipe

Author: KShivendu

supertokens_python/recipe/emailpassword/recipe.py

@@ -117,9 +117,7 @@ def __init__(
         def callback():
             ev_recipe = EmailVerificationRecipe.get_instance_optional()
             if ev_recipe:
-                ev_recipe.add_get_email_for_user_id_func(
-                    self.get_email_for_user_id
-                )
+                ev_recipe.add_get_email_for_user_id_func(self.get_email_for_user_id)
 
         PostSTInitCallbacks.add_post_init_callback(callback)
 

supertokens_python/recipe/emailverification/recipe.py

@@ -23,7 +23,8 @@
 )
 from supertokens_python.recipe.emailverification.types import (
     EmailVerificationIngredients,
-    VerificationEmailTemplateVars, VerificationEmailTemplateVarsUser,
+    VerificationEmailTemplateVars,
+    VerificationEmailTemplateVarsUser,
 )
 from supertokens_python.recipe_module import APIHandled, RecipeModule
 from .ev_claim import EmailVerificationClaimValidators
@@ -33,9 +34,15 @@
     UnknownUserIdError,
     TypeGetEmailForUserIdFunction,
     GetEmailForUserIdOkResult,
-    EmailDoesnotExistError, APIInterface, EmailVerifyPostOkResult, EmailVerifyPostInvalidTokenError,
-    VerifyEmailUsingTokenOkResult, IsEmailVerifiedGetOkResult, GenerateEmailVerifyTokenPostOkResult,
-    GenerateEmailVerifyTokenPostEmailAlreadyVerifiedError, CreateEmailVerificationTokenEmailAlreadyVerifiedError,
+    EmailDoesnotExistError,
+    APIInterface,
+    EmailVerifyPostOkResult,
+    EmailVerifyPostInvalidTokenError,
+    VerifyEmailUsingTokenOkResult,
+    IsEmailVerifiedGetOkResult,
+    GenerateEmailVerifyTokenPostOkResult,
+    GenerateEmailVerifyTokenPostEmailAlreadyVerifiedError,
+    CreateEmailVerificationTokenEmailAlreadyVerifiedError,
 )
 from .recipe_implementation import RecipeImplementation
 from ..session import SessionRecipe
@@ -367,6 +374,9 @@ async def generate_email_verify_token_post(
             )
             return GenerateEmailVerifyTokenPostOkResult()
 
+        if isinstance(email_info, UnknownUserIdError):
+            pass
+
         raise Exception(
             "Should never come here: UNKNOWN_USER_ID or invalid result from get_email_for_user_id"
         )

supertokens_python/recipe/thirdparty/recipe.py

@@ -23,6 +23,7 @@
 from .api.implementation import APIImplementation
 from .interfaces import APIInterface, APIOptions, RecipeInterface
 from .recipe_implementation import RecipeImplementation
+from ..emailverification.interfaces import GetEmailForUserIdOkResult, UnknownUserIdError
 from ...post_init_callbacks import PostSTInitCallbacks
 
 if TYPE_CHECKING:
@@ -188,12 +189,11 @@ def reset():
 
     # instance functions below...............
 
-    async def get_email_for_user_id(
-        self, user_id: str, user_context: Dict[str, Any]
-    ) -> str:
+    async def get_email_for_user_id(self, user_id: str, user_context: Dict[str, Any]):
         user_info = await self.recipe_implementation.get_user_by_id(
             user_id, user_context
         )
-        if user_info is None:
-            raise Exception("Unknown User ID provided")
-        return user_info.email
+        if user_info is not None:
+            return GetEmailForUserIdOkResult(user_info.email)
+
+        return UnknownUserIdError()

supertokens_python/recipe/thirdpartyemailpassword/recipe.py

@@ -47,6 +47,7 @@
 from .recipeimplementation.third_party_recipe_implementation import (
     RecipeImplementation as ThirdPartyRecipeImplementation,
 )
+from ..emailverification.interfaces import GetEmailForUserIdOkResult, UnknownUserIdError
 
 if TYPE_CHECKING:
     from supertokens_python.framework.request import BaseRequest
@@ -296,12 +297,11 @@ def reset():
             raise Exception(None, "calling testing function in non testing env")
         ThirdPartyEmailPasswordRecipe.__instance = None
 
-    async def get_email_for_user_id(
-        self, user_id: str, user_context: Dict[str, Any]
-    ) -> str:
+    async def get_email_for_user_id(self, user_id: str, user_context: Dict[str, Any]):
         user_info = await self.recipe_implementation.get_user_by_id(
             user_id, user_context
         )
-        if user_info is None:
-            raise Exception("Unknown User ID provided")
-        return user_info.email
+        if user_info is not None:
+            return GetEmailForUserIdOkResult(user_info.email)
+
+        return UnknownUserIdError()

tests/emailpassword/test_emaildelivery.py

@@ -36,7 +36,9 @@
     InputResetPasswordUsingTokenFeature,
 )
 from supertokens_python.recipe.emailpassword.emaildelivery.services import SMTPService
-from supertokens_python.recipe.emailverification.emaildelivery.services import SMTPService as EVSMTPService
+from supertokens_python.recipe.emailverification.emaildelivery.services import (
+    SMTPService as EVSMTPService,
+)
 from supertokens_python.recipe.emailpassword.types import (
     EmailTemplateVars,
     PasswordResetEmailTemplateVars,
@@ -528,9 +530,11 @@ async def test_email_verification_default_backward_compatibility(
         ),
         framework="fastapi",
         recipe_list=[
-            emailverification.init(ParentRecipeEmailVerificationConfig(mode="OPTIONAL")),
+            emailverification.init(
+                ParentRecipeEmailVerificationConfig(mode="OPTIONAL")
+            ),
             emailpassword.init(),
-            session.init()
+            session.init(),
         ],
     )
     start_st()
@@ -593,9 +597,11 @@ async def test_email_verification_default_backward_compatibility_suppress_error(
         ),
         framework="fastapi",
         recipe_list=[
-            emailverification.init(ParentRecipeEmailVerificationConfig(mode="OPTIONAL")),
+            emailverification.init(
+                ParentRecipeEmailVerificationConfig(mode="OPTIONAL")
+            ),
             emailpassword.init(),
-            session.init()
+            session.init(),
         ],
     )
     start_st()
@@ -707,7 +713,9 @@ async def test_email_verification_custom_override(driver_config_client: TestClie
     email = ""
     email_verify_url = ""
 
-    def email_delivery_override(oi: EmailDeliveryInterface[VerificationEmailTemplateVars]):
+    def email_delivery_override(
+        oi: EmailDeliveryInterface[VerificationEmailTemplateVars],
+    ):
         oi_send_email = oi.send_email
 
         async def send_email(
@@ -738,7 +746,7 @@ async def send_email(
                     email_delivery=EmailDeliveryConfig(
                         service=None,
                         override=email_delivery_override,
-                    )
+                    ),
                 )
             ),
             emailpassword.init(),
@@ -871,7 +879,7 @@ async def send_email_override(
                     email_delivery=EmailDeliveryConfig(
                         service=email_delivery_service,
                         override=email_delivery_override,
-                    )
+                    ),
                 )
             ),
             emailpassword.init(),

tests/thirdpartyemailpassword/test_email_delivery.py

@@ -47,13 +47,17 @@
 from supertokens_python.recipe.session.session_functions import create_new_session
 from supertokens_python.recipe.thirdpartyemailpassword import (
     InputResetPasswordUsingTokenFeature,
+    Github,
 )
 from supertokens_python.recipe.thirdpartyemailpassword.asyncio import (
     thirdparty_sign_in_up,
 )
 from supertokens_python.recipe.thirdpartyemailpassword.emaildelivery.services import (
     SMTPService,
 )
+from supertokens_python.recipe.emailverification.emaildelivery.services import (
+    SMTPService as EVSMTPService,
+)
 from supertokens_python.recipe.thirdpartyemailpassword.types import (
     EmailTemplateVars,
     PasswordResetEmailTemplateVars,
@@ -477,7 +481,13 @@ async def test_email_verification_default_backward_compatibility(
             api_base_path="/auth",
         ),
         framework="fastapi",
-        recipe_list=[thirdpartyemailpassword.init(), session.init()],
+        recipe_list=[
+            emailverification.init(
+                ParentRecipeEmailVerificationConfig(mode="OPTIONAL")
+            ),
+            thirdpartyemailpassword.init(),
+            session.init(),
+        ],
     )
     start_st()
 
@@ -538,7 +548,13 @@ async def test_email_verification_default_backward_compatibility_suppress_error(
             api_base_path="/auth",
         ),
         framework="fastapi",
-        recipe_list=[thirdpartyemailpassword.init(), session.init()],
+        recipe_list=[
+            emailverification.init(
+                ParentRecipeEmailVerificationConfig(mode="OPTIONAL")
+            ),
+            thirdpartyemailpassword.init(),
+            session.init(),
+        ],
     )
     start_st()
 
@@ -739,7 +755,7 @@ async def test_email_verification_smtp_service(driver_config_client: TestClient)
         False,
     )
 
-    def smtp_service_override(oi: SMTPServiceInterface[EmailTemplateVars]):
+    def smtp_service_override(oi: SMTPServiceInterface[VerificationEmailTemplateVars]):
         async def send_raw_email_override(
             content: EmailContent, _user_context: Dict[str, Any]
         ):
@@ -753,7 +769,7 @@ async def send_raw_email_override(
             # Note that we aren't calling oi.send_raw_email. So Transporter won't be used.
 
         async def get_content_override(
-            template_vars: EmailTemplateVars, _user_context: Dict[str, Any]
+            template_vars: VerificationEmailTemplateVars, _user_context: Dict[str, Any]
         ) -> EmailContent:
             nonlocal get_content_called, email_verify_url
             get_content_called = True
@@ -773,7 +789,7 @@ async def get_content_override(
 
         return oi
 
-    email_delivery_service = SMTPService(
+    email_delivery_service = EVSMTPService(
         smtp_settings=SMTPSettings(
             host="",
             from_=SMTPSettingsFrom("", ""),
@@ -785,12 +801,12 @@ async def get_content_override(
     )
 
     def email_delivery_override(
-        oi: EmailDeliveryInterface[EmailTemplateVars],
-    ) -> EmailDeliveryInterface[EmailTemplateVars]:
+        oi: EmailDeliveryInterface[VerificationEmailTemplateVars],
+    ) -> EmailDeliveryInterface[VerificationEmailTemplateVars]:
         oi_send_email = oi.send_email
 
         async def send_email_override(
-            template_vars: EmailTemplateVars, user_context: Dict[str, Any]
+            template_vars: VerificationEmailTemplateVars, user_context: Dict[str, Any]
         ):
             nonlocal outer_override_called
             outer_override_called = True
@@ -809,12 +825,16 @@ async def send_email_override(
         ),
         framework="fastapi",
         recipe_list=[
-            thirdpartyemailpassword.init(
-                email_delivery=EmailDeliveryConfig(
-                    service=email_delivery_service,
-                    override=email_delivery_override,
+            emailverification.init(
+                ParentRecipeEmailVerificationConfig(
+                    mode="OPTIONAL",
+                    email_delivery=EmailDeliveryConfig(
+                        service=email_delivery_service,
+                        override=email_delivery_override,
+                    ),
                 )
             ),
+            thirdpartyemailpassword.init(),
             session.init(),
         ],
     )
@@ -870,10 +890,16 @@ async def custom_create_and_send_custom_email(
         ),
         framework="fastapi",
         recipe_list=[
+            emailverification.init(
+                ParentRecipeEmailVerificationConfig(mode="OPTIONAL")
+            ),
             thirdpartyemailpassword.init(
+                providers=[
+                    Github(client_id="", client_secret="")
+                ],  # Note: Provider must be passed to init TP recipe
                 reset_password_using_token_feature=InputResetPasswordUsingTokenFeature(
                     create_and_send_custom_email=custom_create_and_send_custom_email,
-                )
+                ),
             ),
             session.init(),
         ],
@@ -936,7 +962,11 @@ async def custom_create_and_send_custom_email(
                     create_and_send_custom_email=custom_create_and_send_custom_email,
                 )
             ),
-            thirdpartyemailpassword.init(),
+            thirdpartyemailpassword.init(
+                providers=[
+                    Github(client_id="", client_secret="")
+                ],  # Note: Provider must be passed to init TP recipe
+            ),
             session.init(),
         ],
     )