fix: Multitenancy tests for userroles, thirdparty, and emailpassword

Author: KShivendu

supertokens_python/recipe/thirdparty/provider.py

@@ -226,6 +226,7 @@ def __init__(
         force_pkce: bool = False,
         additional_config: Optional[Dict[str, Any]] = None,
         # CommonProviderConfig:
+        third_party_id: Optional[str] = None,
         name: Optional[str] = None,
         authorization_endpoint: Optional[str] = None,
         authorization_endpoint_query_params: Optional[
@@ -261,7 +262,7 @@ def __init__(
         )
         CommonProviderConfig.__init__(
             self,
-            "temp",
+            third_party_id or "", # FIXME?
             name,
             authorization_endpoint,
             authorization_endpoint_query_params,

supertokens_python/recipe/thirdparty/providers/config_utils.py

@@ -166,6 +166,8 @@ def merge_providers_from_core_and_static(
                     merged_provider_input.override = provider_input_from_static.override
                     break
 
+            merged_providers.append(merged_provider_input)
+
     return merged_providers
 
 

supertokens_python/recipe/thirdparty/providers/custom.py

@@ -43,6 +43,7 @@ def get_provider_config_for_client(
         force_pkce=client_config.force_pkce,
         additional_config=client_config.additional_config,
         # CommonProviderConfig
+        third_party_id=config.third_party_id,
         name=config.name,
         authorization_endpoint=config.authorization_endpoint,
         authorization_endpoint_query_params=config.authorization_endpoint_query_params,

supertokens_python/recipe/thirdparty/recipe_implementation.py

@@ -77,7 +77,7 @@ async def get_users_by_email(
                     user["id"],
                     user["email"],
                     user["timeJoined"],
-                    response["user"]["tenantIds"],
+                    user["tenantIds"],
                     ThirdPartyInfo(
                         user["thirdParty"]["userId"], user["thirdParty"]["id"]
                     ),

tests/emailpassword/test_multitenancy.py

@@ -33,7 +33,7 @@
 from supertokens_python.recipe.multitenancy.interfaces import TenantConfig
 
 from tests.utils import get_st_init_args
-from tests.utils import setup_function, teardown_function, setup_multitenancy_feature
+from tests.utils import setup_function, teardown_function, setup_multitenancy_feature, start_st
 
 
 _ = setup_function
@@ -42,7 +42,7 @@
 pytestmark = mark.asyncio
 
 
-async def test_multitenancy_in_user_roles():
+async def test_multitenancy_in_emailpassword():
     # test that different roles can be assigned for the same user for each tenant
     args = get_st_init_args(
         [
@@ -53,6 +53,8 @@ async def test_multitenancy_in_user_roles():
         ]
     )
     init(**args)  # type: ignore
+    start_st()
+
     setup_multitenancy_feature()
 
     await create_or_update_tenant("t1", TenantConfig(email_password_enabled=True))
@@ -77,14 +79,16 @@ async def test_multitenancy_in_user_roles():
 
     # sign in
     ep_user1 = await sign_in("[email protected]", "password1", "t1")
-    ep_user2 = await sign_in("[email protected]", "password1", "t2")
-    ep_user3 = await sign_in("[email protected]", "password1", "t3")
+    ep_user2 = await sign_in("[email protected]", "password2", "t2")
+    ep_user3 = await sign_in("[email protected]", "password3", "t3")
 
     assert isinstance(ep_user1, SignInOkResult)
     assert isinstance(ep_user2, SignInOkResult)
     assert isinstance(ep_user3, SignInOkResult)
 
-    assert ep_user1.user.user_id == user2.user.user_id == user3.user.user_id
+    assert ep_user1.user.user_id == user1.user.user_id
+    assert ep_user2.user.user_id == user2.user.user_id
+    assert ep_user3.user.user_id == user3.user.user_id
 
     # get user by id:
     g_user1 = await get_user_by_id(user1.user.user_id)
@@ -106,8 +110,8 @@ async def test_multitenancy_in_user_roles():
 
     # create password reset token:
     pless_reset_link1 = await create_reset_password_token(user1.user.user_id, "t1")
-    pless_reset_link2 = await create_reset_password_token(user1.user.user_id, "t2")
-    pless_reset_link3 = await create_reset_password_token(user1.user.user_id, "t3")
+    pless_reset_link2 = await create_reset_password_token(user2.user.user_id, "t2")
+    pless_reset_link3 = await create_reset_password_token(user3.user.user_id, "t3")
 
     assert isinstance(pless_reset_link1, CreateResetPasswordOkResult)
     assert isinstance(pless_reset_link2, CreateResetPasswordOkResult)

tests/thirdparty/test_multitenancy.py

@@ -28,7 +28,7 @@
 from supertokens_python.recipe.multitenancy.interfaces import TenantConfig
 
 from tests.utils import get_st_init_args
-from tests.utils import setup_function, teardown_function, setup_multitenancy_feature
+from tests.utils import setup_function, teardown_function, setup_multitenancy_feature, start_st
 
 
 _ = setup_function
@@ -37,10 +37,11 @@
 pytestmark = mark.asyncio
 
 
-async def test_multitenancy_functions():
+async def test_thirtyparty_multitenancy_functions():
     # test that different roles can be assigned for the same user for each tenant
     args = get_st_init_args([session.init(), thirdparty.init(), multitenancy.init()])
     init(**args)  # type: ignore
+    start_st()
     setup_multitenancy_feature()
 
     await create_or_update_tenant("t1", TenantConfig(third_party_enabled=True))
@@ -115,13 +116,43 @@ async def test_multitenancy_functions():
 
 
 async def test_get_provider():
-    args = get_st_init_args([session.init(), thirdparty.init(), multitenancy.init()])
+    args = get_st_init_args([
+        session.init(),
+        thirdparty.init(
+            sign_in_and_up_feature=thirdparty.SignInAndUpFeature(
+                providers=[
+                    thirdparty.ProviderInput(
+                        thirdparty.ProviderConfig(
+                            third_party_id="google",
+                        )
+                    ),
+                    thirdparty.ProviderInput(
+                        thirdparty.ProviderConfig(
+                            third_party_id="facebook",
+                        )
+                    ),
+                    thirdparty.ProviderInput(
+                        thirdparty.ProviderConfig(
+                            third_party_id="discord",
+                        )
+                    ),
+                    thirdparty.ProviderInput(
+                        thirdparty.ProviderConfig(
+                            third_party_id="linkedin",
+                        )
+                    ),
+                ]
+            )
+        ),
+        multitenancy.init()
+    ])
     init(**args)
+    start_st()
     setup_multitenancy_feature()
 
     await create_or_update_tenant("t1", TenantConfig(third_party_enabled=True))
-    await create_or_update_tenant("t1", TenantConfig(third_party_enabled=True))
-    await create_or_update_tenant("t1", TenantConfig(third_party_enabled=True))
+    await create_or_update_tenant("t2", TenantConfig(third_party_enabled=True))
+    await create_or_update_tenant("t3", TenantConfig(third_party_enabled=True))
 
     await create_or_update_third_party_config(
         "t1",

tests/userroles/test_multitenancy.py

@@ -28,7 +28,7 @@
 )
 
 from tests.utils import get_st_init_args
-from tests.utils import setup_function, teardown_function, setup_multitenancy_feature
+from tests.utils import setup_function, teardown_function, setup_multitenancy_feature, start_st
 
 
 _ = setup_function
@@ -48,6 +48,7 @@ async def test_multitenancy_in_user_roles():
         ]
     )
     init(**args)  # type: ignore
+    start_st()
     setup_multitenancy_feature()
 
     await create_or_update_tenant("t1", TenantConfig(email_password_enabled=True))