fix: session functions

CHANGELOG.md

@@ -8,8 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+
 ## [0.18.9] - 2024-03-14
+
 - Updates version for CICD testing
+- Fixes session recipe to not pass tenant id when `revoke_across_all_tenants` or `fetch_across_all_tenants` is set to `True`
+- Updated fake email generation
 
 ## [0.18.8] - 2024-02-29
 

supertokens_python/recipe/session/session_functions.py

@@ -404,11 +404,18 @@ async def revoke_all_sessions_for_user(
     if tenant_id is None:
         tenant_id = DEFAULT_TENANT_ID
 
-    response = await recipe_implementation.querier.send_post_request(
-        NormalisedURLPath(f"{tenant_id}/recipe/session/remove"),
-        {"userId": user_id, "revokeAcrossAllTenants": revoke_across_all_tenants},
-        user_context=user_context,
-    )
+    if revoke_across_all_tenants:
+        response = await recipe_implementation.querier.send_post_request(
+            NormalisedURLPath(f"/recipe/session/remove"),
+            {"userId": user_id, "revokeAcrossAllTenants": revoke_across_all_tenants},
+            user_context=user_context,
+        )
+    else:
+        response = await recipe_implementation.querier.send_post_request(
+            NormalisedURLPath(f"{tenant_id}/recipe/session/remove"),
+            {"userId": user_id, "revokeAcrossAllTenants": revoke_across_all_tenants},
+            user_context=user_context,
+        )
     return response["sessionHandlesRevoked"]
 
 
@@ -422,11 +429,18 @@ async def get_all_session_handles_for_user(
     if tenant_id is None:
         tenant_id = DEFAULT_TENANT_ID
 
-    response = await recipe_implementation.querier.send_get_request(
-        NormalisedURLPath(f"{tenant_id}/recipe/session/user"),
-        {"userId": user_id, "fetchAcrossAllTenants": fetch_across_all_tenants},
-        user_context=user_context,
-    )
+    if fetch_across_all_tenants:
+        response = await recipe_implementation.querier.send_get_request(
+            NormalisedURLPath(f"/recipe/session/user"),
+            {"userId": user_id, "fetchAcrossAllTenants": fetch_across_all_tenants},
+            user_context=user_context,
+        )
+    else:
+        response = await recipe_implementation.querier.send_get_request(
+            NormalisedURLPath(f"{tenant_id}/recipe/session/user"),
+            {"userId": user_id, "fetchAcrossAllTenants": fetch_across_all_tenants},
+            user_context=user_context,
+        )
     return response["sessionHandles"]
 
 

supertokens_python/recipe/thirdparty/providers/custom.py

@@ -261,7 +261,7 @@ async def default_generate_fake_email(
                 _tenant_id: str, third_party_user_id: str, _: Dict[str, Any]
             ) -> str:
                 return (
-                    f"{third_party_user_id}@{input_config.third_party_id}.fakeemail.com"
+                    f"{third_party_user_id}.{input_config.third_party_id}@stfakeemail.supertokens.com"
                 )
 
             input_config.generate_fake_email = default_generate_fake_email