root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch '3.3.x' into 3.4.x 

Closes gh-45325
This commit is contained in:
Moritz Halbritter 2025-04-29 13:21:42 +02:00
parent 1174ece403 ee0beed53b
commit c2cfeb0c93
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java
View File

@ -47,10 +47,10 @@ public class OAuth2ResourceServerProperties {
return this.jwt;
}
private final Opaquetoken opaqueToken = new Opaquetoken();
private final Opaquetoken opaquetoken = new Opaquetoken();
public Opaquetoken getOpaquetoken() {
return this.opaqueToken;
return this.opaquetoken;
}
public static class Jwt {

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerOpaqueTokenConfiguration.java
View File

@ -45,9 +45,9 @@ class ReactiveOAuth2ResourceServerOpaqueTokenConfiguration {
@Bean
@ConditionalOnProperty(name = "spring.security.oauth2.resourceserver.opaquetoken.introspection-uri")
SpringReactiveOpaqueTokenIntrospector opaqueTokenIntrospector(OAuth2ResourceServerProperties properties) {
OAuth2ResourceServerProperties.Opaquetoken opaqueToken = properties.getOpaquetoken();
return new SpringReactiveOpaqueTokenIntrospector(opaqueToken.getIntrospectionUri(),
opaqueToken.getClientId(), opaqueToken.getClientSecret());
OAuth2ResourceServerProperties.Opaquetoken opaquetoken = properties.getOpaquetoken();
return new SpringReactiveOpaqueTokenIntrospector(opaquetoken.getIntrospectionUri(),
opaquetoken.getClientId(), opaquetoken.getClientSecret());
}
}

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java
View File

@ -47,9 +47,9 @@ class OAuth2ResourceServerOpaqueTokenConfiguration {
@Bean
@ConditionalOnProperty(name = "spring.security.oauth2.resourceserver.opaquetoken.introspection-uri")
SpringOpaqueTokenIntrospector opaqueTokenIntrospector(OAuth2ResourceServerProperties properties) {
OAuth2ResourceServerProperties.Opaquetoken opaqueToken = properties.getOpaquetoken();
return new SpringOpaqueTokenIntrospector(opaqueToken.getIntrospectionUri(), opaqueToken.getClientId(),
opaqueToken.getClientSecret());
OAuth2ResourceServerProperties.Opaquetoken opaquetoken = properties.getOpaquetoken();
return new SpringOpaqueTokenIntrospector(opaquetoken.getIntrospectionUri(), opaquetoken.getClientId(),
opaquetoken.getClientSecret());
}
}