Merge branch 'feat/tp-rework' into fix/compulsory-tenant-id

Author: KShivendu

supertokens_python/recipe/emailpassword/api/implementation.py

@@ -170,7 +170,6 @@ async def sign_in_post(
         user = result.user
         session = await create_new_session(
             api_options.request,
-            "pass-tenant-id",  # TODO: change this to tenant_id
             user.user_id,
             access_token_payload={},
             session_data_in_database={},
@@ -210,7 +209,6 @@ async def sign_up_post(
         user = result.user
         session = await create_new_session(
             api_options.request,
-            "pass-tenant-id",  # TODO: change this to tenant_id
             user.user_id,
             access_token_payload={},
             session_data_in_database={},

supertokens_python/recipe/multitenancy/asyncio/__init__.py

@@ -23,10 +23,10 @@
     CreateOrUpdateThirdPartyConfigOkResult,
     DeleteThirdPartyConfigOkResult,
     AssociateUserToTenantOkResult,
-    AssociateUserToTenantUnknownUserIdErrorResult,
-    AssociateUserToTenantEmailAlreadyExistsErrorResult,
-    AssociateUserToTenantPhoneNumberAlreadyExistsErrorResult,
-    AssociateUserToTenantThirdPartyUserAlreadyExistsErrorResult,
+    AssociateUserToTenantUnknownUserIdError,
+    AssociateUserToTenantEmailAlreadyExistsError,
+    AssociateUserToTenantPhoneNumberAlreadyExistsError,
+    AssociateUserToTenantThirdPartyUserAlreadyExistsError,
     DisassociateUserFromTenantOkResult,
 )
 from ..recipe import MultitenancyRecipe
@@ -117,10 +117,10 @@ async def associate_user_to_tenant(
     user_context: Optional[Dict[str, Any]] = None,
 ) -> Union[
     AssociateUserToTenantOkResult,
-    AssociateUserToTenantUnknownUserIdErrorResult,
-    AssociateUserToTenantEmailAlreadyExistsErrorResult,
-    AssociateUserToTenantPhoneNumberAlreadyExistsErrorResult,
-    AssociateUserToTenantThirdPartyUserAlreadyExistsErrorResult,
+    AssociateUserToTenantUnknownUserIdError,
+    AssociateUserToTenantEmailAlreadyExistsError,
+    AssociateUserToTenantPhoneNumberAlreadyExistsError,
+    AssociateUserToTenantThirdPartyUserAlreadyExistsError,
 ]:
     if user_context is None:
         user_context = {}

supertokens_python/recipe/multitenancy/interfaces.py

@@ -129,19 +129,19 @@ def __init__(self, was_already_associated: bool):
         self.was_already_associated = was_already_associated
 
 
-class AssociateUserToTenantUnknownUserIdErrorResult:
+class AssociateUserToTenantUnknownUserIdError:
     status = "UNKNOWN_USER_ID_ERROR"
 
 
-class AssociateUserToTenantEmailAlreadyExistsErrorResult:
+class AssociateUserToTenantEmailAlreadyExistsError:
     status = "EMAIL_ALREADY_EXISTS_ERROR"
 
 
-class AssociateUserToTenantPhoneNumberAlreadyExistsErrorResult:
+class AssociateUserToTenantPhoneNumberAlreadyExistsError:
     status = "PHONE_NUMBER_ALREADY_EXISTS_ERROR"
 
 
-class AssociateUserToTenantThirdPartyUserAlreadyExistsErrorResult:
+class AssociateUserToTenantThirdPartyUserAlreadyExistsError:
     status = "THIRD_PARTY_USER_ALREADY_EXISTS_ERROR"
 
 
@@ -218,10 +218,10 @@ async def associate_user_to_tenant(
         user_context: Dict[str, Any],
     ) -> Union[
         AssociateUserToTenantOkResult,
-        AssociateUserToTenantUnknownUserIdErrorResult,
-        AssociateUserToTenantEmailAlreadyExistsErrorResult,
-        AssociateUserToTenantPhoneNumberAlreadyExistsErrorResult,
-        AssociateUserToTenantThirdPartyUserAlreadyExistsErrorResult,
+        AssociateUserToTenantUnknownUserIdError,
+        AssociateUserToTenantEmailAlreadyExistsError,
+        AssociateUserToTenantPhoneNumberAlreadyExistsError,
+        AssociateUserToTenantThirdPartyUserAlreadyExistsError,
     ]:
         pass
 
@@ -336,6 +336,5 @@ async def login_methods_get(
 
 
 TypeGetAllowedDomainsForTenantId = Callable[
-    [str, Dict[str, Any]],
-    Awaitable[List[str]],
+    [str, Dict[str, Any]], Awaitable[Optional[List[str]]]
 ]

supertokens_python/recipe/multitenancy/recipe.py

@@ -262,7 +262,7 @@ async def login_methods_get(
 
 class AllowedDomainsClaimClass(PrimitiveArrayClaim[List[str]]):
     def __init__(self):
-        default_max_age_in_sec = 60 * 60 * 24 * 7
+        default_max_age_in_sec = 60 * 60
 
         async def fetch_value(
             _: str, tenant_id: str, user_context: Dict[str, Any]