Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

redirect-uri property supports 'baseRedirectUrl' uri variable 

Fixes gh-4589
This commit is contained in:
Joe Grandja 2017-10-02 15:29:03 -04:00
parent 66647070ab
commit fb57111ecd
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/src/main/resources/org/springframework/security/config/oauth2/client/spring-security-oauth2-client-templates.properties
View File

@ -13,7 +13,7 @@ spring.security.oauth2.client.templates.google.client-alias=google
# GitHub # GitHub
spring.security.oauth2.client.templates.github.client-authentication-method=basic spring.security.oauth2.client.templates.github.client-authentication-method=basic
spring.security.oauth2.client.templates.github.authorization-grant-type=authorization_code spring.security.oauth2.client.templates.github.authorization-grant-type=authorization_code
spring.security.oauth2.client.templates.github.redirect-uri={scheme}://{serverName}:{serverPort}{contextPath}/oauth2/authorize/code/{registrationId} spring.security.oauth2.client.templates.github.redirect-uri={baseRedirectUrl}/oauth2/authorize/code/{registrationId}
spring.security.oauth2.client.templates.github.scope=user spring.security.oauth2.client.templates.github.scope=user
spring.security.oauth2.client.templates.github.authorization-uri=https://github.com/login/oauth/authorize spring.security.oauth2.client.templates.github.authorization-uri=https://github.com/login/oauth/authorize
spring.security.oauth2.client.templates.github.token-uri=https://github.com/login/oauth/access_token spring.security.oauth2.client.templates.github.token-uri=https://github.com/login/oauth/access_token

9
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationCodeRequestRedirectFilter.java
View File

@ -160,6 +160,15 @@ public class AuthorizationCodeRequestRedirectFilter extends OncePerRequestFilter
uriVariables.put("contextPath", request.getContextPath()); uriVariables.put("contextPath", request.getContextPath());
uriVariables.put("registrationId", clientRegistration.getRegistrationId()); uriVariables.put("registrationId", clientRegistration.getRegistrationId());
String baseRedirectUrl = UriComponentsBuilder.newInstance()
.scheme(request.getScheme())
.host(request.getServerName())
.port(request.getServerPort())
.path(request.getContextPath())
.build()
.toUriString();
uriVariables.put("baseRedirectUrl", baseRedirectUrl);
return UriComponentsBuilder.fromUriString(clientRegistration.getRedirectUri()) return UriComponentsBuilder.fromUriString(clientRegistration.getRedirectUri())
.buildAndExpand(uriVariables) .buildAndExpand(uriVariables)
.toUriString(); .toUriString();

2
samples/boot/oauth2login/src/main/resources/META-INF/oauth2-clients-defaults.yml
View File

@ -15,7 +15,7 @@ security:
github: github:
client-authentication-method: basic client-authentication-method: basic
authorization-grant-type: authorization_code authorization-grant-type: authorization_code
redirect-uri: "{scheme}://{serverName}:{serverPort}{contextPath}/oauth2/authorize/code/{registrationId}" redirect-uri: "{baseRedirectUrl}/oauth2/authorize/code/{registrationId}"
scope: user scope: user
authorization-uri: "https://github.com/login/oauth/authorize" authorization-uri: "https://github.com/login/oauth/authorize"
token-uri: "https://github.com/login/oauth/access_token" token-uri: "https://github.com/login/oauth/access_token"