Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

Browse Source
This commit is contained in:
Madhura Bhave 2020-05-13 13:55:44 -07:00
commit 4d521e712f
4 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java
View File

@ -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<String, Object> configurationMetadata = new LinkedHashMap<>();
public String getAuthorizationUri() {
return this.authorizationUri;
}
@ -281,10 +275,6 @@ public class OAuth2ClientProperties {
this.issuerUri = issuerUri;
}
public Map<String, Object> getConfigurationMetadata() {
return this.configurationMetadata;
}
}
}

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java
View File

@ -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;
}

14
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java
View File

@ -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<String, ClientRegistration> 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();

1
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View File

@ -3376,7 +3376,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.