Skip to content

Add authenticationConverter to SpringOpaqueTokenIntrospector Builders #18625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
itsmevichu wants to merge 2 commits into
base: main
Choose a base branch
from
+48 −2
Open

Add authenticationConverter to SpringOpaqueTokenIntrospector Builders #18625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c010287
Closes gh-18623
itsmevichu Jan 31, 2026
bdffbb0
Add temp since version to javadocs
itsmevichu Feb 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion ...ramework/security/oauth2/server/resource/introspection/SpringOpaqueTokenIntrospector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,8 @@ public static final class Builder {

private String clientSecret;

private Converter<OAuth2TokenIntrospectionClaimAccessor, ? extends OAuth2AuthenticatedPrincipal> authenticationConverter;

private Builder(String introspectionUri) {
this.introspectionUri = introspectionUri;
}
Expand Down Expand Up @@ -355,6 +357,22 @@ public Builder clientSecret(String clientSecret) {
return this;
}

/**
* Sets the {@link Converter} used for converting the
* {@link OAuth2TokenIntrospectionClaimAccessor} to an
* {@link OAuth2AuthenticatedPrincipal}.
* @param authenticationConverter the {@link Converter} used for converting to an
* {@link OAuth2AuthenticatedPrincipal}
* @return the {@link SpringOpaqueTokenIntrospector.Builder}
* @since 7.x.x
*/
public Builder authenticationConverter(
Converter<OAuth2TokenIntrospectionClaimAccessor, ? extends OAuth2AuthenticatedPrincipal> authenticationConverter) {
Assert.notNull(authenticationConverter, "authenticationConverter cannot be null");
this.authenticationConverter = authenticationConverter;
return this;
}

/**
* Creates a {@code SpringOpaqueTokenIntrospector}
* @return the {@link SpringOpaqueTokenIntrospector}
Expand All @@ -363,7 +381,12 @@ public Builder clientSecret(String clientSecret) {
public SpringOpaqueTokenIntrospector build() {
RestTemplate restTemplate = new RestTemplate();
restTemplate.getInterceptors().add(new BasicAuthenticationInterceptor(this.clientId, this.clientSecret));
return new SpringOpaqueTokenIntrospector(this.introspectionUri, restTemplate);
SpringOpaqueTokenIntrospector introspector = new SpringOpaqueTokenIntrospector(this.introspectionUri,
restTemplate);
if (this.authenticationConverter != null) {
introspector.setAuthenticationConverter(this.authenticationConverter);
}
return introspector;
}

}
Expand Down
25 changes: 24 additions & 1 deletion .../security/oauth2/server/resource/introspection/SpringReactiveOpaqueTokenIntrospector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ public static final class Builder {

private String clientSecret;

private Converter<OAuth2TokenIntrospectionClaimAccessor, Mono<? extends OAuth2AuthenticatedPrincipal>> authenticationConverter;

private Builder(String introspectionUri) {
this.introspectionUri = introspectionUri;
}
Expand Down Expand Up @@ -308,6 +310,22 @@ public Builder clientSecret(String clientSecret) {
return this;
}

/**
* Sets the {@link Converter} used for converting the
* {@link OAuth2TokenIntrospectionClaimAccessor} to an
* {@link OAuth2AuthenticatedPrincipal}.
* @param authenticationConverter the {@link Converter} used for converting to an
* {@link OAuth2AuthenticatedPrincipal}
* @return the {@link SpringReactiveOpaqueTokenIntrospector.Builder}
* @since 7.x.x
*/
public Builder authenticationConverter(
Converter<OAuth2TokenIntrospectionClaimAccessor, Mono<? extends OAuth2AuthenticatedPrincipal>> authenticationConverter) {
Assert.notNull(authenticationConverter, "authenticationConverter cannot be null");
this.authenticationConverter = authenticationConverter;
return this;
}

/**
* Creates a {@code SpringReactiveOpaqueTokenIntrospector}
* @return the {@link SpringReactiveOpaqueTokenIntrospector}
Expand All @@ -317,7 +335,12 @@ public SpringReactiveOpaqueTokenIntrospector build() {
WebClient webClient = WebClient.builder()
.defaultHeaders((h) -> h.setBasicAuth(this.clientId, this.clientSecret))
.build();
return new SpringReactiveOpaqueTokenIntrospector(this.introspectionUri, webClient);
SpringReactiveOpaqueTokenIntrospector introspector = new SpringReactiveOpaqueTokenIntrospector(
this.introspectionUri, webClient);
if (this.authenticationConverter != null) {
introspector.setAuthenticationConverter(this.authenticationConverter);
}
return introspector;
}

}
Expand Down
Loading