upstream/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-05-28 04:13:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: switching default client scopes to lazy loading (#38553)

Browse source 
closes: #38552

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
This commit is contained in:
Steven Hawkins 2025-04-03 08:11:59 -04:00 committed by GitHub
parent 999d9aa75b
commit 9ce4539d22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmAdapter.java vendored
View file

@ -1610,7 +1610,7 @@ public class RealmAdapter implements CachedRealmModel {
@Override
public Stream<ClientScopeModel> getDefaultClientScopesStream(boolean defaultScope) {
if (isUpdated()) return updated.getDefaultClientScopesStream(defaultScope);
List<String> clientScopeIds = defaultScope ? cached.getDefaultDefaultClientScopes() : cached.getOptionalDefaultClientScopes();
List<String> clientScopeIds = defaultScope ? cached.getDefaultDefaultClientScopes(modelSupplier) : cached.getOptionalDefaultClientScopes(modelSupplier);
return clientScopeIds.stream()
.map(scope -> cacheSession.getClientScopeById(this, scope))
.filter(Objects::nonNull);

24
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java vendored
View file

@ -165,8 +165,8 @@ public class CachedRealm extends AbstractExtendableRevisioned {
private boolean allowUserManagedAccess;
protected List<String> defaultGroups;
protected List<String> defaultDefaultClientScopes = new LinkedList<>();
protected List<String> optionalDefaultClientScopes = new LinkedList<>();
protected DefaultLazyLoader<RealmModel, List<String>> defaultDefaultClientScopes;
protected DefaultLazyLoader<RealmModel, List<String>> optionalDefaultClientScopes;
protected boolean internationalizationEnabled;
protected Set<String> supportedLocales;
protected String defaultLocale;
@ -268,7 +268,10 @@ public class CachedRealm extends AbstractExtendableRevisioned {
ClientModel masterAdminClient = model.getMasterAdminClient();
this.masterAdminClient = (masterAdminClient != null) ? masterAdminClient.getId() : null;
cacheClientScopes(model);
defaultDefaultClientScopes = new DefaultLazyLoader<>(realm -> realm.getDefaultClientScopesStream(true).map(ClientScopeModel::getId)
.collect(Collectors.toList()), null);
optionalDefaultClientScopes = new DefaultLazyLoader<>(realm -> realm.getDefaultClientScopesStream(false).map(ClientScopeModel::getId)
.collect(Collectors.toList()), null);
internationalizationEnabled = model.isInternationalizationEnabled();
supportedLocales = model.getSupportedLocalesStream().collect(Collectors.toSet());
@ -326,13 +329,6 @@ public class CachedRealm extends AbstractExtendableRevisioned {
realmLocalizationTexts = model.getRealmLocalizationTexts();
}
protected void cacheClientScopes(RealmModel model) {
defaultDefaultClientScopes = model.getDefaultClientScopesStream(true).map(ClientScopeModel::getId)
.collect(Collectors.toList());
optionalDefaultClientScopes = model.getDefaultClientScopesStream(false).map(ClientScopeModel::getId)
.collect(Collectors.toList());
}
public String getMasterAdminClient() {
return masterAdminClient;
}
@ -706,12 +702,12 @@ public class CachedRealm extends AbstractExtendableRevisioned {
return defaultGroups;
}
public List<String> getDefaultDefaultClientScopes() {
return defaultDefaultClientScopes;
public List<String> getDefaultDefaultClientScopes(Supplier<RealmModel> modelSupplier) {
return defaultDefaultClientScopes.get(modelSupplier);
}
public List<String> getOptionalDefaultClientScopes() {
return optionalDefaultClientScopes;
public List<String> getOptionalDefaultClientScopes(Supplier<RealmModel> modelSupplier) {
return optionalDefaultClientScopes.get(modelSupplier);
}
public List<AuthenticationFlowModel> getAuthenticationFlowList() {