Use version 4.0 for aad related sample (#72)

Azure-Samples · Nov 22, 2021 · 52d2a89 · 52d2a89
1 parent 2173f87
commit 52d2a89
Show file tree

Hide file tree

Showing 132 changed files with 369 additions and 422 deletions.
diff --git a/README.md b/README.md
@@ -13,14 +13,14 @@
 
 | Azure Service    | Azure Spring Starter Dependency                                                                | Sample Project                                                                                                                    |
 |------------------|------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------|
-| AAD              | [azure-spring-boot-starter-active-directory-b2c:3.9.0]                                         | [aad-b2c-resource-server](aad/azure-spring-boot-starter-active-directory-b2c/aad-b2c-resource-server)                             |
-| AAD              | [azure-spring-boot-starter-active-directory-b2c:3.9.0]                                         | [aad-b2c-web-application](aad/azure-spring-boot-starter-active-directory-b2c/aad-b2c-web-application)                             |
-| AAD              | [azure-spring-boot-starter-active-directory:3.9.0]                                             | [aad-resource-server-by-filter-stateless](aad/azure-spring-boot-starter-active-directory/aad-resource-server-by-filter-stateless) |
-| AAD              | [azure-spring-boot-starter-active-directory:3.9.0]                                             | [aad-resource-server-by-filter](aad/azure-spring-boot-starter-active-directory/aad-resource-server-by-filter)                     |
-| AAD              | [azure-spring-boot-starter-active-directory:3.9.0]                                             | [aad-resource-server-obo](aad/azure-spring-boot-starter-active-directory/aad-resource-server-obo)                                 |
-| AAD              | [azure-spring-boot-starter-active-directory:3.9.0]                                             | [aad-resource-server](aad/azure-spring-boot-starter-active-directory/aad-resource-server)                                         |
-| AAD              | [azure-spring-boot-starter-active-directory:3.9.0]                                             | [aad-web-application](aad/azure-spring-boot-starter-active-directory/aad-web-application)                                         |
-| AAD              | [azure-spring-boot-starter-active-directory:3.9.0]                                             | [aad-webapp-resource-server](aad/azure-spring-boot-starter-active-directory/aad-web-application-and-resource-server)              |
+| AAD              | [spring-cloud-azure-starter-active-directory-b2c:4.0.0.beta-1]                                 | [aad-b2c-resource-server](aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-resource-server)                             |
+| AAD              | [spring-cloud-azure-starter-active-directory-b2c:4.0.0.beta-1]                                 | [aad-b2c-web-application](aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-web-application)                             |
+| AAD              | [spring-cloud-azure-starter-active-directory:4.0.0.beta-1]                                     | [aad-resource-server-by-filter-stateless](aad/spring-cloud-azure-starter-active-directory/aad-resource-server-by-filter-stateless) |
+| AAD              | [spring-cloud-azure-starter-active-directory:4.0.0.beta-1]                                     | [aad-resource-server-by-filter](aad/spring-cloud-azure-starter-active-directory/aad-resource-server-by-filter)                     |
+| AAD              | [spring-cloud-azure-starter-active-directory:4.0.0.beta-1]                                     | [aad-resource-server-obo](aad/spring-cloud-azure-starter-active-directory/aad-resource-server-obo)                                 |
+| AAD              | [spring-cloud-azure-starter-active-directory:4.0.0.beta-1]                                     | [aad-resource-server](aad/spring-cloud-azure-starter-active-directory/aad-resource-server)                                         |
+| AAD              | [spring-cloud-azure-starter-active-directory:4.0.0.beta-1]                                     | [aad-web-application](aad/spring-cloud-azure-starter-active-directory/aad-web-application)                                         |
+| AAD              | [spring-cloud-azure-starter-active-directory:4.0.0.beta-1]                                     | [aad-webapp-resource-server](aad/spring-cloud-azure-starter-active-directory/aad-web-application-and-resource-server)              |
 | appconfiguration | [azure-spring-boot-starter-cosmos:3.9.0]                                                       | [azure-appconfiguration-conversion-sample-initial](appconfiguration/azure-appconfiguration-conversion-sample-initial)             |
 | appconfiguration | [spring-cloud-azure-appconfiguration-config:1.3.0]                                             | [azure-appconfiguration-sample](appconfiguration/azure-appconfiguration-sample)                                                   |
 | appconfiguration | [spring-cloud-azure-feature-management:1.3.0]                                                  | [feature-management-sample](appconfiguration/feature-management-sample)                                                           |
@@ -75,9 +75,9 @@
 [azure-spring-boot-starter-cosmos:3.9.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-cosmos/3.9.0/jar
 [spring-cloud-azure-stream-binder-servicebus:4.0.0-beta.1]: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-stream-binder-servicebus/4.0.0-beta.1/jar
 [azure-spring-boot-starter-storage:3.9.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-storage/3.9.0/jar
-[azure-spring-boot-starter-active-directory:3.9.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-active-directory/3.9.0/jar
-[azure-spring-boot-starter-active-directory-b2c:3.9.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-active-directory-b2c/3.9.0/jar
-[spring-cloud-azure-starter-servicebus-jms:4.0.0-beta.1]: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-starter-servicebus-jms/4.0.0-beta.1/jar
+[spring-cloud-azure-starter-active-directory:4.0.0.beta-1]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-active-directory/3.9.0/jar
+[spring-cloud-azure-starter-active-directory-b2c:4.0.0.beta-1]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-active-directory-b2c/3.9.0/jar
+[azure-spring-boot-starter-servicebus-jms:3.9.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-servicebus-jms/3.9.0/jar
 [spring-cloud-azure-starter-integration-servicebus:4.0.0-beta.1]: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-starter-integration-servicebus/4.0.0-beta.1/jar
 [azure-spring-cloud-starter-storage-queue:2.9.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-cloud-starter-storage-queue/2.9.0/jar
 [azure-security-keyvault-jca:2.1.0]: https://mvnrepository.com/artifact/com.azure/azure-security-keyvault-jca
diff --git a/aad/azure-spring-boot-starter-active-directory-b2c/aad-b2c-resource-server/pom.xml b/aad/azure-spring-boot-starter-active-directory-b2c/aad-b2c-resource-server/pom.xml
diff --git a/...t-starter-active-directory-b2c/aad-b2c-resource-server/src/main/resources/application.yml b/...t-starter-active-directory-b2c/aad-b2c-resource-server/src/main/resources/application.yml
diff --git a/...t-starter-active-directory-b2c/aad-b2c-web-application/src/main/resources/application.yml b/...t-starter-active-directory-b2c/aad-b2c-web-application/src/main/resources/application.yml
diff --git a/...rectory/aad-resource-server-by-filter-stateless/src/main/resources/application.properties b/...rectory/aad-resource-server-by-filter-stateless/src/main/resources/application.properties
diff --git a/...starter-active-directory/aad-resource-server-by-filter/src/main/resources/application.yml b/...starter-active-directory/aad-resource-server-by-filter/src/main/resources/application.yml
diff --git a/...-boot-starter-active-directory/aad-resource-server-obo/src/main/resources/application.yml b/...-boot-starter-active-directory/aad-resource-server-obo/src/main/resources/application.yml
diff --git a/...ring-boot-starter-active-directory/aad-resource-server/src/main/resources/application.yml b/...ring-boot-starter-active-directory/aad-resource-server/src/main/resources/application.yml
diff --git a/...tive-directory/aad-web-application-and-resource-server/src/main/resources/application.yml b/...tive-directory/aad-web-application-and-resource-server/src/main/resources/application.yml
diff --git a/...ring-boot-starter-active-directory/aad-web-application/src/main/resources/application.yml b/...ring-boot-starter-active-directory/aad-web-application/src/main/resources/application.yml
diff --git a/...ory-b2c/aad-b2c-resource-server/README.md → ...ory-b2c/aad-b2c-resource-server/README.md b/...ory-b2c/aad-b2c-resource-server/README.md → ...ory-b2c/aad-b2c-resource-server/README.md
@@ -90,15 +90,18 @@ This sample illustrates how to use `azure-spring-boot-starter-active-directory-b
 
 ```yaml
 # In v2.0 tokens, `aud` is always the client ID of the API, while in v1.0 tokens it can be the app id uri.
-azure:
-  activedirectory:
-    b2c:
-      tenant-id: ${your-tenant-id}
-      app-id-uri: ${your-app-id-uri}         # If you are using v1.0 token, please configure app-id-uri for `aud` verification
-      client-id: ${your-client-id}           # If you are using v2.0 token, please configure client-id for `aud` verification
-      base-uri: ${your-base-uri}             # Such as: https://xxxxb2c.b2clogin.com
-      user-flows:
-        sign-up-or-sign-in: ${sign-up-or-sign-in-user-flow-name}
+spring:
+  cloud:
+    azure:
+      active-directory:
+        b2c:
+          enabled: true
+          tenant-id: ${your-tenant-id}
+          app-id-uri: ${your-app-id-uri}         # If you are using v1.0 token, please configure app-id-uri for `aud` verification
+          client-id: ${your-client-id}           # If you are using v2.0 token, please configure client-id for `aud` verification
+          base-uri: ${your-base-uri}             # Such as: https://xxxxb2c.b2clogin.com
+          user-flows:
+            sign-up-or-sign-in: ${sign-up-or-sign-in-user-flow-name}
 ```
 
 ### Run with Maven

diff --git a/...rver/docs/image-add-application-roles.png → ...rver/docs/image-add-application-roles.png b/...rver/docs/image-add-application-roles.png → ...rver/docs/image-add-application-roles.png
diff --git a/.../docs/image-add-delegated-permissions.png → .../docs/image-add-delegated-permissions.png b/.../docs/image-add-delegated-permissions.png → .../docs/image-add-delegated-permissions.png
diff --git a/...ource-server/docs/image-add-user-flow.png → ...ource-server/docs/image-add-user-flow.png b/...ource-server/docs/image-add-user-flow.png → ...ource-server/docs/image-add-user-flow.png
diff --git a/...image-configuration-application-roles.png → ...image-configuration-application-roles.png b/...image-configuration-application-roles.png → ...image-configuration-application-roles.png
diff --git a/...application-and-delegated-permissions.png → ...application-and-delegated-permissions.png b/...application-and-delegated-permissions.png → ...application-and-delegated-permissions.png
diff --git a/...ource-server/docs/image-expose-an-api.png → ...ource-server/docs/image-expose-an-api.png b/...ource-server/docs/image-expose-an-api.png → ...ource-server/docs/image-expose-an-api.png
diff --git a/...server/docs/image-final-configuration.png → ...server/docs/image-final-configuration.png b/...server/docs/image-final-configuration.png → ...server/docs/image-final-configuration.png
diff --git a/...er/docs/image-select-a-user-flow-type.png → ...er/docs/image-select-a-user-flow-type.png b/...er/docs/image-select-a-user-flow-type.png → ...er/docs/image-select-a-user-flow-type.png
diff --git a/...erver/docs/image-selected-application.png → ...erver/docs/image-selected-application.png b/...erver/docs/image-selected-application.png → ...erver/docs/image-selected-application.png
diff --git a/...r/docs/image-setting-relevant-content.png → ...r/docs/image-setting-relevant-content.png b/...r/docs/image-setting-relevant-content.png → ...r/docs/image-setting-relevant-content.png
diff --git a/...e-server/docs/image-user-flow-finally.png → ...e-server/docs/image-user-flow-finally.png b/...e-server/docs/image-user-flow-finally.png → ...e-server/docs/image-user-flow-finally.png
diff --git a/aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-resource-server/pom.xml b/aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-resource-server/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.azure.spring</groupId>
+    <artifactId>azure-spring-boot-samples</artifactId>
+    <version>1.0.0</version>
+  </parent>
+
+  <groupId>com.azure.spring</groupId>
+  <artifactId>spring-cloud-azure-starter-active-directory-b2c-resource-server</artifactId>
+  <version>1.0.0</version>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.azure.spring</groupId>
+      <artifactId>spring-cloud-azure-starter-active-directory-b2c</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/...ADB2CResourceServerSampleApplication.java → ...ADB2CResourceServerSampleApplication.java b/...ADB2CResourceServerSampleApplication.java → ...ADB2CResourceServerSampleApplication.java
diff --git a/...ple/aad/b2c/controller/WebController.java → ...ple/aad/b2c/controller/WebController.java b/...ple/aad/b2c/controller/WebController.java → ...ple/aad/b2c/controller/WebController.java
diff --git a/...2c/security/WebSecurityConfiguration.java → ...2c/security/WebSecurityConfiguration.java b/...2c/security/WebSecurityConfiguration.java → ...2c/security/WebSecurityConfiguration.java
@@ -3,7 +3,7 @@
 
 package com.azure.spring.sample.aad.b2c.security;
 
-import com.azure.spring.autoconfigure.b2c.AADB2CJwtBearerTokenAuthenticationConverter;
+import com.azure.spring.cloud.autoconfigure.aad.b2c.AADB2CJwtBearerTokenAuthenticationConverter;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;

diff --git a/...e-starter-active-directory-b2c/aad-b2c-resource-server/src/main/resources/application.yml b/...e-starter-active-directory-b2c/aad-b2c-resource-server/src/main/resources/application.yml
@@ -0,0 +1,14 @@
+# In v2.0 tokens, `aud` is always the client ID of the API, while in v1.0 tokens it can be the resource URI used in the request.
+
+spring:
+  cloud:
+    azure:
+      active-directory:
+        b2c:
+          enabled: true
+          tenant-id: ${your-tenant-id}
+          app-id-uri: ${your-app-id-uri}         # If you are using v1.0 token, please configure app-id-uri for `aud` verification
+          client-id: ${your-client-id}           # If you are using v2.0 token, please configure client-id for `aud` verification
+          base-uri: ${your-base-uri}             # Such as: https://xxxxb2c.b2clogin.com
+          user-flows:
+            sign-up-or-sign-in: ${sign-up-or-sign-in-user-flow-name}