tests: Fix all failing tests

Author: KShivendu

supertokens_python/constants.py

@@ -13,7 +13,7 @@
 # under the License.
 from __future__ import annotations
 
-SUPPORTED_CDI_VERSIONS = ["2.21"]
+SUPPORTED_CDI_VERSIONS = ["3.0"]
 VERSION = "0.14.7"
 TELEMETRY = "/telemetry"
 USER_COUNT = "/users/count"

supertokens_python/normalised_url_path.py

@@ -39,7 +39,8 @@ def equals(self, other: NormalisedURLPath) -> bool:
         return self.__value == other.get_as_string_dangerous()
 
     def is_a_recipe_path(self) -> bool:
-        return self.__value == "/recipe" or self.__value.startswith("/recipe/")
+        parts = self.__value.split("/")
+        return parts[1] == "recipe" or parts[2] == "recipe"
 
 
 def normalise_url_path_or_throw_error(input_str: str) -> str:

supertokens_python/recipe/multitenancy/api/implementation.py

@@ -73,7 +73,7 @@ async def login_methods_get(
 
         return LoginMethodsGetOkResult(
             email_password=LoginMethodEmailPassword(
-                tenant_config_res.email_password.enabled
+                tenant_config_res.emailpassword.enabled
             ),
             passwordless=LoginMethodPasswordless(
                 tenant_config_res.passwordless.enabled

supertokens_python/recipe/multitenancy/asyncio/__init__.py

@@ -10,23 +10,30 @@
 # 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, Union, Optional
+from __future__ import annotations
+
+from typing import Any, Dict, Union, Optional, TYPE_CHECKING
 
 from ..interfaces import (
     TenantConfig,
-    ProviderConfig,
     CreateOrUpdateTenantOkResult,
     DeleteTenantOkResult,
     GetTenantOkResult,
     ListAllTenantsOkResult,
     CreateOrUpdateThirdPartyConfigOkResult,
     DeleteThirdPartyConfigOkResult,
     AssociateUserToTenantOkResult,
-    AssociateUserToTenantErrorResult,
+    AssociateUserToTenantUnknownUserIdErrorResult,
+    AssociateUserToTenantEmailAlreadyExistsErrorResult,
+    AssociateUserToTenantPhoneNumberAlreadyExistsErrorResult,
+    AssociateUserToTenantThirdPartyUserAlreadyExistsErrorResult,
     DisassociateUserFromTenantOkResult,
 )
 from ..recipe import MultitenancyRecipe
 
+if TYPE_CHECKING:
+    from ..interfaces import ProviderConfig
+
 
 async def create_or_update_tenant(
     tenant_id: Optional[str],
@@ -108,7 +115,13 @@ async def associate_user_to_tenant(
     tenant_id: Optional[str],
     user_id: str,
     user_context: Optional[Dict[str, Any]] = None,
-) -> Union[AssociateUserToTenantOkResult, AssociateUserToTenantErrorResult]:
+) -> Union[
+    AssociateUserToTenantOkResult,
+    AssociateUserToTenantUnknownUserIdErrorResult,
+    AssociateUserToTenantEmailAlreadyExistsErrorResult,
+    AssociateUserToTenantPhoneNumberAlreadyExistsErrorResult,
+    AssociateUserToTenantThirdPartyUserAlreadyExistsErrorResult,
+]:
     if user_context is None:
         user_context = {}
 

supertokens_python/recipe/multitenancy/interfaces.py

@@ -40,13 +40,29 @@ def __init__(
         self.third_party_enabled = third_party_enabled
         self.core_config = core_config
 
+    def to_json(self) -> Dict[str, Any]:
+        res: Dict[str, Any] = {}
+        if self.email_password_enabled is not None:
+            res["emailPasswordEnabled"] = self.email_password_enabled
+        if self.passwordless_enabled is not None:
+            res["passwordlessEnabled"] = self.passwordless_enabled
+        if self.third_party_enabled is not None:
+            res["thirdPartyEnabled"] = self.third_party_enabled
+        if self.core_config is not None:
+            res["coreConfig"] = self.core_config
+        return res
+
 
 class CreateOrUpdateTenantOkResult:
+    status = "OK"
+
     def __init__(self, created_new: bool):
         self.created_new = created_new
 
 
 class DeleteTenantOkResult:
+    status = "OK"
+
     def __init__(self, did_exist: bool):
         self.did_exist = did_exist
 
@@ -67,51 +83,71 @@ def __init__(self, enabled: bool, providers: List[ProviderConfig]):
         self.providers = providers
 
 
-class GetTenantOkResult:
+class TenantConfigResponse:
     def __init__(
         self,
-        email_password: EmailPasswordConfig,
+        emailpassword: EmailPasswordConfig,
         passwordless: PasswordlessConfig,
         third_party: ThirdPartyConfig,
         core_config: Dict[str, Any],
     ):
-        self.email_password = email_password
+        self.emailpassword = emailpassword
         self.passwordless = passwordless
         self.third_party = third_party
         self.core_config = core_config
 
 
+class GetTenantOkResult(TenantConfigResponse):
+    status = "OK"
+
+
 class ListAllTenantsOkResult:
-    def __init__(self, tenants: List[str]):
+    status = "OK"
+
+    def __init__(self, tenants: List[TenantConfigResponse]):
         self.tenants = tenants
 
 
 class CreateOrUpdateThirdPartyConfigOkResult:
+    status = "OK"
+
     def __init__(self, created_new: bool):
         self.created_new = created_new
 
 
 class DeleteThirdPartyConfigOkResult:
+    status = "OK"
+
     def __init__(self, did_config_exist: bool):
         self.did_config_exist = did_config_exist
 
 
-class ListThirdPartyConfigsForThirdPartyIdOkResult:
-    def __init__(self, providers: List[ProviderConfig]):
-        self.providers = providers
-
-
 class AssociateUserToTenantOkResult:
+    status = "OK"
+
     def __init__(self, was_already_associated: bool):
         self.was_already_associated = was_already_associated
 
 
-class AssociateUserToTenantErrorResult:
-    def __init__(self, status: str):
-        self.status = status  # FIXME: Create seperate errors for each kind
+class AssociateUserToTenantUnknownUserIdErrorResult:
+    status = "UNKNOWN_USER_ID_ERROR"
+
+
+class AssociateUserToTenantEmailAlreadyExistsErrorResult:
+    status = "EMAIL_ALREADY_EXISTS_ERROR"
+
+
+class AssociateUserToTenantPhoneNumberAlreadyExistsErrorResult:
+    status = "PHONE_NUMBER_ALREADY_EXISTS_ERROR"
+
+
+class AssociateUserToTenantThirdPartyUserAlreadyExistsErrorResult:
+    status = "THIRD_PARTY_USER_ALREADY_EXISTS_ERROR"
 
 
 class DisassociateUserFromTenantOkResult:
+    status = "OK"
+
     def __init__(self, was_associated: bool):
         self.was_associated = was_associated
 
@@ -180,7 +216,13 @@ async def associate_user_to_tenant(
         tenant_id: Optional[str],
         user_id: str,
         user_context: Dict[str, Any],
-    ) -> Union[AssociateUserToTenantOkResult, AssociateUserToTenantErrorResult]:
+    ) -> Union[
+        AssociateUserToTenantOkResult,
+        AssociateUserToTenantUnknownUserIdErrorResult,
+        AssociateUserToTenantEmailAlreadyExistsErrorResult,
+        AssociateUserToTenantPhoneNumberAlreadyExistsErrorResult,
+        AssociateUserToTenantThirdPartyUserAlreadyExistsErrorResult,
+    ]:
         pass
 
     @abstractmethod

supertokens_python/recipe/multitenancy/recipe.py

@@ -44,11 +44,6 @@
 from supertokens_python.querier import Querier
 from supertokens_python.types import GeneralErrorResponse
 
-from supertokens_python.recipe.thirdparty.providers.config_utils import (
-    find_and_create_provider_instance,
-    merge_providers_from_core_and_static,
-)
-from supertokens_python.recipe.thirdparty.exceptions import ClientTypeNotFoundError
 
 from .api import handle_login_methods_api
 from .constants import LOGIN_METHODS
@@ -218,6 +213,14 @@ async def login_methods_get(
         api_options: APIOptions,
         user_context: Dict[str, Any],
     ) -> Union[LoginMethodsGetOkResult, GeneralErrorResponse]:
+        from supertokens_python.recipe.thirdparty.providers.config_utils import (
+            find_and_create_provider_instance,
+            merge_providers_from_core_and_static,
+        )
+        from supertokens_python.recipe.thirdparty.exceptions import (
+            ClientTypeNotFoundError,
+        )
+
         tenant_config = await api_options.recipe_implementation.get_tenant(
             tenant_id, user_context
         )
@@ -246,7 +249,7 @@ async def login_methods_get(
             )
 
         return LoginMethodsGetOkResult(
-            LoginMethodEmailPassword(tenant_config.email_password.enabled),
+            LoginMethodEmailPassword(tenant_config.emailpassword.enabled),
             LoginMethodPasswordless(tenant_config.passwordless.enabled),
             LoginMethodThirdParty(
                 tenant_config.third_party.enabled, final_provider_list