Revert "Update the cached token info so it indicate if the token is a…

…n OBO on…" This reverts commit fd249e1.
ORCID · Feb 6, 2025 · bbb9e40 · bbb9e40
1 parent 14c0b89
commit bbb9e40
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 52 deletions.
diff --git a/orcid-api-common/src/main/java/org/orcid/api/common/filter/OboApiVersionCheckFilter.java b/orcid-api-common/src/main/java/org/orcid/api/common/filter/OboApiVersionCheckFilter.java
@@ -1,43 +1,30 @@
 package org.orcid.api.common.filter;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.regex.Matcher;
 
+import javax.inject.Inject;
+import javax.inject.Named;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
 import javax.ws.rs.ext.Provider;
 
-import org.apache.commons.lang3.StringUtils;
-import org.orcid.core.constants.OrcidOauth2Constants;
 import org.orcid.core.exception.OboNotValidForApiVersionException;
 import org.orcid.core.oauth.OrcidOauth2TokenDetailService;
-import org.orcid.core.utils.JsonUtils;
-import org.orcid.core.utils.cache.redis.RedisClient;
 import org.orcid.persistence.jpa.entities.OrcidOauth2TokenDetail;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.provider.OAuth2Authentication;
 import org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationDetails;
-import org.springframework.stereotype.Component;
 
 
-@Component
 @Provider
 public class OboApiVersionCheckFilter implements ContainerRequestFilter {
 
     @Autowired
     private OrcidOauth2TokenDetailService orcidOauth2TokenService;
-
-    @Autowired
-    private RedisClient redisClient;
-
-    @Value("${org.orcid.core.utils.cache.redis.enabled:true}")
-    private boolean isTokenCacheEnabled;
-
+
     @Override
     public void filter(ContainerRequestContext request) {
         String version = getApiVersion(request);
@@ -57,19 +44,9 @@ private boolean isOboRequest() {
             Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
             if (OAuth2Authentication.class.isAssignableFrom(authentication.getClass())) {
                 OAuth2AuthenticationDetails authDetails = (OAuth2AuthenticationDetails) ((OAuth2Authentication) authentication).getDetails();
-                if (authDetails != null && authDetails.getTokenValue() != null) {
-                    Map<String, String> cachedAccessToken = getTokenFromCache(authDetails.getTokenValue());
-                    if(cachedAccessToken != null) {
-                        if(cachedAccessToken.containsKey(OrcidOauth2Constants.IS_OBO_TOKEN)) {
-                            return true;
-                        }
-                    } else {
-                        // Fallback to database if it is not in the cache
-                        OrcidOauth2TokenDetail tokenDetail = orcidOauth2TokenService.findIgnoringDisabledByTokenValue(authDetails.getTokenValue());
-                        if(tokenDetail != null) {
-                            return tokenDetail.getOboClientDetailsId() != null;
-                        }
-                    }
+                if (authDetails != null && authDetails.getTokenValue() != null) { 
+                    OrcidOauth2TokenDetail tokenDetail = orcidOauth2TokenService.findIgnoringDisabledByTokenValue(authDetails.getTokenValue());
+                    return tokenDetail.getOboClientDetailsId() != null;
                 }
             }
         }
@@ -85,14 +62,4 @@ private String getApiVersion(ContainerRequestContext request) {
         return null;
     }
 
-    private Map<String, String> getTokenFromCache(String accessTokenValue) {
-        if(isTokenCacheEnabled) {
-            String tokenJsonInfo = redisClient.get(accessTokenValue);
-            if(StringUtils.isNotBlank(tokenJsonInfo)) {
-                return JsonUtils.readObjectFromJsonString(tokenJsonInfo, HashMap.class);
-            }
-        }
-        return null;
-    }
-
 }
diff --git a/.../src/main/java/org/orcid/api/common/oauth/OrcidClientCredentialEndPointDelegatorImpl.java b/.../src/main/java/org/orcid/api/common/oauth/OrcidClientCredentialEndPointDelegatorImpl.java
@@ -25,7 +25,6 @@
 import org.orcid.persistence.dao.ProfileLastModifiedDao;
 import org.orcid.persistence.jpa.entities.IndexingStatus;
 import org.orcid.persistence.jpa.entities.OrcidOauth2AuthoriziationCodeDetail;
-import org.orcid.persistence.jpa.entities.OrcidOauth2TokenDetail;
 import org.orcid.pojo.ajaxForm.PojoUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -192,9 +191,6 @@ protected void setToCache(String clientId, OAuth2AccessToken accessToken) {
                 tokenData.put(OrcidOauth2Constants.CLIENT_ID, clientId);
                 tokenData.put(OrcidOauth2Constants.RESOURCE_IDS, OrcidOauth2Constants.ORCID);
                 tokenData.put(OrcidOauth2Constants.APPROVED, Boolean.TRUE.toString());
-                if(accessToken.getAdditionalInformation().containsKey(OrcidOauth2Constants.IS_OBO_TOKEN)) {
-                    tokenData.put(OrcidOauth2Constants.IS_OBO_TOKEN, Boolean.TRUE.toString());
-                }
                 redisClient.set(tokenValue, JsonUtils.convertToJsonString(tokenData));
             } catch(Exception e) {
                 LOGGER.info("Unable to set token in Redis cache", e);

diff --git a/orcid-core/src/main/java/org/orcid/core/constants/OrcidOauth2Constants.java b/orcid-core/src/main/java/org/orcid/core/constants/OrcidOauth2Constants.java
@@ -13,7 +13,6 @@ public class OrcidOauth2Constants {
     public static final String GRANT_TYPE_CLIENT_CREDENTIALS = "client_credentials";
     public static final String DATE_CREATED = "date_created";
     public static final String CLIENT_ID = "client_id";
-    public static final String IS_OBO_TOKEN = "is_obo_token";
     public static final String ORCID = "orcid";
     public static final String NAME = "name";
     public static final String CLIENT_ID_PARAM = "client_id";

diff --git a/orcid-core/src/main/java/org/orcid/core/oauth/IETFTokenExchangeResponse.java b/orcid-core/src/main/java/org/orcid/core/oauth/IETFTokenExchangeResponse.java
@@ -14,7 +14,6 @@
 import com.nimbusds.jwt.SignedJWT;
 
 import static org.orcid.core.constants.OrcidOauth2Constants.TOKEN_DISABLED;
-import static org.orcid.core.constants.OrcidOauth2Constants.IS_OBO_TOKEN;
 
 public class IETFTokenExchangeResponse implements OAuth2AccessToken {
 
@@ -53,10 +52,6 @@ public static  IETFTokenExchangeResponse accessToken(OAuth2AccessToken accessTok
         if(accessToken.getAdditionalInformation().containsKey(TOKEN_DISABLED)) {
             token.additionalInformation.put(TOKEN_DISABLED, "true");
         }
-        if(accessToken.getAdditionalInformation().containsKey(IS_OBO_TOKEN)) {
-            token.additionalInformation.put(IS_OBO_TOKEN, "true");
-        }
-
         return token;
     }
 

diff --git a/orcid-core/src/main/java/org/orcid/core/oauth/service/OrcidTokenStoreServiceImpl.java b/orcid-core/src/main/java/org/orcid/core/oauth/service/OrcidTokenStoreServiceImpl.java
@@ -145,9 +145,6 @@ public void storeAccessToken(OAuth2AccessToken token, OAuth2Authentication authe
         orcidOauthTokenDetailService.createNew(detail);
         // Set the token id in the additional details
         token.getAdditionalInformation().put(OrcidOauth2Constants.TOKEN_ID, detail.getId());
-        if(detail.getOboClientDetailsId() != null) {
-            token.getAdditionalInformation().put(OrcidOauth2Constants.IS_OBO_TOKEN, "true");
-        }
     }
 
     /**