Copy refresh token value correctly in JwtAccessTokenConverter

Fixes spring-atticgh-200
chinagirlzz · May 16, 2014 · 51eb6d8 · 51eb6d8
1 parent 93e849f
commit 51eb6d8
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...ava/org/springframework/security/oauth2/provider/token/store/JwtAccessTokenConverter.java b/...ava/org/springframework/security/oauth2/provider/token/store/JwtAccessTokenConverter.java
@@ -183,6 +183,10 @@ public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, OAuth2Authentica
 		OAuth2RefreshToken refreshToken = result.getRefreshToken();
 		if (refreshToken != null) {
 			DefaultOAuth2AccessToken encodedRefreshToken = new DefaultOAuth2AccessToken(accessToken);
+			encodedRefreshToken.setValue(refreshToken.getValue());
+			Map<String, Object> refreshTokenInfo = new LinkedHashMap<String, Object>(accessToken.getAdditionalInformation());
+			refreshTokenInfo.put(TOKEN_ID, encodedRefreshToken.getValue());
+			encodedRefreshToken.setAdditionalInformation(refreshTokenInfo);
 			DefaultOAuth2RefreshToken token = new DefaultOAuth2RefreshToken(encode(encodedRefreshToken, authentication));
 			if (refreshToken instanceof ExpiringOAuth2RefreshToken) {
 				Date expiration = ((ExpiringOAuth2RefreshToken) refreshToken).getExpiration();