External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-09 23:12:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Allow searching for multiple users by their ids. Closes #12025.

Browse Source 
Signed-off-by: maxhov <14804474+maxhov@users.noreply.github.com>
This commit is contained in:
maxhov 2025-03-07 10:10:11 +01:00 committed by Pedro Igor
parent db6516c291
commit 9654210402
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
View File

@ -16,6 +16,7 @@
*/
package org.keycloak.services.resources.admin;
import java.util.Arrays;
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
import org.eclipse.microprofile.openapi.annotations.extensions.Extension;
@ -299,13 +300,10 @@ public class UsersResource {
Stream<UserModel> userModels = Stream.empty();
if (search != null) {
if (search.startsWith(SEARCH_ID_PARAMETER)) {
UserModel userModel =
session.users().getUserById(realm, search.substring(SEARCH_ID_PARAMETER.length()).trim());
if (userModel != null) {
userModels = Stream.of(userModel);
if (AdminPermissionsSchema.SCHEMA.isAdminPermissionsEnabled(realm)) {
userModels = userModels.filter(userPermissionEvaluator::canView);
}
String[] userIds = search.substring(SEARCH_ID_PARAMETER.length()).trim().split("\\s+");
userModels = Arrays.stream(userIds).map(id -> session.users().getUserById(realm, id)).filter(Objects::nonNull);
if (AdminPermissionsSchema.SCHEMA.isAdminPermissionsEnabled(realm)) {
userModels = userModels.filter(userPermissionEvaluator::canView);
}
} else {
Map<String, String> attributes = new HashMap<>();

16
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java
View File

@ -1264,7 +1264,8 @@ public class UserTest extends AbstractAdminTest {
@Test
public void searchById() {
String expectedUserId = createUsers().get(0);
List<String> userIds = createUsers();
String expectedUserId = userIds.get(0);
List<UserRepresentation> users = realm.users().search("id:" + expectedUserId, null, null);
assertEquals(1, users.size());
@ -1274,6 +1275,19 @@ public class UserTest extends AbstractAdminTest {
assertEquals(1, users.size());
assertEquals(expectedUserId, users.get(0).getId());
// Should allow searching for multiple users
String expectedUserId2 = userIds.get(1);
List<UserRepresentation> multipleUsers = realm.users().search(String.format("id:%s %s", expectedUserId, expectedUserId2), 0 , 10);;
assertThat(multipleUsers, hasSize(2));
assertThat(multipleUsers.get(0).getId(), is(expectedUserId));
assertThat(multipleUsers.get(1).getId(), is(expectedUserId2));
// Should take arbitrary amount of spaces in between ids
List<UserRepresentation> multipleUsers2 = realm.users().search(String.format("id: %s %s ", expectedUserId, expectedUserId2), 0 , 10);;
assertThat(multipleUsers2, hasSize(2));
assertThat(multipleUsers2.get(0).getId(), is(expectedUserId));
assertThat(multipleUsers2.get(1).getId(), is(expectedUserId2));
}
@Test