Refactor OIDC protocol mapper creation to use a type-safe builder pattern#50974
Draft
mabartos wants to merge 1 commit into
Draft
Refactor OIDC protocol mapper creation to use a type-safe builder pattern#50974mabartos wants to merge 1 commit into
mabartos wants to merge 1 commit into
Conversation
mabartos
marked this pull request as ready for review
July 20, 2026 10:35
Contributor
There was a problem hiding this comment.
Pull request overview
Introduces type-safe fluent builders for OIDC protocol mapper creation and migrates server and test callers away from positional factory methods.
Changes:
- Adds generic and OIDC-specific builder hierarchies with typed claim and inclusion enums.
- Adds mapper-specific builders and migrates built-in mapper creation.
- Updates tests and utilities to use the builder API.
Reviewed changes
Copilot reviewed 48 out of 48 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
testsuite/.../OrganizationOIDCProtocolMapperTest.java |
Migrates audience mapper setup. |
testsuite/.../OIDCAdvancedRequestParamsTest.java |
Migrates claims mapper setup. |
testsuite/.../NonceBackwardsCompatibleMapperTest.java |
Uses the nonce mapper builder. |
testsuite/.../TokenIntrospectionTest.java |
Migrates audience mapper setup. |
testsuite/.../TokenExchangeTestUtils.java |
Migrates token-exchange mappers. |
testsuite/.../StandardTokenExchangeV2Test.java |
Migrates claim and audience mappers. |
testsuite/.../ClientTokenExchangeSAML2Test.java |
Migrates session-note mappers. |
testsuite/.../OIDCProtocolMappersTest.java |
Migrates user-property mappers. |
testsuite/.../AccessTokenTest.java |
Migrates hardcoded claims. |
testsuite/.../LDAPMultipleAttributesTest.java |
Migrates LDAP attribute mappers. |
testsuite/.../AbstractKerberosSingleRealmTest.java |
Migrates Kerberos session-note mapper. |
testsuite/.../ClientPoliciesTest.java |
Migrates claims-value mapper. |
testsuite/.../OAuth2BrokerTest.java |
Migrates broker hardcoded claims. |
tests/utils-shared/.../ProtocolMapperUtil.java |
Reimplements mapper utilities with builders. |
tests/base/.../TokenExchangeDelegationTest.java |
Migrates parameterized property mapper. |
tests/base/.../StandardBaseTokenExchangeV2Test.java |
Migrates token-exchange mappers. |
tests/base/.../StandardBaseTokenExchangeClientPoliciesV2Test.java |
Migrates hardcoded claim setup. |
tests/base/.../ParameterizedScopesIsolationTest.java |
Migrates parameterized scope mapper. |
tests/base/.../ParameterizedScopeMapperTest.java |
Migrates parameterized mapper fixtures. |
tests/base/.../ClientIdMetadataDocumentTest.java |
Migrates audience mapper setup. |
tests/base/.../CredentialsTest.java |
Changes secret event assertion. |
tests/base/.../RealmAdminAccessTest.java |
Migrates role-related mappers. |
services/.../ProtocolMapperBuilder.java |
Adds the base mapper builder. |
services/.../OIDCLoginProtocolFactory.java |
Migrates built-in OIDC mapper creation. |
services/.../UserSessionNoteMapper.java |
Adds a session-note builder. |
services/.../UserRealmRoleMappingMapper.java |
Adds a realm-role builder. |
services/.../UserPropertyMapper.java |
Exposes the default OIDC builder. |
services/.../UserClientRoleMappingMapper.java |
Adds a client-role builder. |
services/.../UserAttributeMapper.java |
Adds an attribute mapper builder. |
services/.../SubMapper.java |
Exposes the default OIDC builder. |
services/.../SessionStateMapper.java |
Exposes the default OIDC builder. |
services/.../RoleNameMapper.java |
Adds a role-name builder. |
services/.../ParameterizedScopeUserPropertyMapper.java |
Adds a property mapper builder. |
services/.../ParameterizedScopeMapper.java |
Adds a parameterized scope builder. |
services/.../OIDCProtocolMapperBuilder.java |
Adds OIDC enums and fluent configuration. |
services/.../NonceBackwardsCompatibleMapper.java |
Adds a nonce mapper builder. |
services/.../HardcodedRole.java |
Adds a hardcoded-role builder. |
services/.../HardcodedClaim.java |
Adds a hardcoded-claim builder. |
services/.../GroupMembershipMapper.java |
Adds a group-membership builder. |
services/.../FullNameMapper.java |
Exposes the default OIDC builder. |
services/.../ClaimsParameterWithValueIdTokenMapper.java |
Adds a claims-value builder. |
services/.../ClaimsParameterTokenMapper.java |
Adds a claims-token builder. |
services/.../AudienceResolveProtocolMapper.java |
Adds an audience-resolution builder. |
services/.../AudienceProtocolMapper.java |
Adds an audience mapper builder. |
services/.../AmrProtocolMapper.java |
Exposes the default OIDC builder. |
services/.../AllowedWebOriginsProtocolMapper.java |
Adds a web-origins builder. |
services/.../AcrProtocolMapper.java |
Exposes the default OIDC builder. |
services/.../OrganizationMembershipMapper.java |
Adds an organization mapper builder. |
mabartos
marked this pull request as draft
July 20, 2026 13:01
…tern Closes keycloak#50973 Signed-off-by: Martin Bartoš <mabartos@redhat.com>
mabartos
force-pushed
the
refactor-protocol-mappers
branch
from
July 23, 2026 13:54
b1122cc to
c489d59
Compare
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 #50973