Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-31 17:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

WebClient.exchange->exchangeToMono

Browse Source 
Closes gh-17057
This commit is contained in:
Rob Winch 2025-05-06 11:41:34 -05:00
parent 5704582c52
commit 2dbf3a2d18
No known key found for this signature in database
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/NimbusReactiveOpaqueTokenIntrospector.java
View File

@ -98,9 +98,8 @@ public class NimbusReactiveOpaqueTokenIntrospector implements ReactiveOpaqueToke
@Override @Override
public Mono<OAuth2AuthenticatedPrincipal> introspect(String token) { public Mono<OAuth2AuthenticatedPrincipal> introspect(String token) {
// @formatter:off // @formatter:off
return Mono.just(token) return this.makeRequest(token)
.flatMap(this::makeRequest) .exchangeToMono(this::adaptToNimbusResponse)
.flatMap(this::adaptToNimbusResponse)
.map(this::parseNimbusResponse) .map(this::parseNimbusResponse)
.map(this::castToNimbusSuccess) .map(this::castToNimbusSuccess)
.doOnNext((response) -> validate(token, response)) .doOnNext((response) -> validate(token, response))
@ -109,13 +108,12 @@ public class NimbusReactiveOpaqueTokenIntrospector implements ReactiveOpaqueToke
// @formatter:on // @formatter:on
} }
private Mono<ClientResponse> makeRequest(String token) { private WebClient.RequestHeadersSpec<?> makeRequest(String token) {
// @formatter:off // @formatter:off
return this.webClient.post() return this.webClient.post()
.uri(this.introspectionUri) .uri(this.introspectionUri)
.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE) .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE)
.body(BodyInserters.fromFormData("token", token)) .body(BodyInserters.fromFormData("token", token));
.exchange();
// @formatter:on // @formatter:on
} }

13
oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/introspection/NimbusReactiveOpaqueTokenIntrospectorTests.java
View File

@ -23,6 +23,7 @@ import java.util.Base64;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.function.Function;
import net.minidev.json.JSONObject; import net.minidev.json.JSONObject;
import okhttp3.mockwebserver.Dispatcher; import okhttp3.mockwebserver.Dispatcher;
@ -45,6 +46,7 @@ import org.springframework.web.reactive.function.client.WebClient;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
@ -265,6 +267,7 @@ public class NimbusReactiveOpaqueTokenIntrospectorTests {
} }
private WebClient mockResponse(String response, String mediaType) { private WebClient mockResponse(String response, String mediaType) {
WebClient.ResponseSpec responseSpec = mock(WebClient.ResponseSpec.class);
WebClient real = WebClient.builder().build(); WebClient real = WebClient.builder().build();
WebClient.RequestBodyUriSpec spec = spy(real.post()); WebClient.RequestBodyUriSpec spec = spy(real.post());
WebClient webClient = spy(WebClient.class); WebClient webClient = spy(WebClient.class);
@ -275,7 +278,13 @@ public class NimbusReactiveOpaqueTokenIntrospectorTests {
ClientResponse.Headers headers = mock(ClientResponse.Headers.class); ClientResponse.Headers headers = mock(ClientResponse.Headers.class);
given(headers.contentType()).willReturn(Optional.ofNullable(mediaType).map(MediaType::parseMediaType)); given(headers.contentType()).willReturn(Optional.ofNullable(mediaType).map(MediaType::parseMediaType));
given(clientResponse.headers()).willReturn(headers); given(clientResponse.headers()).willReturn(headers);
given(spec.exchange()).willReturn(Mono.just(clientResponse)); given(responseSpec.bodyToMono(ClientResponse.class)).willReturn(Mono.just(clientResponse));
given(spec.exchangeToMono(any())).willAnswer((invocation) -> {
Object[] args = invocation.getArguments();
Function<ClientResponse, Mono<ClientResponse>> fn = (Function<ClientResponse, Mono<ClientResponse>>) args[0];
return fn.apply(clientResponse);
});
given(spec.retrieve()).willReturn(responseSpec);
return webClient; return webClient;
} }
@ -284,7 +293,7 @@ public class NimbusReactiveOpaqueTokenIntrospectorTests {
WebClient.RequestBodyUriSpec spec = spy(real.post()); WebClient.RequestBodyUriSpec spec = spy(real.post());
WebClient webClient = spy(WebClient.class); WebClient webClient = spy(WebClient.class);
given(webClient.post()).willReturn(spec); given(webClient.post()).willReturn(spec);
given(spec.exchange()).willThrow(ex); given(spec.exchangeToMono(any())).willReturn(Mono.error(ex));
return webClient; return webClient;
} }

2
oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/introspection/SpringReactiveOpaqueTokenIntrospectorTests.java
View File

@ -345,7 +345,7 @@ public class SpringReactiveOpaqueTokenIntrospectorTests {
WebClient.RequestBodyUriSpec spec = spy(real.post()); WebClient.RequestBodyUriSpec spec = spy(real.post());
WebClient webClient = spy(WebClient.class); WebClient webClient = spy(WebClient.class);
given(webClient.post()).willReturn(spec); given(webClient.post()).willReturn(spec);
given(spec.exchange()).willThrow(ex); given(spec.exchangeToMono(any())).willThrow(ex);
return webClient; return webClient;
} }