Merge pull request #396 from supertokens/fix/multitenancy-recipe-tests

fix: Multitenancy tests for all the recipes

Author: rishabhpoddar

supertokens_python/recipe/emailpassword/utils.py

@@ -42,7 +42,7 @@ async def default_validator(_: str, __: str) -> Union[str, None]:
     return None
 
 
-async def default_password_validator(_: str, value: str) -> Union[str, None]:
+async def default_password_validator(value: str, _tenant_id: str) -> Union[str, None]:
     # length >= 8 && < 100
     # must have a number and a character
     # as per
@@ -62,7 +62,7 @@ async def default_password_validator(_: str, value: str) -> Union[str, None]:
     return None
 
 
-async def default_email_validator(_: str, value: Any) -> Union[str, None]:
+async def default_email_validator(value: Any, _tenant_id: str) -> Union[str, None]:
     # We check if the email syntax is correct
     # As per https://github.com/supertokens/supertokens-auth-react/issues/5#issuecomment-709512438
     # Regex from https://stackoverflow.com/a/46181/3867175

supertokens_python/recipe/passwordless/recipe_implementation.py

@@ -206,7 +206,7 @@ async def get_user_by_phone_number(
     ) -> Union[User, None]:
         param = {"phoneNumber": phone_number}
         result = await self.querier.send_get_request(
-            NormalisedURLPath("{tenant_id}/recipe/user"), param
+            NormalisedURLPath(f"{tenant_id}/recipe/user"), param
         )
         if result["status"] == "OK":
             email_resp = None

supertokens_python/recipe/thirdparty/api/implementation.py

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from __future__ import annotations
+from supertokens_python.utils import utf_base64decode
 from base64 import b64decode
 import json
 

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: str = "temp",
         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,
             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,
@@ -179,7 +180,8 @@ def __init__(self, provider_config: ProviderConfig):
         self.input_config = input_config = self._normalize_input(provider_config)
 
         provider_config_for_client = ProviderConfigForClient(
-            # Will automatically get replaced by correct value
+            # Will automatically get replaced with correct value
+            # in get_provider_config_for_client
             # when fetch_and_set_config function runs
             client_id="temp",
             client_secret=None,

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"]
                     ),

supertokens_python/recipe/userroles/recipe.py

@@ -152,7 +152,7 @@ async def fetch_value(
             recipe = UserRolesRecipe.get_instance()
 
             user_roles = await recipe.recipe_implementation.get_roles_for_user(
-                tenant_id, user_id, user_context
+                user_id, tenant_id, user_context
             )
 
             user_permissions: Set[str] = set()
@@ -186,7 +186,7 @@ async def fetch_value(
         ) -> List[str]:
             recipe = UserRolesRecipe.get_instance()
             res = await recipe.recipe_implementation.get_roles_for_user(
-                tenant_id, user_id, user_context
+                user_id, tenant_id, user_context
             )
             return res.roles
 

tests/Django/test_django.py

@@ -16,6 +16,7 @@
 from urllib.parse import urlencode
 from datetime import datetime
 from inspect import isawaitable
+from base64 import b64encode
 from typing import Any, Dict, Union
 
 from django.http import HttpRequest, HttpResponse, JsonResponse
@@ -455,10 +456,10 @@ async def test_thirdparty_parsing_works(self):
 
         start_st()
 
-        data = {
-            "state": "afc596274293e1587315c",
-            "code": "c7685e261f98e4b3b94e34b3a69ff9cf4.0.rvxt.eE8rO__6hGoqaX1B7ODPmA",
-        }
+        state = b64encode(json.dumps({"redirectURI": "http://localhost:3000/redirect" }).encode()).decode()
+        code = "testing"
+
+        data = { "state": state, "code": code}
 
         request = self.factory.post(
             "/auth/callback/apple",
@@ -470,11 +471,9 @@ async def test_thirdparty_parsing_works(self):
             raise Exception("Should never come here")
         response = await temp
 
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(
-            response.content,
-            b'<html><head><script>window.location.replace("http://supertokens.io/auth/callback/apple?state=afc596274293e1587315c&code=c7685e261f98e4b3b94e34b3a69ff9cf4.0.rvxt.eE8rO__6hGoqaX1B7ODPmA");</script></head></html>',
-        )
+        self.assertEqual(response.status_code, 303)
+        self.assertEqual(response.content, b'')
+        self.assertEqual(response.headers['location'], f"http://localhost:3000/redirect?state={state.replace('=', '%3D')}&code={code}")
 
     @pytest.mark.asyncio
     async def test_search_with_multiple_emails(self):

tests/Flask/test_flask.py

@@ -14,6 +14,7 @@
 
 import json
 from typing import Any, Dict, Union
+from base64 import b64encode
 
 import pytest
 from _pytest.fixtures import fixture
@@ -477,17 +478,15 @@ def test_thirdparty_parsing_works(driver_config_app: Any):
     start_st()
 
     test_client = driver_config_app.test_client()
-    data = {
-        "state": "afc596274293e1587315c",
-        "code": "c7685e261f98e4b3b94e34b3a69ff9cf4.0.rvxt.eE8rO__6hGoqaX1B7ODPmA",
-    }
-    response = test_client.post("/auth/callback/apple", data=data)
+    state = b64encode(json.dumps({"redirectURI": "http://localhost:3000/redirect" }).encode()).decode()
+    code = "testing"
 
-    assert response.status_code == 200
-    assert (
-        response.data
-        == b'<html><head><script>window.location.replace("http://supertokens.io/auth/callback/apple?state=afc596274293e1587315c&code=c7685e261f98e4b3b94e34b3a69ff9cf4.0.rvxt.eE8rO__6hGoqaX1B7ODPmA");</script></head></html>'
-    )
+    data = { "state": state, "code": code}
+    res = test_client.post("/auth/callback/apple", data=data)
+
+    assert res.status_code == 303
+    assert res.data == b''
+    assert res.headers["location"] == f"http://localhost:3000/redirect?state={state.replace('=', '%3D')}&code={code}"
 
 
 from flask.wrappers import Response