Skip to content

Commit 3f08f11

Browse files
Empty string for user permissions not allowed
1 parent 2170a6e commit 3f08f11

4 files changed

Lines changed: 32 additions & 2 deletions

File tree

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
from conductor.asyncio_client.http.api import UserResourceApi
22

33

4-
class UserResourceApiAdapter(UserResourceApi): ...
4+
class UserResourceApiAdapter(UserResourceApi):
5+
async def get_granted_permissions(
6+
self,
7+
user_id,
8+
*args,
9+
**kwargs,
10+
) -> object:
11+
if not user_id:
12+
user_id = None
13+
return await super().get_granted_permissions(user_id=user_id, *args, **kwargs)
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
from conductor.client.codegen.api.user_resource_api import UserResourceApi
22

33

4-
class UserResourceApiAdapter(UserResourceApi): ...
4+
class UserResourceApiAdapter(UserResourceApi):
5+
def get_granted_permissions(self, user_id, **kwargs):
6+
if not user_id:
7+
user_id = None
8+
return super().get_granted_permissions(user_id=user_id, **kwargs)

tests/unit/orkes/test_async_authorization_client.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,3 +491,12 @@ async def test_get_group_permissions(mocker, authorization_client: OrkesAuthoriz
491491
}
492492
]
493493
}
494+
495+
496+
@pytest.mark.asyncio
497+
async def test_get_granted_permissions_for_user_with_empty_string(mocker, authorization_client):
498+
from conductor.asyncio_client.http.api import UserResourceApi
499+
mock = mocker.patch.object(UserResourceApi, "get_granted_permissions")
500+
mock.return_value = {"grantedAccess": []}
501+
await authorization_client.get_granted_permissions_for_user("")
502+
mock.assert_called_with(user_id=None)

tests/unit/orkes/test_authorization_client.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,14 @@ def test_get_granted_permissions_for_user(mocker, authorization_client):
442442
assert perms == [expected_perm]
443443

444444

445+
def test_get_granted_permissions_for_user_with_empty_string(mocker, authorization_client):
446+
from conductor.client.codegen.api.user_resource_api import UserResourceApi
447+
mock = mocker.patch.object(UserResourceApi, "get_granted_permissions")
448+
mock.return_value = {"grantedAccess": []}
449+
authorization_client.get_granted_permissions_for_user("")
450+
mock.assert_called_with(user_id=None)
451+
452+
445453
def test_get_permissions(mocker, authorization_client):
446454
mock = mocker.patch.object(AuthorizationResourceApi, "get_permissions")
447455
mock.return_value = {

0 commit comments

Comments
 (0)