address comments on PR

wso2-extensions · May 6, 2024 · 27c6d0b · 27c6d0b
1 parent e08bc9e
commit 27c6d0b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/...oauth2.dpop/src/main/java/org/wso2/carbon/identity/oauth2/dpop/cache/DPoPJKTCacheKey.java b/...oauth2.dpop/src/main/java/org/wso2/carbon/identity/oauth2/dpop/cache/DPoPJKTCacheKey.java
@@ -27,12 +27,13 @@ public class DPoPJKTCacheKey implements Serializable {
 
     private String cacheKeyString;
 
+    private static final long serialVersionUID = 5023478840178742769L;
+
     public DPoPJKTCacheKey(String clientId, String authzCode) {
 
         this.cacheKeyString = clientId + ":" + authzCode;
     }
 
-    private static final long serialVersionUID = 5023478840178742769L;
     public String getCacheKeyString() {
 
         return cacheKeyString;

diff --git a/...auth2.dpop/src/main/java/org/wso2/carbon/identity/oauth2/dpop/constant/DPoPConstants.java b/...auth2.dpop/src/main/java/org/wso2/carbon/identity/oauth2/dpop/constant/DPoPConstants.java
@@ -31,6 +31,7 @@ public class DPoPConstants {
     public static final String DPOP_ACCESS_TOKEN_HASH = "ath";
     public static final String DPOP_JWT_TYPE = "dpop+jwt";
     public static final String DPOP_TOKEN_TYPE = "DPoP";
+    public static final String EXPIRED_DPOP_PROOF = "Expired DPoP Proof";
     public static final String INVALID_DPOP_PROOF = "invalid_dpop_proof";
     public static final String INVALID_DPOP_ERROR = "Invalid DPoP Proof";
     public static final String INVALID_CLIENT = "invalid_client";

diff --git a/...entity.oauth2.dpop/src/main/java/org/wso2/carbon/identity/oauth2/dpop/dao/DPoPJKTDAO.java b/...entity.oauth2.dpop/src/main/java/org/wso2/carbon/identity/oauth2/dpop/dao/DPoPJKTDAO.java
@@ -21,7 +21,7 @@
 import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
 
 /**
- * Data Access Object Interface for DPoP JKT
+ * Data Access Object Interface for DPoP JKT.
  */
 public interface DPoPJKTDAO  {
 

diff --git a/...th2.dpop/src/main/java/org/wso2/carbon/identity/oauth2/dpop/handler/DPoPEventHandler.java b/...th2.dpop/src/main/java/org/wso2/carbon/identity/oauth2/dpop/handler/DPoPEventHandler.java
@@ -24,7 +24,6 @@
 import org.wso2.carbon.identity.event.IdentityEventException;
 import org.wso2.carbon.identity.event.event.Event;
 import org.wso2.carbon.identity.event.handler.AbstractEventHandler;
-import org.wso2.carbon.identity.oauth.cache.OAuthCache;
 import org.wso2.carbon.identity.oauth.cache.SessionDataCache;
 import org.wso2.carbon.identity.oauth.cache.SessionDataCacheEntry;
 import org.wso2.carbon.identity.oauth.cache.SessionDataCacheKey;
@@ -75,7 +74,7 @@ public void handleEvent(Event event) throws IdentityEventException {
                         DPoPJKTDAOImpl dpopJKTDAO = new DPoPJKTDAOImpl();
                         dpopJKTDAO.insertDPoPJKT(consumerKey, codeId, dpopJkt);
                         // Persist dpop_jkt in the cache
-                        if (OAuthCache.getInstance().isEnabled()) {
+                        if (DPoPJKTCache.getInstance().isEnabled()) {
                             DPoPJKTCacheKey dPoPJKTCacheKey = new DPoPJKTCacheKey(consumerKey,
                                     dpopJKTDAO.getAuthzCodeFromCodeId(codeId));
                             DPoPJKTCacheEntry dPoPJKTCacheEntry = new DPoPJKTCacheEntry(dpopJkt);
@@ -87,7 +86,7 @@ public void handleEvent(Event event) throws IdentityEventException {
                         }
                     }
                 } catch (InvalidOAuthClientException | IdentityOAuth2Exception e) {
-                    log.error("Error while persisting dpop_jkt in the DB for the client id : " + consumerKey, e);
+                    log.error("Error while persisting dpop_jkt for the client id : " + consumerKey, e);
                     throw new IdentityEventException(DPoPConstants.INVALID_CLIENT, DPoPConstants.INVALID_CLIENT_ERROR);
                 }
             }

diff --git a/...pop/src/main/java/org/wso2/carbon/identity/oauth2/dpop/internal/DPoPServiceComponent.java b/...pop/src/main/java/org/wso2/carbon/identity/oauth2/dpop/internal/DPoPServiceComponent.java
@@ -55,8 +55,8 @@ public class DPoPServiceComponent {
     protected void activate(ComponentContext context) {
 
 
-        //TODO: Remove true and replace with the actual table check
-        boolean isAvailableTable = true; //&& IdentityDatabaseUtil.isTableExists(DPOP_JKT_TABLE_NAME);
+        //TODO: Remove false and replace with the actual table check
+        boolean isAvailableTable = false; //IdentityDatabaseUtil.isTableExists(DPOP_JKT_TABLE_NAME);
         if (log.isDebugEnabled()) {
             log.debug(DPOP_JKT_TABLE_NAME + " table is " + (isAvailableTable ? " " : "not ") + "available" +
                     "Setting isDPoPJKTTableEnabled to " + isAvailableTable);