Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-06 10:18:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add WebClient Bearer token support

Browse Source 
Fixes: gh-5389
This commit is contained in:
Rob Winch
2018-05-25 15:17:08 -05:00
parent ecf6caa896
commit b3ca598679
4 changed files with 95 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserService.java
+3 -2
View File
@@ -16,6 +16,8 @@
package org.springframework.security.oauth2.client.userinfo;
import static org.springframework.security.web.http.SecurityHeaders.bearerToken;
import java.net.UnknownHostException;
import java.util.HashSet;
import java.util.Map;
@@ -99,8 +101,7 @@ public class DefaultReactiveOAuth2UserService implements ReactiveOAuth2UserServi
Mono<Map<String, Object>> userAttributes = this.webClient.get()
.uri(userInfoUri)
.header(HttpHeaders.AUTHORIZATION,
"Bearer " + userRequest.getAccessToken().getTokenValue())
.headers(bearerToken(userRequest.getAccessToken().getTokenValue()))
.retrieve()
.onStatus(s -> s != HttpStatus.OK, response -> {
return parse(response).map(userInfoErrorResponse -> {
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/OAuth2AuthorizedClientExchangeFilterFunction.java
+7 -9
View File
@@ -16,17 +16,19 @@
package org.springframework.security.oauth2.client.web.reactive.function.client;
import org.springframework.http.HttpHeaders;
import static org.springframework.security.web.http.SecurityHeaders.bearerToken;
import java.util.Map;
import java.util.Optional;
import java.util.function.Consumer;
import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
import org.springframework.web.reactive.function.client.ClientRequest;
import org.springframework.web.reactive.function.client.ClientResponse;
import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
import org.springframework.web.reactive.function.client.ExchangeFunction;
import reactor.core.publisher.Mono;
import java.util.Map;
import java.util.Optional;
import java.util.function.Consumer;
import reactor.core.publisher.Mono;
/**
* Provides an easy mechanism for using an {@link OAuth2AuthorizedClient} to make OAuth2 requests by including the
@@ -77,8 +79,4 @@ public final class OAuth2AuthorizedClientExchangeFilterFunction implements Excha
.headers(bearerToken(authorizedClient.getAccessToken().getTokenValue()))
.build();
}
private Consumer<HttpHeaders> bearerToken(String token) {
return headers -> headers.set(HttpHeaders.AUTHORIZATION, "Bearer " + token);
}
}