Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

Browse Source 
Closes gh-45326
This commit is contained in:
Moritz Halbritter
2025-04-29 13:23:14 +02:00
parent a7a1bc5e0f c2cfeb0c93
commit 6d5e13ba98
3 changed files with 10 additions and 10 deletions
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

@@ -46,10 +46,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 {

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

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

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

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