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

ClientRegistration supports 'baseUrl' uri variable 

Fixes gh-4589
This commit is contained in:
Joe Grandja 2017-10-05 20:35:51 -04:00
parent dec0bce100
commit eca2b67137
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,14 +160,14 @@ 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() String baseUrl = UriComponentsBuilder.newInstance()
.scheme(request.getScheme()) .scheme(request.getScheme())
.host(request.getServerName()) .host(request.getServerName())
.port(request.getServerPort()) .port(request.getServerPort())
.path(request.getContextPath()) .path(request.getContextPath())
.build() .build()
.toUriString(); .toUriString();
uriVariables.put("baseRedirectUrl", baseRedirectUrl); uriVariables.put("baseUrl", baseUrl);
return UriComponentsBuilder.fromUriString(clientRegistration.getRedirectUri()) return UriComponentsBuilder.fromUriString(clientRegistration.getRedirectUri())
.buildAndExpand(uriVariables) .buildAndExpand(uriVariables)

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

@ -5,7 +5,7 @@ security:
google: google:
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: "{baseUrl}/oauth2/authorize/code/{registrationId}"
scope: openid, profile, email, address, phone scope: openid, profile, email, address, phone
authorization-uri: "https://accounts.google.com/o/oauth2/v2/auth" authorization-uri: "https://accounts.google.com/o/oauth2/v2/auth"
token-uri: "https://www.googleapis.com/oauth2/v4/token" token-uri: "https://www.googleapis.com/oauth2/v4/token"
@ -16,7 +16,7 @@ security:
github: github:
client-authentication-method: basic client-authentication-method: basic
authorization-grant-type: authorization_code authorization-grant-type: authorization_code
redirect-uri: "{baseRedirectUrl}/oauth2/authorize/code/{registrationId}" redirect-uri: "{baseUrl}/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"