Skip to content

[pull] main from spring-projects:main #718

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

Merged
pull merged 1 commit into from
Jun 13, 2026
+16 −0
Merged

[pull] main from spring-projects:main #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .../resource/autoconfigure/reactive/ReactiveOpaqueTokenIntrospectionClientConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.springframework.boot.security.oauth2.server.resource.autoconfigure.reactive;

import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.security.oauth2.server.resource.autoconfigure.OAuth2ResourceServerProperties;
Expand All @@ -25,6 +26,7 @@
import org.springframework.security.oauth2.server.resource.introspection.ReactiveOpaqueTokenIntrospector;
import org.springframework.security.oauth2.server.resource.introspection.SpringReactiveOpaqueTokenIntrospector;
import org.springframework.util.Assert;
import org.springframework.web.reactive.function.client.WebClient;

/**
* Configures an {@link ReactiveOpaqueTokenIntrospector} when a token introspection
Expand All @@ -34,6 +36,7 @@
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(ReactiveOpaqueTokenIntrospector.class)
@ConditionalOnClass(WebClient.class)
class ReactiveOpaqueTokenIntrospectionClientConfiguration {

@Bean
Expand Down
13 changes: 13 additions & 0 deletions ...r/resource/autoconfigure/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
import org.springframework.boot.testsupport.classpath.resources.WithResource;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down Expand Up @@ -431,6 +432,18 @@ void autoConfigurationWhenIntrospectionUriAvailableShouldConfigureIntrospectionC
});
}

@Test
@ClassPathExclusions("spring-webflux-*.jar")
void withoutWebFluxWhenIntrospectionUriIsAvailableNoTokenIntrospectorIsConfigured() {
new ReactiveWebApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ReactiveOAuth2ResourceServerAutoConfiguration.class))
.withPropertyValues(
"spring.security.oauth2.resourceserver.opaquetoken.introspection-uri=https://check-token.com",
"spring.security.oauth2.resourceserver.opaquetoken.client-id=my-client-id",
"spring.security.oauth2.resourceserver.opaquetoken.client-secret=my-client-secret")
.run((context) -> assertThat(context).doesNotHaveBean(ReactiveOpaqueTokenIntrospector.class));
}

private void assertSpringReactiveOpaqueTokenIntrospectorBuilderCustomization(
AssertableReactiveWebApplicationContext context) {
SpringReactiveOpaqueTokenIntrospectorBuilderCustomizer customizer = context.getBean(
Expand Down
Loading