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

Introduce count method to avoid fetching all organization upon checking for existence

Browse source 
Closes #29697

Signed-off-by: Martin Kanis <mkanis@redhat.com>
This commit is contained in:
Martin Kanis 2024-06-04 14:49:35 +02:00 committed by Pedro Igor
parent 2b97859bca
commit 33331788a4
5 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
model/jpa/src/main/java/org/keycloak/models/jpa/entities/OrganizationEntity.java
View file

@ -42,7 +42,8 @@ import jakarta.persistence.Table;
@NamedQuery(name="getByNameOrDomain", query="select distinct o from OrganizationEntity o inner join OrganizationDomainEntity d ON o.id = d.organization.id" +
" where o.realmId = :realmId AND (o.name = :search OR d.name = :search) order by o.name ASC"),
@NamedQuery(name="getByNameOrDomainContained", query="select distinct o from OrganizationEntity o inner join OrganizationDomainEntity d ON o.id = d.organization.id" +
" where o.realmId = :realmId AND (lower(o.name) like concat('%',:search,'%') OR d.name like concat('%',:search,'%')) order by o.name ASC")
" where o.realmId = :realmId AND (lower(o.name) like concat('%',:search,'%') OR d.name like concat('%',:search,'%')) order by o.name ASC"),
@NamedQuery(name="getCount", query="select count(o) from OrganizationEntity o where o.realmId = :realmId")
})
public class OrganizationEntity {

12
model/jpa/src/main/java/org/keycloak/organization/jpa/JpaOrganizationProvider.java
View file

@ -26,8 +26,6 @@ import static org.keycloak.utils.StreamsUtil.closing;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import jakarta.persistence.EntityManager;
@ -47,7 +45,6 @@ import org.keycloak.models.KeycloakSession;
import org.keycloak.models.ModelDuplicateException;
import org.keycloak.models.ModelException;
import org.keycloak.models.ModelValidationException;
import org.keycloak.models.OrganizationDomainModel;
import org.keycloak.models.OrganizationModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
@ -394,6 +391,15 @@ public class JpaOrganizationProvider implements OrganizationProvider {
return true;
}
@Override
public long count() {
TypedQuery<Long> query;
query = em.createNamedQuery("getCount", Long.class);
query.setParameter("realmId", realm.getId());
return query.getSingleResult();
}
@Override
public boolean isEnabled() {
return realm.isOrganizationsEnabled();

10
server-spi-private/src/main/java/org/keycloak/organization/OrganizationProvider.java
View file

@ -138,7 +138,7 @@ public interface OrganizationProvider extends Provider {
/**
* Associate the given {@link IdentityProviderModel} with the given {@link OrganizationModel}.
*
*
* @param organization the organization
* @param identityProvider the identityProvider
* @return {@code true} if the identityProvider was associated with the organization. Otherwise, returns {@code false}
@ -153,7 +153,7 @@ public interface OrganizationProvider extends Provider {
/**
* Removes the link between the given {@link OrganizationModel} and identity provider associated with it if such a link exists.
*
*
* @param organization the organization
* @param identityProvider the identity provider
* @return {@code true} if the link was removed, {@code false} otherwise
@ -197,4 +197,10 @@ public interface OrganizationProvider extends Provider {
* @return {@code true} if the given {@code member} is a member and was successfully removed from the organization. Otherwise, returns {@code false}
*/
boolean removeMember(OrganizationModel organization, UserModel member);
/**
* Returns number of organizations in the realm.
* @return long Number of organizations
*/
long count();
}

5
services/src/main/java/org/keycloak/organization/utils/Organizations.java
View file

@ -130,9 +130,8 @@ public class Organizations {
};
}
public static boolean isEnabledAndOrganizationsPresent(OrganizationProvider provider) {
// todo replace getAllStream().findAny().isPresent() with count query
return provider != null && provider.isEnabled() && provider.getAllStream().findAny().isPresent();
public static boolean isEnabledAndOrganizationsPresent(OrganizationProvider orgProvider) {
return orgProvider != null && orgProvider.isEnabled() && orgProvider.count() != 0;
}
public static void checkEnabled(OrganizationProvider provider) {

14
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationTest.java
View file

@ -47,11 +47,13 @@ import org.keycloak.admin.client.resource.OrganizationResource;
import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.common.Profile.Feature;
import org.keycloak.models.utils.KeycloakModelUtils;
import org.keycloak.organization.OrganizationProvider;
import org.keycloak.representations.idm.IdentityProviderRepresentation;
import org.keycloak.representations.idm.OrganizationDomainRepresentation;
import org.keycloak.representations.idm.OrganizationRepresentation;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.testsuite.arquillian.annotation.EnableFeature;
import org.keycloak.testsuite.runonserver.RunOnServer;
import org.keycloak.testsuite.updaters.RealmAttributeUpdater;
import org.keycloak.testsuite.util.RealmBuilder;
@ -447,4 +449,16 @@ public class OrganizationTest extends AbstractOrganizationTest {
realmRes.remove();
}
}
@Test
public void testCount() {
for (int i = 0; i < 10; i++) {
createOrganization("kc.org." + i);
}
getTestingClient().server(TEST_REALM_NAME).run((RunOnServer) session -> {
OrganizationProvider orgProvider = session.getProvider(OrganizationProvider.class);
assertEquals(10, orgProvider.count());
});
}
}