libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

KEYCLOAK-19148 correct getGroupsCountByNameContaining of MapGroupProvider

Browse source
This commit is contained in:
Konstantinos Georgilakis 2021-09-23 14:29:33 +03:00 committed by Hynek Mlnařík
parent ecd5dd248d
commit db0b36460f
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
model/map/src/main/java/org/keycloak/models/map/group/MapGroupProvider.java
View file

@ -128,11 +128,7 @@ public class MapGroupProvider implements GroupProvider {
@Override
public Long getGroupsCountByNameContaining(RealmModel realm, String search) {
DefaultModelCriteria<GroupModel> mcb = criteria();
mcb = mcb.compare(SearchableFields.REALM_ID, Operator.EQ, realm.getId())
.compare(SearchableFields.NAME, Operator.ILIKE, "%" + search + "%");
return tx.getCount(withCriteria(mcb));
return searchForGroupByNameStream(realm, search, null, null).count();
}
@Override

2
server-spi/src/main/java/org/keycloak/models/GroupProvider.java
View file

@ -124,7 +124,7 @@ public interface GroupProvider extends Provider, GroupLookupProvider {
Long getGroupsCount(RealmModel realm, Boolean onlyTopGroups);
/**
* Returns number of groups with the given string in name for the given realm.
* Returns the number of top level groups containing groups with the given string in name for the given realm.
*
* @param realm Realm.
* @param search Case insensitive string which will be searched for.

15
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java
View file

@ -18,6 +18,7 @@
package org.keycloak.testsuite.admin.group;
import com.google.common.collect.Comparators;
import org.hamcrest.Matchers;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
@ -62,6 +63,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.Response.Status;
import static org.hamcrest.Matchers.*;
@ -1117,6 +1120,18 @@ public class GroupTest extends AbstractGroupTest {
assertEquals(new Long(allGroups.size()), realm.groups().count(true).get("count"));
assertEquals(new Long(allGroups.size() + 1), realm.groups().count(false).get("count"));
//add another subgroup
GroupRepresentation level2Group2 = new GroupRepresentation();
level2Group2.setName("group111111");
realm.groups().group(firstGroupId).subGroup(level2Group2);
//search and count for group with string group11 -> return 2 top level group, group11 and group0 having subgroups group1111 and group111111
search = realm.groups().groups("group11",0,10);
assertEquals(2, search.size());
GroupRepresentation group0 = search.stream().filter(group -> "group0".equals(group.getName())).findAny().orElseGet(null);
assertNotNull(group0);
assertEquals(2,group0.getSubGroups().size());
assertThat(group0.getSubGroups().stream().map(GroupRepresentation::getName).collect(Collectors.toList()), Matchers.containsInAnyOrder("group1111", "group111111"));
assertEquals(new Long(search.size()), realm.groups().count("group11").get("count"));
}
@Test