Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-03-03 03:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE when configuring oauth2Login.loginPage

Browse Source 
Fixes gh-4752
This commit is contained in:
Joe Grandja 2017-10-30 06:24:42 -04:00
parent 5280ac40e9
commit 727098d6c0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java
View File

@ -68,6 +68,7 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>> exten
private final TokenEndpointConfig tokenEndpointConfig = new TokenEndpointConfig();
private final RedirectionEndpointConfig redirectionEndpointConfig = new RedirectionEndpointConfig();
private final UserInfoEndpointConfig userInfoEndpointConfig = new UserInfoEndpointConfig();
private String loginPage;
public OAuth2LoginConfigurer() {
super();
@ -88,7 +89,8 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>> exten
@Override
public OAuth2LoginConfigurer<B> loginPage(String loginPage) {
Assert.hasText(loginPage, "loginPage cannot be empty");
return super.loginPage(loginPage);
this.loginPage = loginPage;
return this;
}
public AuthorizationEndpointConfig authorizationEndpoint() {
@ -215,7 +217,9 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>> exten
this.getAuthorizedClientService());
this.setAuthenticationFilter(authenticationFilter);
this.loginProcessingUrl(OAuth2LoginAuthenticationFilter.DEFAULT_FILTER_PROCESSES_URI);
if (this.loginPage != null) {
super.loginPage(this.loginPage);
}
super.init(http);
OAuth2AccessTokenResponseClient<OAuth2AuthorizationCodeGrantRequest> accessTokenResponseClient =