Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-05 17:57:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename @OAuth2Client to @RegisteredOAuth2AuthorizedClient

Browse Source 
Fixes gh-5360
This commit is contained in:
Joe Grandja
2018-06-08 17:33:21 -04:00
parent 81a73e1f55
commit 4fc6d96073
12 changed files with 94 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/boot/authcodegrant/src/main/java/sample/web/GitHubReposController.java
+2 -2
View File
@@ -16,7 +16,7 @@
package sample.web;
import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
import org.springframework.security.oauth2.client.annotation.OAuth2Client;
import org.springframework.security.oauth2.client.annotation.RegisteredOAuth2AuthorizedClient;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
@@ -44,7 +44,7 @@ public class GitHubReposController {
}
@GetMapping("/repos")
public String gitHubRepos(Model model, @OAuth2Client("github") OAuth2AuthorizedClient authorizedClient) {
public String gitHubRepos(Model model, @RegisteredOAuth2AuthorizedClient("github") OAuth2AuthorizedClient authorizedClient) {
String endpointUri = "https://api.github.com/user/repos";
List repos = this.webClient
.get()
samples/boot/oauth2login-webflux/src/main/java/sample/web/OAuth2LoginController.java
+2 -2
View File
@@ -18,7 +18,7 @@ package sample.web;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
import org.springframework.security.oauth2.client.annotation.OAuth2Client;
import org.springframework.security.oauth2.client.annotation.RegisteredOAuth2AuthorizedClient;
import org.springframework.security.oauth2.core.user.OAuth2User;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -32,7 +32,7 @@ public class OAuth2LoginController {
@GetMapping("/")
public String index(Model model,
@OAuth2Client OAuth2AuthorizedClient authorizedClient,
@RegisteredOAuth2AuthorizedClient OAuth2AuthorizedClient authorizedClient,
@AuthenticationPrincipal OAuth2User oauth2User) {
model.addAttribute("userName", oauth2User.getName());
model.addAttribute("clientName", authorizedClient.getClientRegistration().getClientName());
samples/boot/oauth2login/src/main/java/sample/web/OAuth2LoginController.java
+2 -2
View File
@@ -17,7 +17,7 @@ package sample.web;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
import org.springframework.security.oauth2.client.annotation.OAuth2Client;
import org.springframework.security.oauth2.client.annotation.RegisteredOAuth2AuthorizedClient;
import org.springframework.security.oauth2.core.user.OAuth2User;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -32,7 +32,7 @@ public class OAuth2LoginController {
@GetMapping("/")
public String index(Model model,
@OAuth2Client OAuth2AuthorizedClient authorizedClient,
@RegisteredOAuth2AuthorizedClient OAuth2AuthorizedClient authorizedClient,
@AuthenticationPrincipal OAuth2User oauth2User) {
model.addAttribute("userName", oauth2User.getName());
model.addAttribute("clientName", authorizedClient.getClientRegistration().getClientName());