Merge pull request #423 from supertokens/test-cicd/fix-unit-tests

test: Fix failing unit tests

Author: rishabhpoddar

frontendDriverInterfaceSupported.json

@@ -1,6 +1,6 @@
 {
     "_comment": "contains a list of frontend-driver interfaces branch names that this core supports",
     "versions": [
-        "1.16"
+        "1.17"
     ]
-}
+}

supertokens_python/framework/django/django_middleware.py

@@ -71,9 +71,11 @@ def __syncMiddleware(request: HttpRequest):
         from django.http import HttpResponse
 
         response = DjangoResponse(HttpResponse())
+        user_context = default_user_context(custom_request)
+
         try:
             result: Union[DjangoResponse, None] = async_to_sync(st.middleware)(
-                custom_request, response
+                custom_request, response, user_context
             )
 
             if result is None:

supertokens_python/recipe/dashboard/__init__.py

@@ -20,8 +20,9 @@
 
 from .recipe import DashboardRecipe
 
-if TYPE_CHECKING:
-    from supertokens_python.recipe.dashboard.utils import InputOverrideConfig
+from supertokens_python.recipe.dashboard import utils
+
+InputOverrideConfig = utils.InputOverrideConfig
 
 
 def init(

supertokens_python/recipe/emailpassword/asyncio/__init__.py

@@ -70,7 +70,7 @@ async def get_user_by_email(
     if user_context is None:
         user_context = {}
     return await EmailPasswordRecipe.get_instance().recipe_implementation.get_user_by_email(
-        tenant_id, email, user_context
+        email, tenant_id, user_context
     )
 
 
@@ -93,7 +93,7 @@ async def reset_password_using_token(
     if user_context is None:
         user_context = {}
     return await EmailPasswordRecipe.get_instance().recipe_implementation.reset_password_using_token(
-        new_password, tenant_id, token, user_context
+        token, new_password, tenant_id, user_context
     )
 
 

supertokens_python/recipe/multitenancy/recipe_implementation.py

@@ -45,6 +45,7 @@
     from .utils import MultitenancyConfig
 
 from supertokens_python.querier import NormalisedURLPath
+from .constants import DEFAULT_TENANT_ID
 
 
 def parse_tenant_config(tenant: Dict[str, Any]) -> TenantConfigResponse:
@@ -161,7 +162,7 @@ async def get_tenant(
         self, tenant_id: Optional[str], user_context: Dict[str, Any]
     ) -> Optional[GetTenantOkResult]:
         res = await self.querier.send_get_request(
-            NormalisedURLPath(f"{tenant_id}/recipe/multitenancy/tenant"),
+            NormalisedURLPath(f"{tenant_id or DEFAULT_TENANT_ID}/recipe/multitenancy/tenant"),
         )
 
         if res["status"] == "TENANT_NOT_FOUND_ERROR":
@@ -209,7 +210,7 @@ async def create_or_update_third_party_config(
         user_context: Dict[str, Any],
     ) -> CreateOrUpdateThirdPartyConfigOkResult:
         response = await self.querier.send_put_request(
-            NormalisedURLPath(f"{tenant_id}/recipe/multitenancy/config/thirdparty"),
+            NormalisedURLPath(f"{tenant_id or DEFAULT_TENANT_ID}/recipe/multitenancy/config/thirdparty"),
             {
                 "config": config.to_json(),
                 "skipValidation": skip_validation is True,
@@ -228,7 +229,7 @@ async def delete_third_party_config(
     ) -> DeleteThirdPartyConfigOkResult:
         response = await self.querier.send_post_request(
             NormalisedURLPath(
-                f"{tenant_id}/recipe/multitenancy/config/thirdparty/remove"
+                f"{tenant_id or DEFAULT_TENANT_ID}/recipe/multitenancy/config/thirdparty/remove"
             ),
             {
                 "thirdPartyId": third_party_id,
@@ -240,7 +241,7 @@ async def delete_third_party_config(
         )
 
     async def associate_user_to_tenant(
-        self, tenant_id: str | None, user_id: str, user_context: Dict[str, Any]
+        self, tenant_id: Optional[str], user_id: str, user_context: Dict[str, Any]
     ) -> Union[
         AssociateUserToTenantOkResult,
         AssociateUserToTenantUnknownUserIdError,
@@ -249,7 +250,7 @@ async def associate_user_to_tenant(
         AssociateUserToTenantThirdPartyUserAlreadyExistsError,
     ]:
         response: Dict[str, Any] = await self.querier.send_post_request(
-            NormalisedURLPath(f"{tenant_id}/recipe/multitenancy/tenant/user"),
+            NormalisedURLPath(f"{tenant_id or DEFAULT_TENANT_ID}/recipe/multitenancy/tenant/user"),
             {
                 "userId": user_id,
             },
@@ -277,10 +278,10 @@ async def associate_user_to_tenant(
         raise Exception("Should never come here")
 
     async def dissociate_user_from_tenant(
-        self, tenant_id: str | None, user_id: str, user_context: Dict[str, Any]
+        self, tenant_id: Optional[str], user_id: str, user_context: Dict[str, Any]
     ) -> DisassociateUserFromTenantOkResult:
         response = await self.querier.send_post_request(
-            NormalisedURLPath(f"{tenant_id}/recipe/multitenancy/tenant/user/remove"),
+            NormalisedURLPath(f"{tenant_id or DEFAULT_TENANT_ID}/recipe/multitenancy/tenant/user/remove"),
             {
                 "userId": user_id,
             },

supertokens_python/recipe/passwordless/api/implementation.py

@@ -289,17 +289,17 @@ async def consume_code_post(
             ev_instance = EmailVerificationRecipe.get_instance_optional()
             if ev_instance is not None:
                 token_response = await ev_instance.recipe_implementation.create_email_verification_token(
-                    tenant_id, user.user_id, user.email, user_context
+                    user.user_id, user.email, tenant_id, user_context
                 )
 
                 if isinstance(token_response, CreateEmailVerificationTokenOkResult):
                     await ev_instance.recipe_implementation.verify_email_using_token(
-                        tenant_id, token_response.token, user_context
+                        token_response.token, tenant_id, user_context
                     )
 
         session = await create_new_session(
-            tenant_id=tenant_id,
             request=api_options.request,
+            tenant_id=tenant_id,
             user_id=user.user_id,
             access_token_payload={},
             session_data_in_database={},

supertokens_python/recipe/session/asyncio/__init__.py

@@ -11,7 +11,8 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from typing import Any, Callable, Dict, List, Optional, TypeVar, Union
+from __future__ import annotations
+from typing import Any, Callable, Dict, List, Optional, TypeVar, Union, TYPE_CHECKING
 
 from supertokens_python.recipe.openid.interfaces import (
     GetOpenIdDiscoveryConfigurationResult,
@@ -46,9 +47,12 @@
 
 _T = TypeVar("_T")
 
+if TYPE_CHECKING:
+    from supertokens_python.framework.request import BaseRequest
+
 
 async def create_new_session(
-    request: Any,
+    request: BaseRequest,
     tenant_id: str,
     user_id: str,
     access_token_payload: Union[Dict[str, Any], None] = None,

supertokens_python/recipe/session/syncio/__init__.py

@@ -11,8 +11,8 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-
-from typing import Any, Dict, List, Union, Callable, Optional, TypeVar
+from __future__ import annotations
+from typing import Any, Dict, List, Union, Callable, Optional, TypeVar, TYPE_CHECKING
 
 from supertokens_python.async_to_sync_wrapper import sync
 from supertokens_python.recipe.openid.interfaces import (
@@ -37,8 +37,12 @@
 )
 
 
+if TYPE_CHECKING:
+    from supertokens_python.framework.request import BaseRequest
+
+
 def create_new_session(
-    request: Any,
+    request: BaseRequest,
     tenant_id: str,
     user_id: str,
     access_token_payload: Union[Dict[str, Any], None] = None,

supertokens_python/recipe/thirdparty/api/implementation.py

@@ -91,7 +91,7 @@ async def sign_in_up_post(
                     email=await provider.config.generate_fake_email(
                         user_info.third_party_user_id, tenant_id, user_context
                     ),
-                    email_verified=True,
+                    is_verified=True,
                 )
 
         email = user_info.email.id if user_info.email is not None else None
@@ -123,15 +123,15 @@ async def sign_in_up_post(
 
                 if isinstance(token_response, CreateEmailVerificationTokenOkResult):
                     await ev_instance.recipe_implementation.verify_email_using_token(
-                        tenant_id=tenant_id,
                         token=token_response.token,
+                        tenant_id=tenant_id,
                         user_context=user_context,
                     )
 
         user = signinup_response.user
         session = await create_new_session(
-            tenant_id=tenant_id,
             request=api_options.request,
+            tenant_id=tenant_id,
             user_id=user.user_id,
             user_context=user_context,
         )

supertokens_python/recipe/thirdparty/providers/github.py

@@ -55,7 +55,7 @@ async def get_user_info(
         for info in email_info:
             if info.get("primary"):
                 result.email = UserInfoEmail(
-                    email=info.get("email"), email_verified=info.get("verified")
+                    email=info.get("email"), is_verified=info.get("verified")
                 )
 
         return result