Allow duplicates in the TokenManager map as before#51029
Merged
Conversation
Closes keycloak#50882 Signed-off-by: rmartinc <rmartinc@redhat.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Prevents a 500 error when the default organization scope is also explicitly requested.
Changes:
- Retains the first client scope when duplicate names occur.
- Adds regression coverage for default and explicitly requested organization scopes.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
services/.../TokenManager.java |
Handles duplicate scope names during map collection. |
tests/.../OrganizationAuthenticationTest.java |
Verifies successful login with duplicate organization scope sources. |
Unreported flaky test detectedIf the flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR. org.keycloak.testsuite.forms.BrowserFlowTest#testUserWithOneAdditionalFactorOtpSuccessorg.keycloak.testsuite.forms.MultipleTabsLoginTest#multipleTabsParallelLoginTestWithAuthSessionExpiredAndRegisterClickKeycloak CI - Forms IT (firefox) |
mabartos
approved these changes
Jul 20, 2026
ahus1
approved these changes
Jul 20, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #50882
When changing the set of the client scope names to a map I didn't consider there could be duplicated scopes. Organization is special and can be returned twice. Test added.