From e34723efd23ccf4026b31d506a0dccbdb8108589 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Tue, 14 Aug 2018 13:04:50 -0600 Subject: [PATCH] Update OIDC config following Spring Security changes The location changed for the class that provides a ClientRegistration via an issuer URL, and this updates Spring Boot accordingly. --- .../client/OAuth2ClientPropertiesRegistrationAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f01e653940..47414e85c5 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 @@ -25,9 +25,9 @@ import org.springframework.boot.context.properties.PropertyMapper; import org.springframework.boot.convert.ApplicationConversionService; import org.springframework.core.convert.ConversionException; import org.springframework.security.config.oauth2.client.CommonOAuth2Provider; -import org.springframework.security.config.oauth2.client.oidc.OidcConfigurationProvider; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistration.Builder; +import org.springframework.security.oauth2.client.registration.ClientRegistrations; import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.ClientAuthenticationMethod; import org.springframework.util.StringUtils; @@ -85,7 +85,7 @@ public final class OAuth2ClientPropertiesRegistrationAdapter { String issuer = provider.getIssuerUri(); if (issuer != null) { String cleanedIssuer = cleanIssuerPath(issuer); - Builder builder = OidcConfigurationProvider.issuer(cleanedIssuer) + Builder builder = ClientRegistrations.fromOidcIssuerLocation(cleanedIssuer) .registrationId(registrationId); return getBuilder(builder, provider); }