Skip to content

Fix FindUser filters after CS3API update #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rawe0 merged 1 commit into from
Nov 25, 2025
Merged

Fix FindUser filters after CS3API update #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cs3client/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,18 @@ def get_user_groups(self, idp, opaque_id) -> list[str]:
self._log.debug(f'msg="Invoked GetUserGroups" opaque_id="{opaque_id}" trace="{res.status.trace}"')
return res.groups

def find_users(self, auth_token: tuple, filter) -> list[cs3iur.User]:
def find_users(self, auth_token: tuple, filters) -> list[cs3iur.User]:
"""
Find a user based on a filter.

:param auth_token: tuple in the form ('x-access-token', <token>) (see auth.get_token/auth.check_token)
:param filter: Filter to search for.
:param filters: Filters to search for.
:return: a list of user(s).
:raises: NotFoundException (User not found)
:raises: AuthenticationException (Operation not permitted)
:raises: UnknownException (Unknown error)
"""
req = cs3iu.FindUsersRequest(filter=filter, skip_fetching_user_groups=True)
req = cs3iu.FindUsersRequest(filters=filters, skip_fetching_user_groups=True)
res = self._gateway.FindUsers(request=req, metadata=[auth_token])
self._status_code_handler.handle_errors(res.status, "find users")
self._log.debug(f'msg="Invoked FindUsers" filter="{filter}" trace="{res.status.trace}"')
Expand Down
12 changes: 9 additions & 3 deletions tests/test_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import pytest
from unittest.mock import Mock, patch
import cs3.rpc.v1beta1.code_pb2 as cs3code
import cs3.identity.user.v1beta1.user_api_pb2 as cs3iu
import cs3.identity.user.v1beta1.resources_pb2 as cs3iur

from cs3client.exceptions import (
AuthenticationException,
Expand Down Expand Up @@ -124,7 +126,11 @@ def test_get_user_groups(
def test_find_users(
user_instance, status_code, status_message, expected_exception, users # noqa: F811 (not a redefinition)
):
filter = "filter"
filters = [
cs3iu.Filter(
type=cs3iur.UserType.USER_TYPE_PRIMARY
)
]

mock_response = Mock()
mock_response.status.code = status_code
Expand All @@ -135,7 +141,7 @@ def test_find_users(
with patch.object(user_instance._gateway, "FindUsers", return_value=mock_response):
if expected_exception:
with pytest.raises(expected_exception):
user_instance.find_users(auth_token, filter)
user_instance.find_users(auth_token, filters)
else:
result = user_instance.find_users(auth_token, filter)
result = user_instance.find_users(auth_token, filters)
assert result == users
Loading