Merge pull request #386 from supertokens/fix/tenantid-config-func

fix: Add tenant id in config functions

Author: rishabhpoddar

supertokens_python/exceptions.py

@@ -18,7 +18,7 @@
 
 def raise_general_exception(
     msg: Union[str, Exception], previous: Union[None, Exception] = None
-):
+) -> NoReturn:
     if isinstance(msg, SuperTokensError):
         raise msg
     if isinstance(msg, Exception):

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

@@ -96,7 +96,9 @@ async def reset_password(
             field for field in form_fields if field.id == FORM_FIELD_PASSWORD_ID
         ][0]
 
-        password_validation_error = await password_form_field.validate(new_password)
+        password_validation_error = await password_form_field.validate(
+            new_password, tenant_id
+        )
 
         if password_validation_error is not None:
             return UserPasswordPutAPIInvalidPasswordErrorResponse(

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

@@ -58,7 +58,11 @@
 
 
 async def update_email_for_recipe_id(
-    recipe_id: str, user_id: str, email: str, user_context: Dict[str, Any]
+    recipe_id: str,
+    user_id: str,
+    email: str,
+    tenant_id: str,
+    user_context: Dict[str, Any],
 ) -> Union[
     UserPutAPIOkResponse,
     UserPutAPIInvalidEmailErrorResponse,
@@ -76,7 +80,7 @@ async def update_email_for_recipe_id(
             if form_field.id == FORM_FIELD_EMAIL_ID
         ]
 
-        validation_error = await email_form_fields[0].validate(email)
+        validation_error = await email_form_fields[0].validate(email, tenant_id)
 
         if validation_error is not None:
             return UserPutAPIInvalidEmailErrorResponse(validation_error)
@@ -102,7 +106,7 @@ async def update_email_for_recipe_id(
             if form_field.id == FORM_FIELD_EMAIL_ID
         ]
 
-        validation_error = await email_form_fields[0].validate(email)
+        validation_error = await email_form_fields[0].validate(email, tenant_id)
 
         if validation_error is not None:
             return UserPutAPIInvalidEmailErrorResponse(validation_error)
@@ -127,12 +131,14 @@ async def update_email_for_recipe_id(
         passwordless_config = PasswordlessRecipe.get_instance().config.contact_config
 
         if isinstance(passwordless_config.contact_method, ContactPhoneOnlyConfig):
-            validation_error = await default_validate_email(email)
+            validation_error = await default_validate_email(email, tenant_id)
 
         elif isinstance(
             passwordless_config, (ContactEmailOnlyConfig, ContactEmailOrPhoneConfig)
         ):
-            validation_error = await passwordless_config.validate_email_address(email)
+            validation_error = await passwordless_config.validate_email_address(
+                email, tenant_id
+            )
 
         if validation_error is not None:
             return UserPutAPIInvalidEmailErrorResponse(validation_error)
@@ -157,11 +163,13 @@ async def update_email_for_recipe_id(
         )
 
         if isinstance(passwordless_config, ContactPhoneOnlyConfig):
-            validation_error = await default_validate_email(email)
+            validation_error = await default_validate_email(email, tenant_id)
         elif isinstance(
             passwordless_config, (ContactEmailOnlyConfig, ContactEmailOrPhoneConfig)
         ):
-            validation_error = await passwordless_config.validate_email_address(email)
+            validation_error = await passwordless_config.validate_email_address(
+                email, tenant_id
+            )
 
         if validation_error is not None:
             return UserPutAPIInvalidEmailErrorResponse(validation_error)
@@ -183,7 +191,11 @@ async def update_email_for_recipe_id(
 
 
 async def update_phone_for_recipe_id(
-    recipe_id: str, user_id: str, phone: str, user_context: Dict[str, Any]
+    recipe_id: str,
+    user_id: str,
+    phone: str,
+    tenant_id: str,
+    user_context: Dict[str, Any],
 ) -> Union[
     UserPutAPIOkResponse,
     UserPutAPIInvalidPhoneErrorResponse,
@@ -197,11 +209,13 @@ async def update_phone_for_recipe_id(
         passwordless_config = PasswordlessRecipe.get_instance().config.contact_config
 
         if isinstance(passwordless_config, ContactEmailOnlyConfig):
-            validation_error = await default_validate_phone_number(phone)
+            validation_error = await default_validate_phone_number(phone, tenant_id)
         elif isinstance(
             passwordless_config, (ContactPhoneOnlyConfig, ContactEmailOrPhoneConfig)
         ):
-            validation_error = await passwordless_config.validate_phone_number(phone)
+            validation_error = await passwordless_config.validate_phone_number(
+                phone, tenant_id
+            )
 
         if validation_error is not None:
             return UserPutAPIInvalidPhoneErrorResponse(validation_error)
@@ -226,12 +240,14 @@ async def update_phone_for_recipe_id(
         )
 
         if isinstance(passwordless_config, ContactEmailOnlyConfig):
-            validation_error = await default_validate_phone_number(phone)
+            validation_error = await default_validate_phone_number(phone, tenant_id)
 
         elif isinstance(
             passwordless_config, (ContactPhoneOnlyConfig, ContactEmailOrPhoneConfig)
         ):
-            validation_error = await passwordless_config.validate_phone_number(phone)
+            validation_error = await passwordless_config.validate_phone_number(
+                phone, tenant_id
+            )
 
         if validation_error is not None:
             return UserPutAPIInvalidPhoneErrorResponse(validation_error)
@@ -254,7 +270,7 @@ async def update_phone_for_recipe_id(
 
 async def handle_user_put(
     _api_interface: APIInterface,
-    _tenant_id: str,
+    tenant_id: str,
     api_options: APIOptions,
     user_context: Dict[str, Any],
 ) -> Union[
@@ -337,15 +353,15 @@ async def handle_user_put(
 
     if email != "":
         email_update_response = await update_email_for_recipe_id(
-            user_response.recipe, user_id, email, user_context
+            user_response.recipe, user_id, email, tenant_id, user_context
         )
 
         if not isinstance(email_update_response, UserPutAPIOkResponse):
             return email_update_response
 
     if phone != "":
         phone_update_response = await update_phone_for_recipe_id(
-            user_response.recipe, user_id, phone, user_context
+            user_response.recipe, user_id, phone, tenant_id, user_context
         )
 
         if not isinstance(phone_update_response, UserPutAPIOkResponse):

supertokens_python/recipe/emailpassword/__init__.py

@@ -25,7 +25,6 @@
 
 exceptions = ex
 InputOverrideConfig = utils.InputOverrideConfig
-InputResetPasswordUsingTokenFeature = utils.InputResetPasswordUsingTokenFeature
 InputSignUpFeature = utils.InputSignUpFeature
 InputFormField = utils.InputFormField
 SMTPService = emaildelivery_services.SMTPService
@@ -38,15 +37,11 @@
 
 def init(
     sign_up_feature: Union[utils.InputSignUpFeature, None] = None,
-    reset_password_using_token_feature: Union[
-        utils.InputResetPasswordUsingTokenFeature, None
-    ] = None,
     override: Union[utils.InputOverrideConfig, None] = None,
     email_delivery: Union[EmailDeliveryConfig[EmailTemplateVars], None] = None,
 ) -> Callable[[AppInfo], RecipeModule]:
     return EmailPasswordRecipe.init(
         sign_up_feature,
-        reset_password_using_token_feature,
         override,
         email_delivery,
     )

supertokens_python/recipe/emailpassword/api/generate_password_reset_token.py

@@ -42,6 +42,7 @@ async def handle_generate_password_reset_token_api(
     form_fields = await validate_form_fields_or_throw_error(
         api_options.config.reset_password_using_token_feature.form_fields_for_generate_token_form,
         form_fields_raw,
+        tenant_id,
     )
 
     response = await api_implementation.generate_password_reset_token_post(

supertokens_python/recipe/emailpassword/api/password_reset.py

@@ -42,6 +42,7 @@ async def handle_password_reset_api(
     form_fields = await validate_form_fields_or_throw_error(
         api_options.config.reset_password_using_token_feature.form_fields_for_password_reset_form,
         form_fields_raw,
+        tenant_id,
     )
 
     if "token" not in body:

supertokens_python/recipe/emailpassword/api/signin.py

@@ -40,7 +40,7 @@ async def handle_sign_in_api(
         raise_bad_input_exception("Please provide a JSON body")
     form_fields_raw: Any = body["formFields"] if "formFields" in body else []
     form_fields = await validate_form_fields_or_throw_error(
-        api_options.config.sign_in_feature.form_fields, form_fields_raw
+        api_options.config.sign_in_feature.form_fields, form_fields_raw, tenant_id
     )
 
     response = await api_implementation.sign_in_post(

supertokens_python/recipe/emailpassword/api/signup.py

@@ -46,7 +46,7 @@ async def handle_sign_up_api(
         raise_bad_input_exception("Please provide a JSON body")
     form_fields_raw: Any = body["formFields"] if "formFields" in body else []
     form_fields = await validate_form_fields_or_throw_error(
-        api_options.config.sign_up_feature.form_fields, form_fields_raw
+        api_options.config.sign_up_feature.form_fields, form_fields_raw, tenant_id
     )
 
     response = await api_implementation.sign_up_post(

supertokens_python/recipe/emailpassword/api/utils.py

@@ -29,7 +29,9 @@
 
 
 async def validate_form_or_throw_error(
-    inputs: List[FormField], config_form_fields: List[NormalisedFormField]
+    inputs: List[FormField],
+    config_form_fields: List[NormalisedFormField],
+    tenant_id: str,
 ):
     validation_errors: List[ErrorFormField] = []
     if len(config_form_fields) != len(inputs):
@@ -42,7 +44,7 @@ async def validate_form_or_throw_error(
         if input_field is None or (input_field.value == "" and not field.optional):
             validation_errors.append(ErrorFormField(field.id, "Field is not optional"))
         else:
-            error = await field.validate(input_field.value)
+            error = await field.validate(input_field.value, tenant_id)
             if error is not None:
                 validation_errors.append(ErrorFormField(field.id, error))
 
@@ -52,7 +54,7 @@ async def validate_form_or_throw_error(
 
 
 async def validate_form_fields_or_throw_error(
-    config_form_fields: List[NormalisedFormField], form_fields_raw: Any
+    config_form_fields: List[NormalisedFormField], form_fields_raw: Any, tenant_id: str
 ) -> List[FormField]:
     if form_fields_raw is None:
         raise_bad_input_exception("Missing input param: formFields")
@@ -77,5 +79,5 @@ async def validate_form_fields_or_throw_error(
             value = value.strip()
         form_fields.append(FormField(current_form_field["id"], value))
 
-    await validate_form_or_throw_error(form_fields, config_form_fields)
+    await validate_form_or_throw_error(form_fields, config_form_fields, tenant_id)
     return form_fields

supertokens_python/recipe/emailpassword/asyncio/__init__.py

@@ -37,12 +37,18 @@ async def update_email_or_password(
     email: Union[str, None] = None,
     password: Union[str, None] = None,
     apply_password_policy: Union[bool, None] = None,
+    tenant_id_for_password_policy: Optional[str] = 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, apply_password_policy, user_context
+        user_id,
+        email,
+        password,
+        apply_password_policy,
+        tenant_id_for_password_policy or DEFAULT_TENANT_ID,
+        user_context,
     )
 
 

supertokens_python/recipe/emailpassword/emaildelivery/services/backward_compatibility/__init__.py

@@ -14,7 +14,7 @@
 from __future__ import annotations
 
 from os import environ
-from typing import TYPE_CHECKING, Any, Awaitable, Callable, Dict, Union
+from typing import Any, Dict
 
 from httpx import AsyncClient
 
@@ -28,33 +28,26 @@
 from supertokens_python.supertokens import AppInfo
 from supertokens_python.utils import handle_httpx_client_exceptions
 
-if TYPE_CHECKING:
-    from supertokens_python.recipe.emailpassword.utils import (
-        InputResetPasswordUsingTokenFeature,
-    )
 
+async def create_and_send_email_using_supertokens_service(
+    app_info: AppInfo, user: User, password_reset_url_with_token: str
+) -> None:
+    if ("SUPERTOKENS_ENV" in environ) and (environ["SUPERTOKENS_ENV"] == "testing"):
+        return
 
-def default_create_and_send_custom_email(
-    app_info: AppInfo,
-) -> Callable[[User, str, Dict[str, Any]], Awaitable[None]]:
-    async def func(user: User, password_reset_url_with_token: str, _: Dict[str, Any]):
-        if ("SUPERTOKENS_ENV" in environ) and (environ["SUPERTOKENS_ENV"] == "testing"):
-            return
-        data = {
-            "email": user.email,
-            "appName": app_info.app_name,
-            "passwordResetURL": password_reset_url_with_token,
-        }
-        try:
-            async with AsyncClient() as client:
-                resp = await client.post("https://api.supertokens.io/0/st/auth/password/reset", json=data, headers={"api-version": "0"})  # type: ignore
-                resp.raise_for_status()
-                log_debug_message("Password reset email sent to %s", user.email)
-        except Exception as e:
-            log_debug_message("Error sending password reset email")
-            handle_httpx_client_exceptions(e, data)
-
-    return func
+    data = {
+        "email": user.email,
+        "appName": app_info.app_name,
+        "passwordResetURL": password_reset_url_with_token,
+    }
+    try:
+        async with AsyncClient() as client:
+            resp = await client.post("https://api.supertokens.io/0/st/auth/password/reset", json=data, headers={"api-version": "0"})  # type: ignore
+            resp.raise_for_status()
+            log_debug_message("Password reset email sent to %s", user.email)
+    except Exception as e:
+        log_debug_message("Error sending password reset email")
+        handle_httpx_client_exceptions(e, data)
 
 
 class BackwardCompatibilityService(EmailDeliveryInterface[EmailTemplateVars]):
@@ -64,27 +57,9 @@ def __init__(
         self,
         app_info: AppInfo,
         recipe_interface_impl: RecipeInterface,
-        reset_password_using_token_feature: Union[
-            InputResetPasswordUsingTokenFeature, None
-        ] = None,
     ) -> None:
         self.recipe_interface_impl = recipe_interface_impl
-
-        reset_password_feature_send_email_func = default_create_and_send_custom_email(
-            app_info
-        )
-        if (
-            reset_password_using_token_feature
-            and reset_password_using_token_feature.create_and_send_custom_email
-            is not None
-        ):
-            reset_password_feature_send_email_func = (
-                reset_password_using_token_feature.create_and_send_custom_email
-            )
-
-        self.reset_password_feature_send_email_func = (
-            reset_password_feature_send_email_func
-        )
+        self.app_info = app_info
 
     async def send_email(
         self,
@@ -102,8 +77,8 @@ async def send_email(
         # will get reset by the getUserById call above.
         user.email = template_vars.user.email
         try:
-            await self.reset_password_feature_send_email_func(
-                user, template_vars.password_reset_link, user_context
+            await create_and_send_email_using_supertokens_service(
+                self.app_info, user, template_vars.password_reset_link
             )
         except Exception:
             pass

supertokens_python/recipe/emailpassword/interfaces.py

@@ -155,6 +155,7 @@ async def update_email_or_password(
         email: Union[str, None],
         password: Union[str, None],
         apply_password_policy: Union[bool, None],
+        tenant_id_for_password_policy: str,
         user_context: Dict[str, Any],
     ) -> Union[
         UpdateEmailOrPasswordOkResult,