From 7d2dc4b5dc9f67643b0769cf3631cc031664bf99 Mon Sep 17 00:00:00 2001 From: Ashan Thamara Palihakkara <75057725+ashanthamara@users.noreply.github.com> Date: Thu, 5 Sep 2024 23:11:36 +0530 Subject: [PATCH] Fix resolving expires_in claim name in pre-issue-access-token execution --- .../action/PreIssueAccessTokenResponseProcessor.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java index 2ff54fb506..c174599c8c 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java @@ -144,7 +144,7 @@ private void updateTokenMessageContext(OAuthTokenReqMessageContext tokenMessageC tokenMessageContext.setScope(responseAccessToken.getScopes().toArray(new String[0])); - String expiresInClaimName = CLAIMS_PATH_PREFIX + AccessToken.ClaimNames.EXPIRES_IN.getName(); + String expiresInClaimName = AccessToken.ClaimNames.EXPIRES_IN.getName(); responseAccessToken.getClaims().stream() .filter(claim -> expiresInClaimName.equals(claim.getName())) .findFirst() @@ -533,10 +533,8 @@ private OperationExecutionResult replaceExpiresIn(PerformableOperation operation } responseAccessToken.getClaims().removeIf( - claim -> claim.getName() - .equals(CLAIMS_PATH_PREFIX + AccessToken.ClaimNames.EXPIRES_IN.getName())); - responseAccessToken.addClaim(CLAIMS_PATH_PREFIX + AccessToken.ClaimNames.EXPIRES_IN.getName(), - expiresIn); + claim -> claim.getName().equals(AccessToken.ClaimNames.EXPIRES_IN.getName())); + responseAccessToken.addClaim(AccessToken.ClaimNames.EXPIRES_IN.getName(), expiresIn); return new OperationExecutionResult(operation, OperationExecutionResult.Status.SUCCESS, "Expiry time updated."); }