Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Synchronize persisting token in RefreshGrantHandler #2303

Merged
merged 1 commit into from
Dec 14, 2023
Merged

Synchronize persisting token in RefreshGrantHandler #2303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...g/wso2/carbon/identity/oauth2/token/handlers/grant/AbstractAuthorizationGrantHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@ private boolean hasValidationByApplicationScopeValidatorsFailed(OAuthTokenReqMes
* @param tokReqMsgCtx OAuthTokenReqMessageContext.
* @return token binding reference.
*/
private String getTokenBindingReference(OAuthTokenReqMessageContext tokReqMsgCtx) {
protected String getTokenBindingReference(OAuthTokenReqMessageContext tokReqMsgCtx) {

if (tokReqMsgCtx.getTokenBinding() == null) {
if (log.isDebugEnabled()) {
Expand Down
46 changes: 30 additions & 16 deletions ...c/main/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/RefreshGrantHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,22 +115,36 @@ public OAuth2AccessTokenRespDTO issue(OAuthTokenReqMessageContext tokReqMsgCtx)

AccessTokenDO accessTokenBean = getRefreshTokenGrantProcessor()
.createAccessTokenBean(tokReqMsgCtx, tokenReq, validationBean, getTokenType());
// sets accessToken, refreshToken and validity data
setTokenData(accessTokenBean, tokReqMsgCtx, validationBean, tokenReq, accessTokenBean.getIssuedTime());
persistNewToken(tokReqMsgCtx, accessTokenBean, tokenReq.getClientId());
if (log.isDebugEnabled()) {
log.debug("Persisted an access token for the refresh token, " +
"Client ID : " + tokenReq.getClientId() +
", Authorized user : " + tokReqMsgCtx.getAuthorizedUser() +
", Timestamp : " + accessTokenBean.getIssuedTime() +
", Validity period (s) : " + accessTokenBean.getValidityPeriod() +
", Scope : " + OAuth2Util.buildScopeString(tokReqMsgCtx.getScope()) +
", Token State : " + OAuthConstants.TokenStates.TOKEN_STATE_ACTIVE +
" and User Type : " + getTokenType());
}

setTokenDataToMessageContext(tokReqMsgCtx, accessTokenBean);
addUserAttributesToCache(accessTokenBean, tokReqMsgCtx);

String scope = OAuth2Util.buildScopeString(tokReqMsgCtx.getScope());
String consumerKey = tokReqMsgCtx.getOauth2AccessTokenReqDTO().getClientId();
String authorizedUserId;
try {
authorizedUserId = tokReqMsgCtx.getAuthorizedUser().getUserId();
} catch (UserIdNotFoundException e) {
throw new IdentityOAuth2Exception("User id is not available for user: "
+ tokReqMsgCtx.getAuthorizedUser().getLoggableMaskedUserId(), e);
}
String tokenBindingReference = getTokenBindingReference(tokReqMsgCtx);
synchronized ((consumerKey + ":" + authorizedUserId + ":" + scope + ":" + tokenBindingReference).intern()) {
// sets accessToken, refreshToken and validity data
setTokenData(accessTokenBean, tokReqMsgCtx, validationBean, tokenReq, accessTokenBean.getIssuedTime());
persistNewToken(tokReqMsgCtx, accessTokenBean, tokenReq.getClientId());

if (log.isDebugEnabled()) {
log.debug("Persisted an access token for the refresh token, " +
"Client ID : " + tokenReq.getClientId() +
", Authorized user : " + tokReqMsgCtx.getAuthorizedUser() +
", Timestamp : " + accessTokenBean.getIssuedTime() +
", Validity period (s) : " + accessTokenBean.getValidityPeriod() +
", Scope : " + OAuth2Util.buildScopeString(tokReqMsgCtx.getScope()) +
", Token State : " + OAuthConstants.TokenStates.TOKEN_STATE_ACTIVE +
" and User Type : " + getTokenType());
}

setTokenDataToMessageContext(tokReqMsgCtx, accessTokenBean);
addUserAttributesToCache(accessTokenBean, tokReqMsgCtx);
}
return buildTokenResponse(tokReqMsgCtx, accessTokenBean);
}

Expand Down