Skip to content

Persist client session note removals with persistent user sessions (#52038 26.6 Backport) - #52081

Merged
ahus1 merged 2 commits into
keycloak:release/26.6from
thomasdarimont:backport-52039-26.6
Aug 26, 2026
Merged

ahus1 merged 2 commits into
keycloak:release/26.6from
thomasdarimont:backport-52039-26.6

Conversation

@thomasdarimont

Copy link
Copy Markdown
Contributor

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

26.6 backport of #52039

Fixes #52038

Note that I needed to adapt the SessionNotePersistenceTest to use the 26.6 state of the test-framework.

JpaChangesPerformer replayed update tasks against a synthetic notes map that only forwarded
get/put (client sessions) or get/put/remove/clear (user sessions) to the persisted model,
so AuthenticatedClientSessionModel#removeNote and restartClientSession() never reached the database.

Both merges now run the tasks the map directly.

Fixes keycloak#52038

Signed-off-by: Thomas Darimont <thomas.darimont@googlemail.com>
Signed-off-by: Alexander Schwartz <alexander.schwartz@ibm.com>
Signed-off-by: Alexander Schwartz <alexander.schwartz@gmx.net>
Co-authored-by: Alexander Schwartz <alexander.schwartz@ibm.com>
Co-authored-by: Alexander Schwartz <alexander.schwartz@gmx.net>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
(cherry picked from commit b333c0f)
Signed-off-by: Alexander Schwartz <alexander.schwartz@ibm.com>
@ahus1
ahus1 enabled auto-merge (squash) August 26, 2026 18:42
@ahus1
ahus1 merged commit 60cb15e into keycloak:release/26.6 Aug 26, 2026
83 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants