diff --git a/components/org.wso2.carbon.identity.auth.service/src/main/java/org/wso2/carbon/identity/auth/service/handler/impl/OAuth2AccessTokenHandler.java b/components/org.wso2.carbon.identity.auth.service/src/main/java/org/wso2/carbon/identity/auth/service/handler/impl/OAuth2AccessTokenHandler.java index b4e8167d..060d21be 100644 --- a/components/org.wso2.carbon.identity.auth.service/src/main/java/org/wso2/carbon/identity/auth/service/handler/impl/OAuth2AccessTokenHandler.java +++ b/components/org.wso2.carbon.identity.auth.service/src/main/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 index 04336d8b..af71118c 100644 --- a/pom.xml +++ b/pom.xml @@ -353,7 +353,7 @@ 5.25.652 [5.17.8, 8.0.0) - 6.11.168 + 7.0.18 [6.2.18, 8.0.0)