fix: Make it similar to node SDK

Author: KShivendu

supertokens_python/recipe/userroles/asyncio/__init__.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Union, Optional
 
 from supertokens_python.recipe.userroles.interfaces import (
     AddRoleToUserOkResult,
@@ -17,7 +17,7 @@
 
 
 async def add_role_to_user(
-    tenant_id: str,
+    tenant_id: Optional[str],
     user_id: str,
     role: str,
     user_context: Union[Dict[str, Any], None] = None,
@@ -30,7 +30,7 @@ async def add_role_to_user(
 
 
 async def remove_user_role(
-    tenant_id: str,
+    tenant_id: Optional[str],
     user_id: str,
     role: str,
     user_context: Union[Dict[str, Any], None] = None,
@@ -43,7 +43,9 @@ async def remove_user_role(
 
 
 async def get_roles_for_user(
-    tenant_id: str, user_id: str, user_context: Union[Dict[str, Any], None] = None
+    tenant_id: Optional[str],
+    user_id: str,
+    user_context: Union[Dict[str, Any], None] = None,
 ) -> GetRolesForUserOkResult:
     if user_context is None:
         user_context = {}
@@ -55,7 +57,9 @@ async def get_roles_for_user(
 
 
 async def get_users_that_have_role(
-    tenant_id: str, role: str, user_context: Union[Dict[str, Any], None] = None
+    tenant_id: Optional[str],
+    role: str,
+    user_context: Union[Dict[str, Any], None] = None,
 ) -> Union[GetUsersThatHaveRoleOkResult, UnknownRoleError]:
     if user_context is None:
         user_context = {}

supertokens_python/recipe/userroles/recipe_implementation.py

@@ -13,7 +13,7 @@
 # under the License.
 
 
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Union, Optional
 
 from supertokens_python.normalised_url_path import NormalisedURLPath
 from supertokens_python.querier import Querier
@@ -32,6 +32,7 @@
     RemoveUserRoleOkResult,
     UnknownRoleError,
 )
+from ..multitenancy.constants import DEFAULT_TENANT_ID
 
 
 class RecipeImplementation(RecipeInterface):
@@ -40,11 +41,15 @@ def __init__(self, querier: Querier):
         self.querier = querier
 
     async def add_role_to_user(
-        self, user_id: str, role: str, tenant_id: str, user_context: Dict[str, Any]
+        self,
+        user_id: str,
+        role: str,
+        tenant_id: Optional[str],
+        user_context: Dict[str, Any],
     ) -> Union[AddRoleToUserOkResult, UnknownRoleError]:
         params = {"userId": user_id, "role": role}
         response = await self.querier.send_put_request(
-            NormalisedURLPath(f"{tenant_id}/recipe/user/role"), params
+            NormalisedURLPath(f"{tenant_id or DEFAULT_TENANT_ID}/recipe/user/role"), params
         )
         if response.get("status") == "OK":
             return AddRoleToUserOkResult(
@@ -53,11 +58,15 @@ async def add_role_to_user(
         return UnknownRoleError()
 
     async def remove_user_role(
-        self, user_id: str, role: str, tenant_id: str, user_context: Dict[str, Any]
+        self,
+        user_id: str,
+        role: str,
+        tenant_id: Optional[str],
+        user_context: Dict[str, Any],
     ) -> Union[RemoveUserRoleOkResult, UnknownRoleError]:
         params = {"userId": user_id, "role": role}
         response = await self.querier.send_post_request(
-            NormalisedURLPath(f"{tenant_id}/recipe/user/role/remove"), params
+            NormalisedURLPath(f"{tenant_id or DEFAULT_TENANT_ID}/recipe/user/role/remove"), params
         )
         if response["status"] == "OK":
             return RemoveUserRoleOkResult(
@@ -66,20 +75,20 @@ async def remove_user_role(
         return UnknownRoleError()
 
     async def get_roles_for_user(
-        self, user_id: str, tenant_id: str, user_context: Dict[str, Any]
+        self, user_id: str, tenant_id: Optional[str], user_context: Dict[str, Any]
     ) -> GetRolesForUserOkResult:
         params = {"userId": user_id}
         response = await self.querier.send_get_request(
-            NormalisedURLPath(f"{tenant_id}/recipe/user/roles"), params
+            NormalisedURLPath(f"{tenant_id or DEFAULT_TENANT_ID}/recipe/user/roles"), params
         )
         return GetRolesForUserOkResult(roles=response["roles"])
 
     async def get_users_that_have_role(
-        self, role: str, tenant_id: str, user_context: Dict[str, Any]
+        self, role: str, tenant_id: Optional[str], user_context: Dict[str, Any]
     ) -> Union[GetUsersThatHaveRoleOkResult, UnknownRoleError]:
         params = {"role": role}
         response = await self.querier.send_get_request(
-            NormalisedURLPath(f"{tenant_id}/recipe/role/users"), params
+            NormalisedURLPath(f"{tenant_id or DEFAULT_TENANT_ID}/recipe/role/users"), params
         )
         if response.get("status") == "OK":
             return GetUsersThatHaveRoleOkResult(users=response["users"])

supertokens_python/recipe/userroles/syncio/__init__.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Union, Optional
 
 from supertokens_python.async_to_sync_wrapper import sync
 from supertokens_python.recipe.userroles.interfaces import (
@@ -31,7 +31,7 @@
 
 
 def add_role_to_user(
-    tenant_id: str,
+    tenant_id: Optional[str],
     user_id: str,
     role: str,
     user_context: Union[Dict[str, Any], None] = None,
@@ -42,7 +42,7 @@ def add_role_to_user(
 
 
 def remove_user_role(
-    tenant_id: str,
+    tenant_id: Optional[str],
     user_id: str,
     role: str,
     user_context: Union[Dict[str, Any], None] = None,
@@ -53,15 +53,19 @@ def remove_user_role(
 
 
 def get_roles_for_user(
-    tenant_id: str, user_id: str, user_context: Union[Dict[str, Any], None] = None
+    tenant_id: Optional[str],
+    user_id: str,
+    user_context: Union[Dict[str, Any], None] = None,
 ) -> GetRolesForUserOkResult:
     from supertokens_python.recipe.userroles.asyncio import get_roles_for_user
 
     return sync(get_roles_for_user(tenant_id, user_id, user_context))
 
 
 def get_users_that_have_role(
-    tenant_id: str, role: str, user_context: Union[Dict[str, Any], None] = None
+    tenant_id: Optional[str],
+    role: str,
+    user_context: Union[Dict[str, Any], None] = None,
 ) -> Union[GetUsersThatHaveRoleOkResult, UnknownRoleError]:
     from supertokens_python.recipe.userroles.asyncio import get_users_that_have_role