Skip to content

Commit f584ed3

Browse files
NetyyyyNetyyyy
authored
Update all samples (#764)
1 parent 8ef1cca commit f584ed3

File tree

1,065 files changed

+3088
-61390
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,065 files changed

+3088
-61390
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build-with-maven:
1010
strategy:
1111
matrix:
12-
java-version: ['8', '11', '17']
12+
java-version: ['21', '17']
1313
runs-on: ubuntu-latest
1414
name: Build with Java ${{ matrix.java-version }}
1515
steps:
@@ -20,9 +20,6 @@ jobs:
2020
java-version: ${{ matrix.java-version }}
2121
distribution: 'adopt'
2222
cache: maven
23-
- name: Build azure-spring-boot-samples 4.x with Maven - Java ${{ matrix.java-version }}
24-
run: mvn -f pom.xml -P spring-cloud-azure-4.x --batch-mode --update-snapshots verify
25-
- if: ${{ (matrix.java-version == '17') }}
26-
name: Build azure-spring-boot-samples 5.x with Maven - ${{ matrix.java-version }}
23+
- name: Build azure-spring-boot-samples 5.x with Maven - ${{ matrix.java-version }}
2724
run: mvn -f pom.xml --batch-mode --update-snapshots verify
2825

‎.github/workflows/markdown-link-check.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on: [push, pull_request]
44

55
jobs:
66
markdown-link-check:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-22.04 #workaround https://github.com/UmbrellaDocs/action-linkspector/issues/32
88
steps:
9-
- uses: actions/checkout@master
10-
- uses: umbrelladocs/action-linkspector@v1.1.3
11-
with:
9+
- uses: actions/checkout@master
10+
- uses: umbrelladocs/action-linkspector@v1.1.3
11+
with:
1212
reporter: github-pr-review
1313
config_file: '.github/workflows/.linkspector.yml'
1414
level: error

‎CONVERT_SAMPLE_TO_USE_SPRING_BOOT_3_TEMPLATE.md‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎README.md‎

Lines changed: 210 additions & 125 deletions
Large diffs are not rendered by default.

‎aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-resource-server/pom.xml‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,37 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<parent>
7-
<groupId>com.azure.spring</groupId>
8-
<artifactId>azure-spring-boot-samples</artifactId>
9-
<version>1.0.0</version>
10-
<relativePath>../../../pom.xml</relativePath>
7+
<groupId>org.springframework.boot</groupId>
8+
<artifactId>spring-boot-starter-parent</artifactId>
9+
<version>3.4.0</version>
10+
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212

13-
<artifactId>spring-cloud-azure-starter-active-directory-b2c-resource-server</artifactId>
13+
<groupId>com.azure.spring</groupId>
14+
<artifactId>aad-b2c-resource-server</artifactId>
1415
<version>1.0.0</version>
1516
<packaging>jar</packaging>
1617

1718
<name>Spring-Cloud-Azure-Starter-Active-Directory-B2C Sample: Resource Server</name>
1819

20+
<properties>
21+
<maven.compiler.source>17</maven.compiler.source>
22+
<maven.compiler.target>17</maven.compiler.target>
23+
<version.spring.cloud.azure>5.19.0</version.spring.cloud.azure>
24+
</properties>
25+
26+
<dependencyManagement>
27+
<dependencies>
28+
<dependency>
29+
<groupId>com.azure.spring</groupId>
30+
<artifactId>spring-cloud-azure-dependencies</artifactId>
31+
<version>${version.spring.cloud.azure}</version>
32+
<type>pom</type>
33+
<scope>import</scope>
34+
</dependency>
35+
</dependencies>
36+
</dependencyManagement>
37+
1938
<dependencies>
2039
<dependency>
2140
<groupId>com.azure.spring</groupId>

‎aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-resource-server/src/main/java/com/azure/spring/sample/aad/b2c/security/WebSecurityConfiguration.java‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,31 @@
33

44
package com.azure.spring.sample.aad.b2c.security;
55

6-
import com.azure.spring.cloud.autoconfigure.aad.AadJwtBearerTokenAuthenticationConverter;
7-
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
6+
import org.springframework.context.annotation.Bean;
7+
import org.springframework.context.annotation.Configuration;
8+
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
89
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
910
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
10-
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
11+
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
12+
import org.springframework.security.oauth2.server.resource.authentication.JwtGrantedAuthoritiesConverter;
13+
import org.springframework.security.web.SecurityFilterChain;
1114

1215
@EnableWebSecurity
13-
@EnableGlobalMethodSecurity(prePostEnabled = true)
14-
public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
16+
@EnableMethodSecurity
17+
@Configuration
18+
public class WebSecurityConfiguration {
1519

16-
@Override
17-
protected void configure(HttpSecurity http) throws Exception {
18-
http.authorizeRequests((requests) -> requests.anyRequest().authenticated())
19-
.oauth2ResourceServer()
20-
.jwt()
21-
.jwtAuthenticationConverter(new AadJwtBearerTokenAuthenticationConverter());
20+
@Bean
21+
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
22+
JwtAuthenticationConverter authenticationConverter = new JwtAuthenticationConverter();
23+
JwtGrantedAuthoritiesConverter jwtGrantedAuthoritiesConverter = new JwtGrantedAuthoritiesConverter();
24+
jwtGrantedAuthoritiesConverter.setAuthorityPrefix("APPROLE_");
25+
authenticationConverter.setJwtGrantedAuthoritiesConverter(jwtGrantedAuthoritiesConverter);
26+
27+
http.authorizeHttpRequests((requests) -> requests.anyRequest().authenticated())
28+
.oauth2ResourceServer(configure -> configure
29+
.jwt(jwt -> jwt.jwtAuthenticationConverter(authenticationConverter)));
30+
31+
return http.build();
2232
}
2333
}

‎aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-resource-server/src/main/resources/application.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# 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.
22

33
spring:
4+
http:
5+
client:
6+
factory: jdk
47
cloud:
58
azure:
69
# Properties like spring.cloud.azure.credential.client-id are global properties.

‎aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-web-application/pom.xml‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,39 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<parent>
7-
<groupId>com.azure.spring</groupId>
8-
<artifactId>azure-spring-boot-samples</artifactId>
9-
<version>1.0.0</version>
10-
<relativePath>../../../pom.xml</relativePath>
7+
<groupId>org.springframework.boot</groupId>
8+
<artifactId>spring-boot-starter-parent</artifactId>
9+
<version>3.4.0</version>
10+
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212

13-
<artifactId>spring-cloud-azure-starter-active-directory-b2c-oidc</artifactId>
13+
<groupId>com.azure.spring</groupId>
14+
<artifactId>aad-b2c-web-application</artifactId>
1415
<version>1.0.0</version>
1516
<packaging>jar</packaging>
1617

1718
<name>Spring-Cloud-Azure-Starter-Active-Directory-B2C Sample: Web Application</name>
1819
<description>Azure Active Directory B2C Spring Security 5 OAuth2 Integration Spring Boot Sample</description>
1920
<url>https://github.com/Azure/azure-sdk-for-java</url>
2021

22+
<properties>
23+
<maven.compiler.source>17</maven.compiler.source>
24+
<maven.compiler.target>17</maven.compiler.target>
25+
<version.spring.cloud.azure>5.19.0</version.spring.cloud.azure>
26+
</properties>
27+
28+
<dependencyManagement>
29+
<dependencies>
30+
<dependency>
31+
<groupId>com.azure.spring</groupId>
32+
<artifactId>spring-cloud-azure-dependencies</artifactId>
33+
<version>${version.spring.cloud.azure}</version>
34+
<type>pom</type>
35+
<scope>import</scope>
36+
</dependency>
37+
</dependencies>
38+
</dependencyManagement>
39+
2140
<dependencies>
2241
<dependency>
2342
<groupId>com.azure.spring</groupId>
@@ -41,7 +60,7 @@
4160

4261
<dependency>
4362
<groupId>org.thymeleaf.extras</groupId>
44-
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
63+
<artifactId>thymeleaf-extras-springsecurity6</artifactId>
4564
</dependency>
4665
</dependencies>
4766
</project>

‎aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-web-application/src/main/java/com/azure/spring/sample/aad/b2c/security/WebSecurityConfiguration.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33

44
package com.azure.spring.sample.aad.b2c.security;
55

6-
import com.azure.spring.cloud.autoconfigure.aadb2c.AadB2cOidcLoginConfigurer;
6+
import com.azure.spring.cloud.autoconfigure.implementation.aadb2c.security.AadB2cOidcLoginConfigurer;
7+
import org.springframework.context.annotation.Bean;
8+
import org.springframework.context.annotation.Configuration;
79
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
810
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
9-
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
11+
import org.springframework.security.web.SecurityFilterChain;
1012

1113
@EnableWebSecurity
12-
public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
14+
@Configuration
15+
public class WebSecurityConfiguration {
1316

1417
private final AadB2cOidcLoginConfigurer configurer;
1518

1619
public WebSecurityConfiguration(AadB2cOidcLoginConfigurer configurer) {
1720
this.configurer = configurer;
1821
}
1922

20-
@Override
21-
protected void configure(HttpSecurity http) throws Exception {
22-
// @formatter:off
23-
http.authorizeRequests()
24-
.anyRequest().authenticated()
25-
.and()
26-
.apply(configurer);
27-
// @formatter:on
23+
@Bean
24+
public SecurityFilterChain filterChain (HttpSecurity http) throws Exception {
25+
http.authorizeHttpRequests((requests) -> requests.anyRequest().authenticated())
26+
.with(configurer, c -> {});
27+
return http.build();
2828
}
2929
}

‎aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-web-application/src/main/resources/application.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
spring:
2+
http:
3+
client:
4+
factory: jdk
25
cloud:
36
azure:
47
# Properties like spring.cloud.azure.credential.client-id are global properties.

0 commit comments

Comments
 (0)