refactor: Remove ParentRecipeEmailVerificationConfig

Author: KShivendu

supertokens_python/recipe/emailverification/__init__.py

@@ -24,7 +24,6 @@
 from ...ingredients.emaildelivery.types import EmailDeliveryConfig
 
 InputOverrideConfig = utils.OverrideConfig
-ParentRecipeEmailVerificationConfig = utils.ParentRecipeEmailVerificationConfig
 exception = ex
 SMTPService = emaildelivery_services.SMTPService
 EmailVerificationClaim = recipe.EmailVerificationClaim

supertokens_python/recipe/emailverification/recipe.py

@@ -66,7 +66,6 @@
 from .constants import USER_EMAIL_VERIFY, USER_EMAIL_VERIFY_TOKEN
 from .exceptions import SuperTokensEmailVerificationError
 from .utils import (
-    ParentRecipeEmailVerificationConfig,
     validate_and_normalise_user_input,
     MODE_TYPE,
     OverrideConfig,
@@ -82,11 +81,24 @@ def __init__(
         self,
         recipe_id: str,
         app_info: AppInfo,
-        config: ParentRecipeEmailVerificationConfig,
         ingredients: EmailVerificationIngredients,
+        mode: MODE_TYPE,
+        email_delivery: Union[EmailDeliveryConfig[EmailTemplateVars], None] = None,
+        get_email_for_user_id: Optional[TypeGetEmailForUserIdFunction] = None,
+        create_and_send_custom_email: Union[
+            Callable[[User, str, Dict[str, Any]], Awaitable[None]], None
+        ] = None,
+        override: Union[OverrideConfig, None] = None,
     ) -> None:
         super().__init__(recipe_id, app_info)
-        self.config = validate_and_normalise_user_input(app_info, config)
+        self.config = validate_and_normalise_user_input(
+            app_info,
+            mode,
+            email_delivery,
+            get_email_for_user_id,
+            create_and_send_custom_email,
+            override,
+        )
 
         recipe_implementation = RecipeImplementation(
             Querier.get_instance(recipe_id), self.config
@@ -196,25 +208,22 @@ def init(
         def func(app_info: AppInfo):
             if EmailVerificationRecipe.__instance is None:
                 ingredients = EmailVerificationIngredients(email_delivery=None)
-                config = ParentRecipeEmailVerificationConfig(
+                EmailVerificationRecipe.__instance = EmailVerificationRecipe(
+                    EmailVerificationRecipe.recipe_id,
+                    app_info,
+                    ingredients,
                     mode,
                     email_delivery,
                     get_email_for_user_id,
                     create_and_send_custom_email,
                     override,
                 )
-                EmailVerificationRecipe.__instance = EmailVerificationRecipe(
-                    EmailVerificationRecipe.recipe_id,
-                    app_info,
-                    config,
-                    ingredients=ingredients,
-                )
 
                 def callback():
                     SessionRecipe.get_instance().add_claim_from_other_recipe(
                         EmailVerificationClaim
                     )
-                    if str(config.mode) == "REQUIRED":
+                    if mode == "REQUIRED":
                         SessionRecipe.get_instance().add_claim_validator_from_other_recipe(
                             EmailVerificationClaim.validators.is_verified()
                         )

supertokens_python/recipe/emailverification/utils.py

@@ -47,30 +47,6 @@ def __init__(
 MODE_TYPE = Literal["REQUIRED", "OPTIONAL"]
 
 
-class ParentRecipeEmailVerificationConfig:
-    def __init__(
-        self,
-        mode: MODE_TYPE,
-        email_delivery: Union[EmailDeliveryConfig[EmailTemplateVars], None] = None,
-        get_email_for_user_id: Optional[TypeGetEmailForUserIdFunction] = None,
-        create_and_send_custom_email: Union[
-            Callable[[User, str, Dict[str, Any]], Awaitable[None]], None
-        ] = None,
-        override: Union[OverrideConfig, None] = None,
-    ):
-        self.mode: MODE_TYPE = mode
-        self.email_delivery = email_delivery
-        self.get_email_for_user_id = get_email_for_user_id
-        self.create_and_send_custom_email = create_and_send_custom_email
-        self.override = override
-
-        if create_and_send_custom_email:
-            # Note: This will appear twice because `InputEmailVerificationConfig` will also produce same warning.
-            deprecated_warn(
-                "create_and_send_custom_email is deprecated. Please use email delivery config instead"
-            )
-
-
 class EmailVerificationConfig:
     def __init__(
         self,
@@ -88,49 +64,49 @@ def __init__(
 
 
 def validate_and_normalise_user_input(
-    app_info: AppInfo, config: ParentRecipeEmailVerificationConfig
+    app_info: AppInfo,
+    mode: MODE_TYPE,
+    email_delivery: Union[EmailDeliveryConfig[EmailTemplateVars], None] = None,
+    get_email_for_user_id: Optional[TypeGetEmailForUserIdFunction] = None,
+    create_and_send_custom_email: Union[
+        Callable[[User, str, Dict[str, Any]], Awaitable[None]], None
+    ] = None,
+    override: Union[OverrideConfig, None] = None,
 ) -> EmailVerificationConfig:
-    if not isinstance(config, ParentRecipeEmailVerificationConfig):  # type: ignore
-        raise ValueError(
-            "config must be an instance of ParentRecipeEmailVerificationConfig"
+    if create_and_send_custom_email:
+        deprecated_warn(
+            "create_and_send_custom_email is deprecated. Please use email delivery config instead"
         )
 
-    if config.mode not in ["REQUIRED", "OPTIONAL"]:
+    if mode not in ["REQUIRED", "OPTIONAL"]:
         raise ValueError(
             "Email Verification recipe mode must be one of 'REQUIRED' or 'OPTIONAL'"
         )
 
     def get_email_delivery_config() -> EmailDeliveryConfigWithService[
         VerificationEmailTemplateVars
     ]:
-        email_service = (
-            config.email_delivery.service if config.email_delivery is not None else None
-        )
+        email_service = email_delivery.service if email_delivery is not None else None
         if email_service is None:
             email_service = BackwardCompatibilityService(
-                app_info, config.create_and_send_custom_email
+                app_info, create_and_send_custom_email
             )
 
-        if (
-            config.email_delivery is not None
-            and config.email_delivery.override is not None
-        ):
-            override = config.email_delivery.override
+        if email_delivery is not None and email_delivery.override is not None:
+            override = email_delivery.override
         else:
             override = None
         return EmailDeliveryConfigWithService(email_service, override=override)
 
-    override = config.override
-
     if override is not None and not isinstance(override, OverrideConfig):  # type: ignore
         raise ValueError("override must be of type OverrideConfig or None")
 
     if override is None:
         override = OverrideConfig()
 
     return EmailVerificationConfig(
-        config.mode,
+        mode,
         get_email_delivery_config,
-        config.get_email_for_user_id,
+        get_email_for_user_id,
         override,
     )

tests/input_validation/test_input_validation.py

@@ -127,8 +127,9 @@ async def test_init_validation_emailverification():
             framework="fastapi",
             recipe_list=[emailverification.init("config")],  # type: ignore
         )
-    assert "config must be an instance of ParentRecipeEmailVerificationConfig" == str(
-        ex.value
+    assert (
+        "Email Verification recipe mode must be one of 'REQUIRED' or 'OPTIONAL'"
+        == str(ex.value)
     )
 
     with pytest.raises(ValueError) as ex: