Skip to content

Handle request object data clean if internal token clean up is enabled #2897

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle request object data clean if internal token clean up is enabled #2897

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
4 changes: 1 addition & 3 deletions ....identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dao/AccessTokenDAOImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2126,7 +2126,6 @@ public void invalidateAndCreateNewAccessToken(String oldAccessTokenId, String to
+ Arrays.toString(accessTokenDO.getScope()));
}
}
boolean tokenUpdateSuccessful;
Connection connection = IdentityDatabaseUtil.getDBConnection(true);
try {
if (OAuth2ServiceComponentHolder.isConsentedTokenColumnEnabled() && !accessTokenDO.isConsentedToken()) {
Expand All @@ -2149,15 +2148,14 @@ public void invalidateAndCreateNewAccessToken(String oldAccessTokenId, String to
oldTokenCleanupObject.cleanupTokenByTokenId(oldAccessTokenId, connection);
}
IdentityDatabaseUtil.commitTransaction(connection);
tokenUpdateSuccessful = true;
} catch (SQLException e) {
IdentityDatabaseUtil.rollbackTransaction(connection);
String errorMsg = "Error while regenerating access token";
throw new IdentityOAuth2Exception(errorMsg, e);
} finally {
IdentityDatabaseUtil.closeConnection(connection);
}
if (tokenUpdateSuccessful) {
if (isTokenCleanupFeatureEnabled) {
Copy link

Copilot AI Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The condition has changed from checking if the token update was successful to checking if cleanup is enabled. This could cause post-refresh events to fire even when the database transaction failed and was rolled back, leading to inconsistent state.

Copilot uses AI. Check for mistakes.

// Post refresh access token event
if (StringUtils.equals(grantType, OAuthConstants.GrantTypes.CLIENT_CREDENTIALS) ||
StringUtils.equals(grantType, OAuthConstants.GrantTypes.PASSWORD)) {
Expand Down