|
|
|
@ -104,10 +104,9 @@ public class Oauth2AuthenticationSuccessHandler extends SimpleUrlAuthenticationS |
|
|
|
SecurityUser securityUser = mapper.getOrCreateUserByClientPrincipal(request, token, oAuth2AuthorizedClient.getAccessToken().getTokenValue(), |
|
|
|
registration); |
|
|
|
|
|
|
|
JwtPair tokenPair = tokenFactory.createTokenPair(securityUser); |
|
|
|
|
|
|
|
clearAuthenticationAttributes(request, response); |
|
|
|
getRedirectStrategy().sendRedirect(request, response, baseUrl + "/?accessToken=" + tokenPair.getToken() + "&refreshToken=" + tokenPair.getRefreshToken()); |
|
|
|
|
|
|
|
getRedirectStrategy().sendRedirect(request, response, getRedirectUrl(baseUrl, securityUser)); |
|
|
|
systemSecurityService.logLoginAction(securityUser, new RestAuthenticationDetails(request), ActionType.LOGIN, registration.getName(), null); |
|
|
|
} catch (Exception e) { |
|
|
|
log.debug("Error occurred during processing authentication success result. " + |
|
|
|
@ -128,4 +127,14 @@ public class Oauth2AuthenticationSuccessHandler extends SimpleUrlAuthenticationS |
|
|
|
super.clearAuthenticationAttributes(request); |
|
|
|
httpCookieOAuth2AuthorizationRequestRepository.removeAuthorizationRequestCookies(request, response); |
|
|
|
} |
|
|
|
|
|
|
|
private String getRedirectUrl(String baseUrl, SecurityUser securityUser) { |
|
|
|
JwtPair tokenPair = tokenFactory.createTokenPair(securityUser); |
|
|
|
if (baseUrl.contains("state")) { |
|
|
|
baseUrl += "&"; |
|
|
|
} else { |
|
|
|
baseUrl += "/?"; |
|
|
|
} |
|
|
|
return baseUrl + "accessToken=" + tokenPair.getToken() + "&refreshToken=" + tokenPair.getRefreshToken(); |
|
|
|
} |
|
|
|
} |
|
|
|
|