Merge pull request #271 from sadilchamishka/fix-refresh-token-issue

Improve authentication valve
wso2-extensions · Feb 22, 2024 · 7550ffd · 7550ffd
2 parents a56ff41 + bbb9c9e
commit 7550ffd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...ain/java/org/wso2/carbon/identity/auth/service/handler/impl/OAuth2AccessTokenHandler.java b/...ain/java/org/wso2/carbon/identity/auth/service/handler/impl/OAuth2AccessTokenHandler.java
@@ -49,6 +49,7 @@
 import org.wso2.carbon.identity.oauth2.model.AccessTokenDO;
 import org.wso2.carbon.identity.oauth2.token.bindings.TokenBinding;
 import org.wso2.carbon.identity.oauth2.util.OAuth2Util;
+import org.wso2.carbon.identity.oauth2.validators.RefreshTokenValidator;
 
 import java.util.Optional;
 
@@ -118,7 +119,8 @@ protected AuthenticationResult doAuthenticate(MessageContext messageContext) {
                 IdentityUtil.threadLocalProperties.get()
                         .put(AUTHENTICATION_TYPE, oAuth2IntrospectionResponseDTO.getAut());
 
-                if (!oAuth2IntrospectionResponseDTO.isActive()) {
+                if (!oAuth2IntrospectionResponseDTO.isActive() ||
+                        RefreshTokenValidator.TOKEN_TYPE_NAME.equals(oAuth2IntrospectionResponseDTO.getTokenType())) {
                     return authenticationResult;
                 }
 

diff --git a/pom.xml b/pom.xml
@@ -353,7 +353,7 @@
         <identity.framework.version>5.25.652</identity.framework.version>
         <carbon.identity.package.import.version.range>[5.17.8, 8.0.0)</carbon.identity.package.import.version.range>
 
-        <org.wso2.carbon.identity.oauth.version>6.11.168</org.wso2.carbon.identity.oauth.version>
+        <org.wso2.carbon.identity.oauth.version>7.0.18</org.wso2.carbon.identity.oauth.version>
         <org.wso2.carbon.identity.oauth.import.version.range>[6.2.18, 8.0.0)
         </org.wso2.carbon.identity.oauth.import.version.range>