Merge pull request #41 from Akila94/refresh-token-validity-period-issue

Fix refresh token validity period issue
wso2 · Nov 8, 2024 · 052671c · 052671c
2 parents e4d3d74 + f88861c
commit 052671c
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/...g/wso2/openbanking/cds/identity/grant/type/handlers/CDSAuthorizationCodeGrantHandler.java b/...g/wso2/openbanking/cds/identity/grant/type/handlers/CDSAuthorizationCodeGrantHandler.java
@@ -110,7 +110,7 @@ public void publishUserAccessTokenData(OAuth2AccessTokenRespDTO oAuth2AccessToke
      * @return
      */
     @Override
-    public boolean issueRefreshToken() throws IdentityOAuth2Exception {
+    public OAuth2AccessTokenRespDTO issue(OAuthTokenReqMessageContext tokReqMsgCtx) throws IdentityOAuth2Exception {
 
         OAuthTokenReqMessageContext tokenReqMessageContext = getTokenMessageContext();
 
@@ -124,10 +124,21 @@ public boolean issueRefreshToken() throws IdentityOAuth2Exception {
             if (log.isDebugEnabled()) {
                 log.debug("Refresh token validity period is set to: " + sharingDuration);
             }
-            // do not issue refresh token if sharing duration value equals to zero
-            if (sharingDuration == 0) {
-                return false;
-            }
+
+        }
+        return super.issue(tokReqMsgCtx);
+    }
+
+    @Override
+    public boolean issueRefreshToken() throws IdentityOAuth2Exception {
+
+        OAuthTokenReqMessageContext tokenReqMessageContext = getTokenMessageContext();
+        if (isRegulatory(tokenReqMessageContext)) {
+            long sharingDuration;
+            String[] scopes = tokenReqMessageContext.getScope();
+            String consentId = CDSIdentityUtil.getConsentId(scopes);
+            sharingDuration = CDSIdentityUtil.getRefreshTokenValidityPeriod(consentId);
+            return sharingDuration != 0;
         }
         return true;
     }