diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java index c83610b9e7..8b16e6b2fd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java @@ -17,7 +17,6 @@ package org.springframework.boot.autoconfigure.security.oauth2.client; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; @@ -220,11 +219,6 @@ public class OAuth2ClientProperties { */ private String issuerUri; - /** - * Additional metadata describing the provider's configuration. - */ - private Map configurationMetadata = new LinkedHashMap<>(); - public String getAuthorizationUri() { return this.authorizationUri; } @@ -281,10 +275,6 @@ public class OAuth2ClientProperties { this.issuerUri = issuerUri; } - public Map getConfigurationMetadata() { - return this.configurationMetadata; - } - } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java index 9d90118d66..481257a44a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java @@ -116,7 +116,6 @@ public final class OAuth2ClientPropertiesRegistrationAdapter { .to(builder::userInfoAuthenticationMethod); map.from(provider::getJwkSetUri).to(builder::jwkSetUri); map.from(provider::getUserNameAttribute).to(builder::userNameAttributeName); - map.from(provider::getConfigurationMetadata).to(builder::providerConfigurationMetadata); return builder; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java index ffe8bdbed8..cda74fae72 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java @@ -238,20 +238,6 @@ class OAuth2ClientPropertiesRegistrationAdapterTests { testIssuerConfiguration(login, "okta", 2, 3); } - @Test - void configurationMetadataFromProviderIsAdapted() { - Provider provider = createProvider(); - provider.getConfigurationMetadata().put("end_session_endpoint", "https://myendsessionendpoint"); - OAuth2ClientProperties.Registration registration = createRegistration("my-oauth-provider"); - OAuth2ClientProperties properties = new OAuth2ClientProperties(); - properties.getRegistration().put("registration", registration); - properties.getProvider().put("my-oauth-provider", provider); - Map registrations = OAuth2ClientPropertiesRegistrationAdapter - .getClientRegistrations(properties); - assertThat(registrations.get("registration").getProviderDetails().getConfigurationMetadata() - .get("end_session_endpoint")).isEqualTo("https://myendsessionendpoint"); - } - @Test void oidcProviderConfigurationWithCustomConfigurationOverridesProviderDefaults() throws Exception { this.server = new MockWebServer(); diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 5a0c2c5d8d..c7d2ad3f4b 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -3219,7 +3219,6 @@ You can register multiple OAuth2 clients and providers under the `spring.securit spring.security.oauth2.client.provider.my-oauth-provider.user-info-authentication-method=header spring.security.oauth2.client.provider.my-oauth-provider.jwk-set-uri=https://my-auth-server/token_keys spring.security.oauth2.client.provider.my-oauth-provider.user-name-attribute=name - spring.security.oauth2.client.provider.my-oauth-provider.configuration-metadata.end_session_endpoint=https://my-end-session-endpoint ---- For OpenID Connect providers that support https://openid.net/specs/openid-connect-discovery-1_0.html[OpenID Connect discovery], the configuration can be further simplified.