fix: Add multitenancy features to emailpassword recipe

Author: KShivendu

supertokens_python/recipe/emailpassword/recipe_implementation.py

@@ -62,6 +62,7 @@ async def get_user_by_id(
                 response["user"]["id"],
                 response["user"]["email"],
                 response["user"]["timeJoined"],
+                response["user"]["tenantIds"],
             )
         return None
 
@@ -77,6 +78,7 @@ async def get_user_by_email(
                 response["user"]["id"],
                 response["user"]["email"],
                 response["user"]["timeJoined"],
+                response["user"]["tenantIds"],
             )
         return None
 
@@ -120,6 +122,7 @@ async def sign_in(
                     response["user"]["id"],
                     response["user"]["email"],
                     response["user"]["timeJoined"],
+                    response["user"]["tenantIds"],
                 )
             )
         return SignInWrongCredentialsError()
@@ -137,6 +140,7 @@ async def sign_up(
                     response["user"]["id"],
                     response["user"]["email"],
                     response["user"]["timeJoined"],
+                    response["user"]["tenantIds"],
                 )
             )
         return SignUpEmailAlreadyExistsError()

supertokens_python/recipe/emailpassword/types.py

@@ -21,10 +21,13 @@
 
 
 class User:
-    def __init__(self, user_id: str, email: str, time_joined: int):
-        self.user_id: str = user_id
-        self.email: str = email
-        self.time_joined: int = time_joined
+    def __init__(
+        self, user_id: str, email: str, time_joined: int, tenant_ids: List[str]
+    ):
+        self.user_id = user_id
+        self.email = email
+        self.time_joined = time_joined
+        self.tenant_ids = tenant_ids
 
 
 class UsersResponse:

supertokens_python/recipe/passwordless/recipe_implementation.py

@@ -137,6 +137,7 @@ async def consume_code(
                 email=email,
                 phone_number=phone_number,
                 time_joined=result["user"]["timeJoined"],
+                tenant_ids=result["user"]["tenantIds"],
             )
             return ConsumeCodeOkResult(result["createdNewUser"], user)
         if result["status"] == "RESTART_FLOW_ERROR":
@@ -170,6 +171,7 @@ async def get_user_by_id(
                 email=email,
                 phone_number=phone_number,
                 time_joined=result["user"]["timeJoined"],
+                tenant_ids=result["user"]["tenantIds"],
             )
         return None
 
@@ -191,6 +193,7 @@ async def get_user_by_email(
                 user_id=result["user"]["id"],
                 email=email_resp,
                 phone_number=phone_number_resp,
+                tenant_ids=result["user"]["tenantIds"],
                 time_joined=result["user"]["timeJoined"],
             )
         return None
@@ -214,6 +217,7 @@ async def get_user_by_phone_number(
                 email=email_resp,
                 phone_number=phone_number_resp,
                 time_joined=result["user"]["timeJoined"],
+                tenant_ids=result["user"]["tenantIds"],
             )
         return None
 

supertokens_python/recipe/passwordless/types.py

@@ -32,11 +32,13 @@ def __init__(
         email: Union[str, None],
         phone_number: Union[str, None],
         time_joined: int,
+        tenant_ids: List[str],
     ):
-        self.user_id: str = user_id
-        self.email: Union[str, None] = email
-        self.phone_number: Union[str, None] = phone_number
-        self.time_joined: int = time_joined
+        self.user_id = user_id
+        self.email = email
+        self.phone_number = phone_number
+        self.time_joined = time_joined
+        self.tenant_ids = tenant_ids
 
 
 class DeviceCode:

supertokens_python/recipe/thirdparty/recipe_implementation.py

@@ -53,11 +53,11 @@ async def get_user_by_id(
                 response["user"]["id"],
                 response["user"]["email"],
                 response["user"]["timeJoined"],
+                response["user"]["tenantIds"],
                 ThirdPartyInfo(
                     response["user"]["thirdParty"]["userId"],
                     response["user"]["thirdParty"]["id"],
                 ),
-                response["user"].get("tenantId"),
             )
         return None
 
@@ -77,10 +77,10 @@ async def get_users_by_email(
                     user["id"],
                     user["email"],
                     user["timeJoined"],
+                    response["user"]["tenantIds"],
                     ThirdPartyInfo(
                         user["thirdParty"]["userId"], user["thirdParty"]["id"]
                     ),
-                    response["user"].get("tenantId"),
                 )
             )
         return users
@@ -103,11 +103,11 @@ async def get_user_by_thirdparty_info(
                 response["user"]["id"],
                 response["user"]["email"],
                 response["user"]["timeJoined"],
+                response["user"]["tenantIds"],
                 ThirdPartyInfo(
                     response["user"]["thirdParty"]["userId"],
                     response["user"]["thirdParty"]["id"],
                 ),
-                response["user"].get("tenantId"),
             )
         return None
 
@@ -133,11 +133,11 @@ async def sign_in_up(
                 response["user"]["id"],
                 response["user"]["email"],
                 response["user"]["timeJoined"],
+                response["user"]["tenantIds"],
                 ThirdPartyInfo(
                     response["user"]["thirdParty"]["userId"],
                     response["user"]["thirdParty"]["id"],
                 ),
-                response["user"].get("tenantId"),
             ),
             response["createdNewUser"],
             oauth_tokens,
@@ -164,11 +164,11 @@ async def manually_create_or_update_user(
                 response["user"]["id"],
                 response["user"]["email"],
                 response["user"]["timeJoined"],
+                response["user"]["tenantIds"],
                 ThirdPartyInfo(
                     response["user"]["thirdParty"]["userId"],
                     response["user"]["thirdParty"]["id"],
                 ),
-                response["user"].get("tenantId"),
             ),
             response["createdNewUser"],
         )

supertokens_python/recipe/thirdparty/types.py

@@ -36,14 +36,14 @@ def __init__(
         user_id: str,
         email: str,
         time_joined: int,
+        tenant_ids: List[str],
         third_party_info: ThirdPartyInfo,
-        tenant_id: Union[str, None],
     ):
         self.user_id: str = user_id
         self.email: str = email
         self.time_joined: int = time_joined
+        self.tenant_ids = tenant_ids
         self.third_party_info: ThirdPartyInfo = third_party_info
-        self.tenant_id = tenant_id
 
 
 class UserInfoEmail:

supertokens_python/recipe/thirdpartyemailpassword/api/emailpassword_api_impementation.py

@@ -75,7 +75,10 @@ async def sign_in_post(
             if isinstance(result, EmailPasswordSignInPostOkResult):
                 return SignInPostOkResult(
                     User(
-                        result.user.user_id, result.user.email, result.user.time_joined
+                        result.user.user_id,
+                        result.user.email,
+                        result.user.time_joined,
+                        result.user.tenant_ids,
                     ),
                     result.session,
                 )
@@ -98,7 +101,10 @@ async def sign_up_post(
             if isinstance(result, EmailPasswordSignUpPostOkResult):
                 return SignUpPostOkResult(
                     User(
-                        result.user.user_id, result.user.email, result.user.time_joined
+                        result.user.user_id,
+                        result.user.email,
+                        result.user.time_joined,
+                        result.user.tenant_ids,
                     ),
                     result.session,
                 )

supertokens_python/recipe/thirdpartyemailpassword/api/implementation.py

@@ -152,6 +152,7 @@ async def thirdparty_sign_in_up_post(
                     result.user.user_id,
                     result.user.email,
                     result.user.time_joined,
+                    result.user.tenant_ids,
                     result.user.third_party_info,
                 ),
                 result.created_new_user,
@@ -178,6 +179,7 @@ async def emailpassword_sign_in_post(
                     result.user.user_id,
                     result.user.email,
                     result.user.time_joined,
+                    result.user.tenant_ids,
                     None,
                 ),
                 result.session,
@@ -201,6 +203,7 @@ async def emailpassword_sign_up_post(
                     result.user.user_id,
                     result.user.email,
                     result.user.time_joined,
+                    result.user.tenant_ids,
                     None,
                 ),
                 result.session,

supertokens_python/recipe/thirdpartyemailpassword/api/thirdparty_api_implementation.py

@@ -73,8 +73,8 @@ async def sign_in_up_post(
                         result.user.user_id,
                         result.user.email,
                         result.user.time_joined,
+                        result.user.tenant_ids,
                         result.user.third_party_info,
-                        result.user.tenant_id,
                     ),
                     result.created_new_user,
                     result.session,

supertokens_python/recipe/thirdpartyemailpassword/recipeimplementation/email_password_recipe_implementation.py

@@ -56,7 +56,10 @@ async def get_user_by_id(
             return None
 
         return User(
-            user_id=user.user_id, email=user.email, time_joined=user.time_joined
+            user_id=user.user_id,
+            email=user.email,
+            time_joined=user.time_joined,
+            tenant_ids=user.tenant_ids,
         )
 
     async def get_user_by_email(
@@ -67,7 +70,10 @@ async def get_user_by_email(
         for user in users:
             if user.third_party_info is None:
                 return User(
-                    user_id=user.user_id, email=user.email, time_joined=user.time_joined
+                    user_id=user.user_id,
+                    email=user.email,
+                    time_joined=user.time_joined,
+                    tenant_ids=user.tenant_ids,
                 )
 
         return None
@@ -96,7 +102,12 @@ async def sign_in(
         )
         if isinstance(result, EmailPasswordSignInOkResult):
             return SignInOkResult(
-                User(result.user.user_id, result.user.email, result.user.time_joined)
+                User(
+                    result.user.user_id,
+                    result.user.email,
+                    result.user.time_joined,
+                    result.user.tenant_ids,
+                )
             )
         return result
 
@@ -108,7 +119,12 @@ async def sign_up(
         )
         if isinstance(result, EmailPasswordSignUpOkResult):
             return SignUpOkResult(
-                User(result.user.user_id, result.user.email, result.user.time_joined)
+                User(
+                    result.user.user_id,
+                    result.user.email,
+                    result.user.time_joined,
+                    result.user.tenant_ids,
+                )
             )
         return result
 

supertokens_python/recipe/thirdpartyemailpassword/recipeimplementation/implementation.py

@@ -131,6 +131,7 @@ async def get_user_by_id(
                 user_id=ep_user.user_id,
                 email=ep_user.email,
                 time_joined=ep_user.time_joined,
+                tenant_ids=ep_user.tenant_ids,
                 third_party_info=None,
             )
 
@@ -144,6 +145,7 @@ async def get_user_by_id(
             user_id=tp_user.user_id,
             email=tp_user.email,
             time_joined=tp_user.time_joined,
+            tenant_ids=tp_user.tenant_ids,
             third_party_info=tp_user.third_party_info,
         )
 
@@ -158,6 +160,7 @@ async def get_users_by_email(
                 User(
                     user_id=ep_user.user_id,
                     email=ep_user.email,
+                    tenant_ids=ep_user.tenant_ids,
                     time_joined=ep_user.time_joined,
                     third_party_info=None,
                 )
@@ -173,6 +176,7 @@ async def get_users_by_email(
                 User(
                     user_id=tp_user.user_id,
                     email=tp_user.email,
+                    tenant_ids=tp_user.tenant_ids,
                     time_joined=tp_user.time_joined,
                     third_party_info=tp_user.third_party_info,
                 )
@@ -199,6 +203,7 @@ async def get_user_by_thirdparty_info(
             user_id=tp_user.user_id,
             email=tp_user.email,
             time_joined=tp_user.time_joined,
+            tenant_ids=tp_user.tenant_ids,
             third_party_info=tp_user.third_party_info,
         )
 
@@ -226,6 +231,7 @@ async def thirdparty_sign_in_up(
                 result.user.user_id,
                 result.user.email,
                 result.user.time_joined,
+                result.user.tenant_ids,
                 result.user.third_party_info,
             ),
             result.created_new_user,
@@ -253,6 +259,7 @@ async def thirdparty_manually_create_or_update_user(
                 result.user.user_id,
                 result.user.email,
                 result.user.time_joined,
+                result.user.tenant_ids,
                 result.user.third_party_info,
             ),
             result.created_new_user,
@@ -282,6 +289,7 @@ async def emailpassword_sign_in(
                     result.user.user_id,
                     result.user.email,
                     result.user.time_joined,
+                    result.user.tenant_ids,
                     None,
                 )
             )
@@ -297,6 +305,7 @@ async def emailpassword_sign_up(
                     result.user.user_id,
                     result.user.email,
                     result.user.time_joined,
+                    result.user.tenant_ids,
                     None,
                 )
             )