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

Update OIDC config following Spring Security changes

Browse Source 
The location changed for the class that provides a ClientRegistration
via an issuer URL, and this updates Spring Boot accordingly.
This commit is contained in:
Josh Cummings
2018-08-14 13:04:50 -06:00
committed by Madhura Bhave
parent 0fb02ab6a0
commit e34723efd2
1 changed files with 2 additions and 2 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/client/OAuth2ClientPropertiesRegistrationAdapter.java
View File

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