Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-02 16:27:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename OAuth2/OIDC ClientAuthenticationToken -> AuthorizedClient

Browse Source 
Fixes gh-4695
This commit is contained in:
Joe Grandja
2017-10-25 12:20:31 -04:00
parent 9b670882b7
commit 5a584e5ccb
14 changed files with 117 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/boot/oauth2login/src/main/java/sample/web/MainController.java
+3 -3
View File
@@ -40,14 +40,14 @@ public class MainController {
@RequestMapping("/")
public String index(Model model, @AuthenticationPrincipal OAuth2User user, OAuth2AuthenticationToken authentication) {
model.addAttribute("userName", user.getName());
model.addAttribute("clientName", authentication.getClientAuthentication().getClientRegistration().getClientName());
model.addAttribute("clientName", authentication.getAuthorizedClient().getClientRegistration().getClientName());
return "index";
}
@RequestMapping("/userinfo")
public String userinfo(Model model, OAuth2AuthenticationToken authentication) {
Map userAttributes = Collections.emptyMap();
String userInfoEndpointUri = authentication.getClientAuthentication().getClientRegistration()
String userInfoEndpointUri = authentication.getAuthorizedClient().getClientRegistration()
.getProviderDetails().getUserInfoEndpoint().getUri();
if (!StringUtils.isEmpty(userInfoEndpointUri)) { // userInfoEndpointUri is optional for OIDC Clients
userAttributes = WebClient.builder()
@@ -67,7 +67,7 @@ public class MainController {
return ExchangeFilterFunction.ofRequestProcessor(
clientRequest -> {
ClientRequest authorizedRequest = ClientRequest.from(clientRequest)
.header(HttpHeaders.AUTHORIZATION, "Bearer " + authentication.getClientAuthentication().getAccessToken().getTokenValue())
.header(HttpHeaders.AUTHORIZATION, "Bearer " + authentication.getAuthorizedClient().getAccessToken().getTokenValue())
.build();
return Mono.just(authorizedRequest);
});