Make 'azure-spring-boot-sample-active-directory-backend-v2' work well in new aad implementation. (Azure#17821)

* Make 'azure-spring-boot-sample-active-directory-backend' and 'xxx-backedn-v2' work well in new aad implementation.

Author: Rujun Chen

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend-v2/src/main/java/com/azure/spring/sample/aad/controller/HomeController.java

@@ -3,10 +3,9 @@
 
 package com.azure.spring.sample.aad.controller;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
-import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.annotation.RegisteredOAuth2AuthorizedClient;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -15,8 +14,6 @@
 
 @Controller
 public class HomeController {
-    @Autowired
-    private OAuth2AuthorizedClientService authorizedClientService;
 
     @GetMapping("group1")
     @ResponseBody
@@ -33,11 +30,11 @@ public String group2() {
     }
 
     @GetMapping("/")
-    public String index(Model model, OAuth2AuthenticationToken authentication) {
-        final OAuth2AuthorizedClient authorizedClient =
-                this.authorizedClientService.loadAuthorizedClient(
-                        authentication.getAuthorizedClientRegistrationId(),
-                        authentication.getName());
+    public String index(
+        Model model,
+        OAuth2AuthenticationToken authentication,
+        @RegisteredOAuth2AuthorizedClient OAuth2AuthorizedClient authorizedClient
+    ) {
         model.addAttribute("userName", authentication.getName());
         model.addAttribute("clientName", authorizedClient.getClientRegistration().getClientName());
         return "index";

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend/src/main/java/com/azure/spring/sample/aad/controller/HomeController.java

@@ -3,11 +3,10 @@
 
 package com.azure.spring.sample.aad.controller;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
-import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.annotation.RegisteredOAuth2AuthorizedClient;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -17,8 +16,6 @@
 @ConditionalOnProperty(prefix = "azure.activedirectory", value = "tenant-id")
 @Controller
 public class HomeController {
-    @Autowired
-    private OAuth2AuthorizedClientService authorizedClientService;
 
     @GetMapping("group1")
     @ResponseBody
@@ -35,11 +32,11 @@ public String group2() {
     }
 
     @GetMapping("/")
-    public String index(Model model, OAuth2AuthenticationToken authentication) {
-        final OAuth2AuthorizedClient authorizedClient =
-                this.authorizedClientService.loadAuthorizedClient(
-                        authentication.getAuthorizedClientRegistrationId(),
-                        authentication.getName());
+    public String index(
+        Model model,
+        OAuth2AuthenticationToken authentication,
+        @RegisteredOAuth2AuthorizedClient OAuth2AuthorizedClient authorizedClient
+    ) {
         model.addAttribute("userName", authentication.getName());
         model.addAttribute("clientName", authorizedClient.getClientRegistration().getClientName());
         return "index";