Merge pull request #380 from supertokens/fix/passwordless-mt

feat: All changes related to passwordless multitenancy

Author: rishabhpoddar

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

@@ -59,15 +59,17 @@ async def handle_email_verify_token_post(
 
     assert isinstance(email_verification_token, CreateEmailVerificationTokenOkResult)
 
+    # TODO: Pass tenant id
+    tenant_id = "pass-tenant-id"
     email_verify_link = get_email_verify_link(
-        api_options.app_info, email_verification_token.token, user_id
+        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,
-            user_context={},
+            tenant_id=tenant_id,
         )
     )
 

supertokens_python/recipe/emailpassword/api/implementation.py

@@ -111,6 +111,7 @@ async def generate_password_reset_token_post(
         send_email_input = PasswordResetEmailTemplateVars(
             user=PasswordResetEmailTemplateVarsUser(user.user_id, user.email),
             password_reset_link=password_reset_link,
+            tenant_id=tenant_id,
         )
         await api_options.email_delivery.ingredient_interface_impl.send_email(
             send_email_input, user_context

supertokens_python/recipe/emailpassword/asyncio/__init__.py

@@ -109,7 +109,8 @@ async def sign_up(
 
 
 async def send_email(
-    input_: EmailTemplateVars, user_context: Union[None, Dict[str, Any]] = None
+    input_: EmailTemplateVars,
+    user_context: Union[None, Dict[str, Any]] = None,
 ):
     if user_context is None:
         user_context = {}

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

@@ -87,7 +87,9 @@ def __init__(
         )
 
     async def send_email(
-        self, template_vars: EmailTemplateVars, user_context: Dict[str, Any]
+        self,
+        template_vars: EmailTemplateVars,
+        user_context: Dict[str, Any],
     ) -> None:
         user = await self.recipe_interface_impl.get_user_by_id(
             user_id=template_vars.user.id, user_context=user_context

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

@@ -42,7 +42,9 @@ def __init__(
         self.service_implementation = oi if override is None else override(oi)
 
     async def send_email(
-        self, template_vars: EmailTemplateVars, user_context: Dict[str, Any]
+        self,
+        template_vars: EmailTemplateVars,
+        user_context: Dict[str, Any],
     ) -> None:
         content = await self.service_implementation.get_content(
             template_vars, user_context

supertokens_python/recipe/emailpassword/syncio/__init__.py

@@ -103,7 +103,8 @@ def sign_up(
 
 
 def send_email(
-    input_: EmailTemplateVars, user_context: Union[None, Dict[str, Any]] = None
+    input_: EmailTemplateVars,
+    user_context: Union[None, Dict[str, Any]] = None,
 ):
     from supertokens_python.recipe.emailpassword.asyncio import send_email
 

supertokens_python/recipe/emailpassword/types.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from __future__ import annotations
-from typing import Awaitable, Callable, List, TypeVar, Union
+from typing import Awaitable, Callable, List, TypeVar, Union, Optional
 
 from supertokens_python.ingredients.emaildelivery import EmailDeliveryIngredient
 from supertokens_python.ingredients.emaildelivery.types import (
@@ -30,7 +30,7 @@ def __init__(
         self.time_joined = time_joined
         self.tenant_ids = tenant_ids
 
-    def __eq__(self, other: "User"): # type: ignore
+    def __eq__(self, other: object):
         return (
             isinstance(other, self.__class__)
             and self.user_id == other.user_id
@@ -99,9 +99,11 @@ def __init__(
         self,
         user: PasswordResetEmailTemplateVarsUser,
         password_reset_link: str,
+        tenant_id: Optional[str],
     ) -> None:
         self.user = user
         self.password_reset_link = password_reset_link
+        self.tenant_id = tenant_id
 
 
 # Export:

supertokens_python/recipe/emailverification/api/email_verify.py

@@ -28,6 +28,7 @@
 
 async def handle_email_verify_api(
     api_implementation: APIInterface,
+    tenant_id: str,
     api_options: APIOptions,
     user_context: Dict[str, Any],
 ):
@@ -52,7 +53,7 @@ async def handle_email_verify_api(
         )
 
         result = await api_implementation.email_verify_post(
-            token, session, api_options, user_context
+            token, session, tenant_id, api_options, user_context
         )
     else:
         if api_implementation.disable_is_email_verified_get:

supertokens_python/recipe/emailverification/asyncio/__init__.py

@@ -23,10 +23,13 @@
 from supertokens_python.recipe.emailverification.types import EmailTemplateVars
 from supertokens_python.recipe.emailverification.recipe import EmailVerificationRecipe
 
+from supertokens_python.recipe.multitenancy.constants import DEFAULT_TENANT_ID
+
 
 async def create_email_verification_token(
     user_id: str,
     email: Optional[str] = None,
+    tenant_id: Optional[str] = None,
     user_context: Union[None, Dict[str, Any]] = None,
 ) -> Union[
     CreateEmailVerificationTokenOkResult,
@@ -45,17 +48,19 @@ async def create_email_verification_token(
             raise Exception("Unknown User ID provided without email")
 
     return await recipe.recipe_implementation.create_email_verification_token(
-        user_id, email, user_context
+        user_id, email, tenant_id or DEFAULT_TENANT_ID, user_context
     )
 
 
 async def verify_email_using_token(
-    token: str, user_context: Union[None, Dict[str, Any]] = None
+    token: str,
+    tenant_id: Optional[str] = None,
+    user_context: Union[None, Dict[str, Any]] = None,
 ):
     if user_context is None:
         user_context = {}
     return await EmailVerificationRecipe.get_instance().recipe_implementation.verify_email_using_token(
-        token, user_context
+        token, tenant_id or DEFAULT_TENANT_ID, user_context
     )
 
 
@@ -85,6 +90,7 @@ async def is_email_verified(
 async def revoke_email_verification_tokens(
     user_id: str,
     email: Optional[str] = None,
+    tenant_id: Optional[str] = None,
     user_context: Optional[Dict[str, Any]] = None,
 ) -> RevokeEmailVerificationTokensOkResult:
     if user_context is None:
@@ -101,7 +107,7 @@ async def revoke_email_verification_tokens(
             raise Exception("Unknown User ID provided without email")
 
     return await EmailVerificationRecipe.get_instance().recipe_implementation.revoke_email_verification_tokens(
-        user_id, email, user_context
+        user_id, email, tenant_id or DEFAULT_TENANT_ID, user_context
     )
 
 
@@ -131,7 +137,8 @@ async def unverify_email(
 
 
 async def send_email(
-    input_: EmailTemplateVars, user_context: Union[None, Dict[str, Any]] = None
+    input_: EmailTemplateVars,
+    user_context: Union[None, Dict[str, Any]] = None,
 ):
     if user_context is None:
         user_context = {}

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

@@ -66,7 +66,9 @@ def __init__(
         )
 
     async def send_email(
-        self, template_vars: VerificationEmailTemplateVars, user_context: Dict[str, Any]
+        self,
+        template_vars: VerificationEmailTemplateVars,
+        user_context: Dict[str, Any],
     ) -> None:
         try:
             email_user = User(template_vars.user.id, template_vars.user.email)