removed get_config from derived_ep and changed tests to use exposed function

Author: iresharma

supertokens_python/recipe/emailpassword/asyncio/__init__.py

@@ -22,13 +22,13 @@ async def update_email_or_password(
     user_id: str,
     email: Union[str, None] = None,
     password: Union[str, None] = None,
-    user_context: Union[None, Dict[str, Any]] = None,
     apply_password_policy: Union[bool, None] = None,
+    user_context: Union[None, Dict[str, Any]] = None,
 ):
     if user_context is None:
         user_context = {}
     return await EmailPasswordRecipe.get_instance().recipe_implementation.update_email_or_password(
-        user_id, email, password, user_context, apply_password_policy
+        user_id, email, password, apply_password_policy, user_context
     )
 
 

supertokens_python/recipe/emailpassword/interfaces.py

@@ -133,8 +133,8 @@ async def update_email_or_password(
         user_id: str,
         email: Union[str, None],
         password: Union[str, None],
-        user_context: Dict[str, Any],
         apply_password_policy: Union[bool, None],
+        user_context: Dict[str, Any],
     ) -> Union[
         UpdateEmailOrPasswordOkResult,
         UpdateEmailOrPasswordEmailAlreadyExistsError,

supertokens_python/recipe/emailpassword/recipe_implementation.py

@@ -146,8 +146,8 @@ async def update_email_or_password(
         user_id: str,
         email: Union[str, None],
         password: Union[str, None],
-        user_context: Dict[str, Any],
         apply_password_policy: Union[bool, None],
+        user_context: Dict[str, Any],
     ) -> Union[
         UpdateEmailOrPasswordOkResult,
         UpdateEmailOrPasswordEmailAlreadyExistsError,
@@ -162,13 +162,12 @@ async def update_email_or_password(
                 form_fields = (
                     self.get_emailpassword_config().sign_up_feature.form_fields
                 )
-                if form_fields is not None:
-                    password_field = list(
-                        filter(lambda x: x.id == FORM_FIELD_PASSWORD_ID, form_fields)
-                    )[0]
-                    error = await password_field.validate(password)
-                    if error is not None:
-                        return UpdateEmailOrPasswordPasswordPolicyViolationError(error)
+                password_field = list(
+                    filter(lambda x: x.id == FORM_FIELD_PASSWORD_ID, form_fields)
+                )[0]
+                error = await password_field.validate(password)
+                if error is not None:
+                    return UpdateEmailOrPasswordPasswordPolicyViolationError(error)
             data = {"password": password, **data}
         response = await self.querier.send_put_request(
             NormalisedURLPath("/recipe/user"), data

supertokens_python/recipe/emailpassword/syncio/__init__.py

@@ -23,14 +23,14 @@ def update_email_or_password(
     user_id: str,
     email: Union[str, None] = None,
     password: Union[str, None] = None,
-    user_context: Union[None, Dict[str, Any]] = None,
     apply_password_policy: Union[bool, None] = None,
+    user_context: Union[None, Dict[str, Any]] = None,
 ):
     from supertokens_python.recipe.emailpassword.asyncio import update_email_or_password
 
     return sync(
         update_email_or_password(
-            user_id, email, password, user_context, apply_password_policy
+            user_id, email, password, apply_password_policy, user_context
         )
     )
 

supertokens_python/recipe/thirdpartyemailpassword/asyncio/__init__.py

@@ -100,13 +100,13 @@ async def update_email_or_password(
     user_id: str,
     email: Union[None, str] = None,
     password: Union[None, str] = None,
-    user_context: Union[None, Dict[str, Any]] = None,
     apply_password_policy: Union[bool, None] = None,
+    user_context: Union[None, Dict[str, Any]] = None,
 ):
     if user_context is None:
         user_context = {}
     return await ThirdPartyEmailPasswordRecipe.get_instance().recipe_implementation.update_email_or_password(
-        user_id, email, password, user_context, apply_password_policy
+        user_id, email, password, apply_password_policy, user_context
     )
 
 

supertokens_python/recipe/thirdpartyemailpassword/interfaces.py

@@ -136,8 +136,8 @@ async def update_email_or_password(
         user_id: str,
         email: Union[str, None],
         password: Union[str, None],
-        user_context: Dict[str, Any],
         apply_password_policy: Union[bool, None],
+        user_context: Dict[str, Any],
     ) -> Union[
         UpdateEmailOrPasswordOkResult,
         UpdateEmailOrPasswordEmailAlreadyExistsError,

supertokens_python/recipe/thirdpartyemailpassword/recipe.py

@@ -125,7 +125,7 @@ def get_emailpassword_config() -> EmailPasswordConfig:
         )
 
         ep_recipe_implementation = EmailPasswordRecipeImplementation(
-            self.recipe_implementation, get_emailpassword_config
+            self.recipe_implementation
         )
 
         email_delivery_ingredient = ingredients.email_delivery

supertokens_python/recipe/thirdpartyemailpassword/recipeimplementation/email_password_recipe_implementation.py

@@ -13,7 +13,7 @@
 # under the License.
 from __future__ import annotations
 
-from typing import Any, Dict, Union, Callable
+from typing import Any, Dict, Union
 
 from supertokens_python.recipe.emailpassword.interfaces import (
     CreateResetPasswordOkResult,
@@ -31,7 +31,6 @@
     UpdateEmailOrPasswordPasswordPolicyViolationError,
 )
 from supertokens_python.recipe.emailpassword.types import User
-from supertokens_python.recipe.emailpassword.utils import EmailPasswordConfig
 
 from ..interfaces import (
     RecipeInterface as ThirdPartyEmailPasswordRecipeInterface,
@@ -44,11 +43,9 @@ class RecipeImplementation(RecipeInterface):
     def __init__(
         self,
         recipe_implementation: ThirdPartyEmailPasswordRecipeInterface,
-        get_emailpassword_config: Callable[[], EmailPasswordConfig],
     ):
         super().__init__()
         self.recipe_implementation = recipe_implementation
-        self.get_emailpassword_config = get_emailpassword_config
 
     async def get_user_by_id(
         self, user_id: str, user_context: Dict[str, Any]
@@ -120,14 +117,14 @@ async def update_email_or_password(
         user_id: str,
         email: Union[str, None],
         password: Union[str, None],
-        user_context: Dict[str, Any],
         apply_password_policy: Union[bool, None],
+        user_context: Dict[str, Any],
     ) -> Union[
         UpdateEmailOrPasswordOkResult,
         UpdateEmailOrPasswordEmailAlreadyExistsError,
         UpdateEmailOrPasswordUnknownUserIdError,
         UpdateEmailOrPasswordPasswordPolicyViolationError,
     ]:
         return await self.recipe_implementation.update_email_or_password(
-            user_id, email, password, user_context, apply_password_policy
+            user_id, email, password, apply_password_policy, user_context
         )

supertokens_python/recipe/thirdpartyemailpassword/recipeimplementation/implementation.py

@@ -79,7 +79,7 @@ def __init__(
             emailpassword_implementation.update_email_or_password
         )
 
-        derived_ep = DerivedEmailPasswordImplementation(self, get_emailpassword_config)
+        derived_ep = DerivedEmailPasswordImplementation(self)
         emailpassword_implementation.create_reset_password_token = (
             derived_ep.create_reset_password_token
         )
@@ -267,8 +267,8 @@ async def update_email_or_password(
         user_id: str,
         email: Union[None, str],
         password: Union[None, str],
-        user_context: Dict[str, Any],
         apply_password_policy: Union[bool, None],
+        user_context: Dict[str, Any],
     ) -> Union[
         UpdateEmailOrPasswordOkResult,
         UpdateEmailOrPasswordEmailAlreadyExistsError,
@@ -283,5 +283,5 @@ async def update_email_or_password(
                 "Cannot update email or password of a user who signed up using third party login."
             )
         return await self.ep_update_email_or_password(
-            user_id, email, password, user_context, apply_password_policy
+            user_id, email, password, apply_password_policy, user_context
         )

supertokens_python/recipe/thirdpartyemailpassword/syncio/__init__.py

@@ -104,16 +104,16 @@ def update_email_or_password(
     user_id: str,
     email: Union[None, str] = None,
     password: Union[None, str] = None,
-    user_context: Union[None, Dict[str, Any]] = None,
     apply_password_policy: Union[bool, None] = None,
+    user_context: Union[None, Dict[str, Any]] = None,
 ):
     from supertokens_python.recipe.thirdpartyemailpassword.asyncio import (
         update_email_or_password,
     )
 
     return sync(
         update_email_or_password(
-            user_id, email, password, user_context, apply_password_policy
+            user_id, email, password, apply_password_policy, user_context
         )
     )
 

tests/emailpassword/test_updateemailorpassword.py

@@ -27,6 +27,7 @@
     teardown_function,
 )
 from supertokens_python.recipe.emailpassword import InputFormField
+from supertokens_python.recipe.emailpassword.asyncio import update_email_or_password
 
 _ = setup_function  # type: ignore
 _ = teardown_function  # type: ignore
@@ -71,7 +72,7 @@ async def test_update_email_or_password_with_default_validator(
 
     user_id = dict_response["user"]["id"]
 
-    r = await emailpassword.EmailPasswordRecipe.get_instance().recipe_implementation.update_email_or_password(
+    r = await update_email_or_password(
         user_id=user_id,
         email=None,
         password="test",
@@ -124,7 +125,7 @@ async def validate_pass(value: Any):
 
     user_id = dict_response["user"]["id"]
 
-    r = await emailpassword.EmailPasswordRecipe.get_instance().recipe_implementation.update_email_or_password(
+    r = await update_email_or_password(
         user_id=user_id,
         email=None,
         password="te",