Update samples

patch diff from Azure/azure-sdk-for-java#22717

Author: backwind1233

aad/azure-spring-boot-sample-active-directory-resource-server/src/main/java/com/azure/spring/sample/aad/controller/HomeController.java

@@ -17,7 +17,7 @@ public class HomeController {
     @ResponseBody
     @PreAuthorize("hasAuthority('SCOPE_WebApiB.ExampleScope')")
     public String file() {
-        return "Response from WebApiB.";
+        return "Response from webApiB.";
     }
 
     @GetMapping("/user")
@@ -27,4 +27,10 @@ public String user() {
         return "User read success.";
     }
 
+    @GetMapping("/webapiB/clientCredential")
+    @ResponseBody
+    public String clientCredential() {
+        return "Response from webApiB: clientCredential";
+    }
+
 }

aad/azure-spring-boot-sample-active-directory-webapp/src/main/java/com/azure/spring/sample/aad/controller/WebApiController.java

@@ -20,41 +20,55 @@
 public class WebApiController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(WebApiController.class);
-
-    private static final String CUSTOM_LOCAL_FILE_ENDPOINT = "http://localhost:8081/webapiA";
+    private static final String WEB_API_A_URI = "http://localhost:8081/webapiA";
+    private static final String WEB_API_B_URI = "http://localhost:8082/webapiB/clientCredential";
 
     @Autowired
     private WebClient webClient;
 
     /**
-     * Call webapiA endpoint, combine all the response and return.
-     * @param webapiAClient authorized client for Custom
+     * Check whether webapiA is accessible.
+     *
+     * @param client authorized client for webapiA
      * @return Response webapiA data.
      */
     @GetMapping("/webapp/webapiA/webapiB")
     @ResponseBody
-    public String callWebApi(@RegisteredOAuth2AuthorizedClient("webapiA") OAuth2AuthorizedClient webapiAClient) {
-        return callWebApiAEndpoint(webapiAClient);
+    public String webapiA(@RegisteredOAuth2AuthorizedClient("webapiA") OAuth2AuthorizedClient client) {
+        return canVisitUri(client, WEB_API_A_URI);
+    }
+
+    /**
+     * Check whether webapiB/clientCredential is accessible.
+     *
+     * @param client authorized client for webapiB
+     * @return Response webapiA data.
+     */
+    @GetMapping("/webapp/webapiB/clientCredential")
+    @ResponseBody
+    public String webapiB(@RegisteredOAuth2AuthorizedClient("webapiB") OAuth2AuthorizedClient client) {
+        return canVisitUri(client, WEB_API_B_URI);
     }
 
     /**
-     * Call webapiA endpoint
-     * @param webapiAClient Authorized Client
-     * @return Response string data.
+     * Check whether uri is accessible by provided client.
+     *
+     * @param client Authorized client.
+     * @param uri The request uri.
+     * @return "Get http response successfully." or "Get http response failed."
      */
-    private String callWebApiAEndpoint(OAuth2AuthorizedClient webapiAClient) {
-        if (null != webapiAClient) {
-            String body = webClient
-                .get()
-                .uri(CUSTOM_LOCAL_FILE_ENDPOINT)
-                .attributes(oauth2AuthorizedClient(webapiAClient))
-                .retrieve()
-                .bodyToMono(String.class)
-                .block();
-            LOGGER.info("Response from webapiA : {}", body);
-            return "webapiA response " + (null != body ? "success." : "failed.");
-        } else {
-            return "webapiA response failed.";
+    private String canVisitUri(OAuth2AuthorizedClient client, String uri) {
+        if (null == client) {
+            return "Get response failed.";
         }
+        String body = webClient
+            .get()
+            .uri(uri)
+            .attributes(oauth2AuthorizedClient(client))
+            .retrieve()
+            .bodyToMono(String.class)
+            .block();
+        LOGGER.info("Response from {} : {}", uri, body);
+        return "Get response " + (null != body ? "successfully" : "failed");
     }
 }

aad/azure-spring-boot-sample-active-directory-webapp/src/main/resources/application.yml

@@ -18,6 +18,10 @@ azure:
         scopes:
           - https://graph.microsoft.com/User.Read
           - https://graph.microsoft.com/Directory.Read.All
-#      webapiA:
+#      webapiA:  # This is used to demonstrate on-behalf-of function. Refs: https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-on-behalf-of-flow
 #        scopes:
 #          - <Web-API-A-app-id-url>/Obo.WebApiA.ExampleScope
+#      webapiB:  # This is used to demonstrate client_credentials type. Refs: https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-client-creds-grant-flow
+#        scopes:
+#          - api://<Web-API-B-app-id-url>/.default
+#        authorization-grant-type: client_credentials

aad/azure-spring-boot-sample-active-directory-webapp/src/main/resources/templates/index.html

@@ -37,6 +37,7 @@ <h1>Azure Active Directory OAuth 2.0 Login with Spring Security</h1>
     <a href="/graph" >Graph Client</a> |
     <a href="/arm" >Arm Client</a> |
     <a href="/webapp/webapiA/webapiB" >Obo Client</a> |
+    <a href="/webapp/webapiB/clientCredential" >Client Credential Client</a> |
 </div>
 </body>
 </html>