update: servers to be consistent with auth-react

Author: namsnath

.github/workflows/auth-react-test.yml

@@ -80,10 +80,6 @@ jobs:
           export PYTHONPATH="${PYTHONPATH}:$(pwd)"
           cd tests/auth-react/django3x
 
-          set -a
-          source ../auth-react.env
-          set +a
-
           uvicorn mysite.asgi:application --port 8083 &
 
       - name: Start Server (fastapi)
@@ -94,10 +90,6 @@ jobs:
           export PYTHONPATH="${PYTHONPATH}:$(pwd)"
           cd tests/auth-react/fastapi-server
 
-          set -a
-          source ../auth-react.env
-          set +a
-
           uvicorn app:app --host 0.0.0.0 --port 8083 &
 
       - name: Start Server (flask)
@@ -108,10 +100,6 @@ jobs:
           export PYTHONPATH="${PYTHONPATH}:$(pwd)"
           cd tests/auth-react/flask-server
 
-          set -a
-          source ../auth-react.env
-          set +a
-
           python3 app.py --port 8083 &
 
       - uses: supertokens/auth-react-testing-action@main

tests/auth-react/django3x/mysite/utils.py

@@ -1,6 +1,7 @@
 import os
 from typing import Any, Awaitable, Callable, Dict, List, Optional, Union
 
+import requests
 from dotenv import load_dotenv
 from supertokens_python import InputAppInfo, Supertokens, SupertokensConfig, init
 from supertokens_python.framework.request import BaseRequest
@@ -85,7 +86,7 @@
 
 from .store import save_code, save_url_with_token
 
-load_dotenv()
+load_dotenv("../auth-react.env")
 
 
 def get_api_port():
@@ -296,8 +297,56 @@ async def exchange_auth_code_for_oauth_tokens(
     return oi
 
 
-def custom_init():
-    import mysite.store
+def get_core_url():
+    host = os.environ.get("SUPERTOKENS_CORE_HOST", "localhost")
+    port = os.environ.get("SUPERTOKENS_CORE_PORT", "3567")
+
+    return f"http://localhost:{host}:{port}"
+
+
+def setup_core_app(
+    *, appId: Optional[str] = None, coreConfig: Optional[Dict[str, Any]] = None
+):
+    core_url = get_core_url()
+
+    if appId is None:
+        appId = ""
+
+    if coreConfig is None:
+        coreConfig = {}
+
+    response = requests.put(
+        f"{core_url}/recipe/multitenancy/app/v2",
+        headers={
+            "Content-Type": "application/json",
+        },
+        data={
+            "appId": appId,
+            "coreConfig": coreConfig,
+        },
+    )
+
+    response_body = response.json()
+    assert response_body["status"] == "OK"
+
+    return f"{core_url}/appid-{appId}"
+
+
+def custom_init(
+    *,
+    coreUrl: str = get_core_url(),
+    accountLinkingConfig: Optional[Dict[str, Any]] = None,
+    enabledRecipes: Optional[List[str]] = None,
+    enabledProviders: Optional[List[str]] = None,
+    passwordlessFlowType: Optional[str] = "USER_INPUT_CODE_AND_MAGIC_LINK",
+    passwordlessContactMethod: Optional[str] = "EMAIL_OR_PHONE",
+    mfaInfo: Optional[Dict[str, Any]] = None,
+):
+    if accountLinkingConfig is None:
+        accountLinkingConfig = {}
+
+    if mfaInfo is None:
+        mfaInfo = {}
 
     AccountLinkingRecipe.reset()
     UserRolesRecipe.reset()
@@ -706,27 +755,27 @@ async def resend_code_post(
         ),
     ]
 
-    if mysite.store.enabled_providers is not None:
+    if enabledProviders is not None:
         providers_list = [
             provider
             for provider in providers_list
-            if provider.config.third_party_id in mysite.store.enabled_providers
+            if provider.config.third_party_id in enabledProviders
         ]
 
-    if mysite.store.contact_method is not None and mysite.store.flow_type is not None:
-        if mysite.store.contact_method == "PHONE":
+    if passwordlessContactMethod is not None and passwordlessFlowType is not None:
+        if passwordlessContactMethod == "PHONE":
             passwordless_init = passwordless.init(
                 contact_config=ContactPhoneOnlyConfig(),
-                flow_type=mysite.store.flow_type,
+                flow_type=passwordlessFlowType,  # type: ignore - type expects only certain literals
                 sms_delivery=passwordless.SMSDeliveryConfig(CustomSMSService()),
                 override=passwordless.InputOverrideConfig(
                     apis=override_passwordless_apis
                 ),
             )
-        elif mysite.store.contact_method == "EMAIL":
+        elif passwordlessContactMethod == "EMAIL":
             passwordless_init = passwordless.init(
                 contact_config=ContactEmailOnlyConfig(),
-                flow_type=mysite.store.flow_type,
+                flow_type=passwordlessFlowType,  # type: ignore - type expects only certain literals
                 email_delivery=passwordless.EmailDeliveryConfig(
                     CustomPlessEmailService()
                 ),
@@ -737,7 +786,7 @@ async def resend_code_post(
         else:
             passwordless_init = passwordless.init(
                 contact_config=ContactEmailOrPhoneConfig(),
-                flow_type=mysite.store.flow_type,
+                flow_type=passwordlessFlowType,  # type: ignore - type expects only certain literals
                 email_delivery=passwordless.EmailDeliveryConfig(
                     CustomPlessEmailService()
                 ),
@@ -780,8 +829,8 @@ async def get_factors_setup_for_user(
             user_context: Dict[str, Any],
         ):
             res = await og_get_factors_setup_for_user(user, user_context)
-            if "alreadySetup" in mysite.store.mfa_info:
-                return mysite.store.mfa_info["alreadySetup"]
+            if "alreadySetup" in mfaInfo:
+                return mfaInfo["alreadySetup"]
             return res
 
         og_assert_allowed_to_setup_factor = original_implementation.assert_allowed_to_setup_factor_else_throw_invalid_claim_error
@@ -793,8 +842,8 @@ async def assert_allowed_to_setup_factor_else_throw_invalid_claim_error(
             factors_set_up_for_user: Callable[[], Awaitable[List[str]]],
             user_context: Dict[str, Any],
         ):
-            if "allowedToSetup" in mysite.store.mfa_info:
-                if factor_id not in mysite.store.mfa_info["allowedToSetup"]:
+            if "allowedToSetup" in mfaInfo:
+                if factor_id not in mfaInfo["allowedToSetup"]:
                     raise InvalidClaimsError(
                         msg="INVALID_CLAIMS",
                         payload=[
@@ -834,8 +883,8 @@ async def get_mfa_requirements_for_auth(
                 required_secondary_factors_for_tenant,
                 user_context,
             )
-            if "requirements" in mysite.store.mfa_info:
-                return mysite.store.mfa_info["requirements"]
+            if "requirements" in mfaInfo:
+                return mfaInfo["requirements"]
             return res
 
         original_implementation.get_mfa_requirements_for_auth = (
@@ -862,10 +911,10 @@ async def resync_session_and_fetch_mfa_info_put(
             )
 
             if isinstance(res, ResyncSessionAndFetchMFAInfoPUTOkResult):
-                if "alreadySetup" in mysite.store.mfa_info:
-                    res.factors.already_setup = mysite.store.mfa_info["alreadySetup"][:]
+                if "alreadySetup" in mfaInfo:
+                    res.factors.already_setup = mfaInfo["alreadySetup"][:]
 
-                if "noContacts" in mysite.store.mfa_info:
+                if "noContacts" in mfaInfo:
                     res.emails = {}
                     res.phone_numbers = {}
 
@@ -926,7 +975,7 @@ async def resync_session_and_fetch_mfa_info_put(
         {
             "id": "multifactorauth",
             "init": multifactorauth.init(
-                first_factors=mysite.store.mfa_info.get("firstFactors", None),
+                first_factors=mfaInfo.get("firstFactors", None),
                 override=multifactorauth.OverrideConfig(
                     functions=override_mfa_functions,
                     apis=override_mfa_apis,
@@ -954,7 +1003,7 @@ async def resync_session_and_fetch_mfa_info_put(
             "shouldAutomaticallyLink": True,
             "shouldRequireVerification": True,
         },
-        **mysite.store.accountlinking_config,
+        **accountLinkingConfig,
     }
 
     async def should_do_automatic_account_linking(
@@ -989,10 +1038,10 @@ async def should_do_automatic_account_linking(
             }
         )
 
-    if mysite.store.enabled_recipes is not None:
+    if enabledRecipes is not None:
         new_recipe_list = []
         for item in recipe_list:
-            for recipe_id in mysite.store.enabled_recipes:
+            for recipe_id in enabledRecipes:
                 if item["id"] in recipe_id:
                     new_recipe_list.append(item["init"])  # type: ignore
                     break
@@ -1003,7 +1052,7 @@ async def should_do_automatic_account_linking(
         recipe_list = [item["init"] for item in recipe_list]
 
     init(
-        supertokens_config=SupertokensConfig("http://localhost:9000"),
+        supertokens_config=SupertokensConfig(coreUrl),
         app_info=InputAppInfo(
             app_name="SuperTokens Demo",
             api_domain="localhost:" + get_api_port(),

tests/auth-react/django3x/polls/urls.py

@@ -17,23 +17,11 @@
         name="removeUserFromTenant",
     ),  # type: ignore
     path("addUserToTenant", views.add_user_to_tenant, name="addUserToTenant"),  # type: ignore
-    path("test/setFlow", views.test_set_flow, name="setFlow"),  # type: ignore
-    path(
-        "test/setAccountLinkingConfig",
-        views.test_set_account_linking_config,  # type: ignore
-        name="setAccountLinkingConfig",
-    ),  # type: ignore
-    path("setMFAInfo", views.set_mfa_info, name="setMfaInfo"),  # type: ignore
     path(
         "addRequiredFactor",
         views.add_required_factor,  # type: ignore
         name="addRequiredFactor",
     ),  # type: ignore
-    path(
-        "test/setEnabledRecipes",
-        views.test_set_enabled_recipes,  # type: ignore
-        name="setEnabledRecipes",
-    ),
     path("test/getTOTPCode", views.test_get_totp_code, name="getTotpCode"),  # type: ignore
     path(
         "test/create-oauth2-client",
@@ -42,7 +30,12 @@
     ),  # type: ignore
     path("test/getDevice", views.test_get_device, name="getDevice"),  # type: ignore
     path("test/featureFlags", views.test_feature_flags, name="featureFlags"),  # type: ignore
-    path("beforeeach", views.before_each, name="beforeeach"),  # type: ignore
+    path("/test/before", views.before, name="before"),
+    path("/test/beforeEach", views.before_each, name="beforeeach"),
+    path("/test/after", views.after, name="after"),
+    path("/test/afterEach", views.after_each, name="afterEach"),
+    path("/test/setup/app", views.setup_core_app),
+    path("/test/setup/st", views.setup_st),
 ]
 
 mode = os.environ.get("APP_MODE", "asgi")

tests/auth-react/django3x/polls/views.py

@@ -18,6 +18,7 @@
 from django.http import HttpRequest, HttpResponse, JsonResponse
 from mysite.store import get_codes, get_url_with_token
 from mysite.utils import custom_init
+from mysite.utils import setup_core_app as setup_core_app_impl
 from supertokens_python import convert_to_recipe_user_id
 from supertokens_python.asyncio import get_user
 from supertokens_python.auth_utils import LinkingToSessionUserFailedError
@@ -387,37 +388,6 @@ async def remove_tenant(request: HttpRequest):
     return JsonResponse({"status": "OK", "didExist": core_resp.did_exist})
 
 
-async def test_set_flow(request: HttpRequest):
-    body = json.loads(request.body)
-    import mysite.store
-
-    mysite.store.contact_method = body["contactMethod"]
-    mysite.store.flow_type = body["flowType"]
-    custom_init()
-    return HttpResponse("")
-
-
-async def test_set_account_linking_config(request: HttpRequest):
-    import mysite.store
-
-    body = json.loads(request.body)
-    if body is None:
-        raise Exception("Invalid request body")
-    mysite.store.accountlinking_config = body
-    custom_init()
-    return HttpResponse("")
-
-
-async def set_mfa_info(request: HttpRequest):
-    import mysite.store
-
-    body = json.loads(request.body)
-    if body is None:
-        return JsonResponse({"error": "Invalid request body"}, status_code=400)
-    mysite.store.mfa_info = body
-    return JsonResponse({"status": "OK"})
-
-
 @verify_session()
 async def add_required_factor(request: HttpRequest):
     session_: SessionContainer = request.supertokens  # type: ignore
@@ -433,18 +403,6 @@ async def add_required_factor(request: HttpRequest):
     return JsonResponse({"status": "OK"})
 
 
-def test_set_enabled_recipes(request: HttpRequest):
-    import mysite.store
-
-    body = json.loads(request.body)
-    if body is None:
-        raise Exception("Invalid request body")
-    mysite.store.enabled_recipes = body.get("enabledRecipes")
-    mysite.store.enabled_providers = body.get("enabledProviders")
-    custom_init()
-    return HttpResponse("")
-
-
 def test_get_totp_code(request: HttpRequest):
     from pyotp import TOTP
 
@@ -467,18 +425,24 @@ def test_create_oauth2_client(request: HttpRequest):
     return JsonResponse(client.to_json())
 
 
+def before(request: HttpRequest):
+    return HttpResponse("")
+
+
 def before_each(request: HttpRequest):
     import mysite.store
 
-    mysite.store.contact_method = "EMAIL_OR_PHONE"
-    mysite.store.flow_type = "USER_INPUT_CODE_AND_MAGIC_LINK"
     mysite.store.latest_url_with_token = ""
     mysite.store.code_store = dict()
-    mysite.store.accountlinking_config = {}
-    mysite.store.enabled_providers = None
-    mysite.store.enabled_recipes = None
-    mysite.store.mfa_info = {}
-    custom_init()
+
+    return HttpResponse("")
+
+
+def after_each(request: HttpRequest):
+    return HttpResponse("")
+
+
+def after(request: HttpRequest):
     return HttpResponse("")
 
 
@@ -500,3 +464,22 @@ def test_feature_flags(request: HttpRequest):
             ]
         }
     )
+
+
+def setup_core_app(request: HttpRequest):
+    body = json.loads(request.body)
+    if body is None:
+        raise Exception("Invalid request body")
+
+    url = setup_core_app_impl(**body)
+
+    return HttpResponse(url)
+
+
+def setup_st(request: HttpRequest):
+    body = json.loads(request.body)
+    if body is None:
+        raise Exception("Invalid request body")
+
+    custom_init(**body)
+    return HttpResponse("")