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

Set clientId if it is not set in the entity

Browse Source 
Closes #32195

Signed-off-by: Michal Hajas <mhajas@redhat.com>
(cherry picked from commit 6a9245546e92a05c00410a8d7ac5897f3261a116)
This commit is contained in:
Michal Hajas 2024-08-16 12:57:07 +02:00 committed by Alexander Schwartz
parent 9bd5075caa
commit db95afd73c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/PersistentUserSessionProvider.java
View File

@ -1017,9 +1017,13 @@ public class PersistentUserSessionProvider implements UserSessionProvider, Sessi
// ignoring old and unknown realm found in the session
return;
}
sessionEntityWrapper.getEntity().getAuthenticatedClientSessions().forEach((k, uuid) -> {
sessionEntityWrapper.getEntity().getAuthenticatedClientSessions().forEach((clientId, uuid) -> {
SessionEntityWrapper<AuthenticatedClientSessionEntity> clientSession = clientSessionCache.get(uuid);
if (clientSession != null) {
// This is necessary because client sessions created by a KC version < 22 do not have clientId set within the entity.
if (clientSession.getEntity().getClientId() == null) {
clientSession.getEntity().setClientId(clientId);
}
clientSession.getEntity().setUserSessionId(sessionEntityWrapper.getEntity().getId());
MergedUpdate<AuthenticatedClientSessionEntity> merged = MergedUpdate.computeUpdate(Collections.singletonList(Tasks.addIfAbsentSync()), clientSession, 1, 1);
clientSessionPerformer.registerChange(Map.entry(uuid, new SessionUpdatesList<>(realm, clientSession)), merged);