diff --git a/integration/test_rbac.py b/integration/test_rbac.py index 6df1c162d..7f805195a 100644 --- a/integration/test_rbac.py +++ b/integration/test_rbac.py @@ -730,6 +730,7 @@ def test_get_assigned_users_db(client_factory: ClientFactory, request: SubReques permissions=Permissions.roles(role="test", read=True), ) + client.users.db.delete(user_id=names) client.users.db.create(user_id=names) client.users.db.assign_roles(user_id=names, role_names=names) @@ -738,6 +739,13 @@ def test_get_assigned_users_db(client_factory: ClientFactory, request: SubReques assert assigned_users[0].user_id == names assert assigned_users[0].user_type == UserTypes.DB_DYNAMIC + # An OIDC user with the same id keeps the role when the db user's is revoked. + client.users.oidc.assign_roles(user_id=names, role_names=names) + client.users.db.revoke_roles(user_id=names, role_names=names) + assigned_users = client.roles.get_user_assignments(names) + assert len(assigned_users) == 1 + assert assigned_users[0].user_type == UserTypes.OIDC + client.roles.delete(names) client.users.db.delete(user_id=names) diff --git a/weaviate/users/base.py b/weaviate/users/base.py index 21692e757..2fac9715f 100644 --- a/weaviate/users/base.py +++ b/weaviate/users/base.py @@ -119,7 +119,7 @@ def resp(res: Response) -> None: response_callback=resp, method=self._connection.post, path=path, - weaviate_object={"roles": roles}, + weaviate_object=payload, error_msg=f"Could not revoke roles {roles} from user {user_id}", status_codes=_ExpectedStatusCodes(ok_in=[200], error="Revoke roles from user"), )