Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use version 4.0 for aad related sample #72

Merged
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand Down Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just reminder, the link should be updated after beta release.

[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

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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}
Loading