Add a log to indicate subscription validation failures

wso2 · Dec 19, 2023 · 5d66316 · 5d66316
1 parent c0d0d97
commit 5d66316
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/...parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/KeyValidator.java b/...parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/KeyValidator.java
@@ -160,20 +160,20 @@ public static APIKeyValidationInfoDTO validateSubscription(APIConfig apiConfig,
                             String apiContextTemplate = apiContext.substring(0, lastIndexOfVersion);
                             sub = datastore.getSubscriptionByAppIdApiContextVersionRange(app.getUUID(),
                                     apiContextTemplate, "v" + apiSemVersion.getMajor());
-                            if (sub == null) {
-                                log.info(
-                                        "Valid subscription not found for oauth access token. application:" +
-                                                " {} app_UUID: {} API_Context:API_Version: {} API_UUID : {}",
-                                        app.getName(), app.getUUID(), apiContext + ":" + apiVersion, uuid);
-                            } else {
-                                log.debug("All information is retrieved from the in-memory data store.");
-                            }
                         } catch (EnforcerException e) {
                             log.debug("API version: {} is not a valid semantic version", apiVersion);
                         }
                     } else {
                         log.debug("All information is retrieved from the in-memory data store.");
                     }
+                    if (sub == null) {
+                        log.info(
+                                "Valid subscription not found for oauth access token. application:" +
+                                        " {} app_UUID: {} API_Context:API_Version: {} API_UUID : {}",
+                                app.getName(), app.getUUID(), apiContext + ":" + apiVersion, uuid);
+                    } else {
+                        log.debug("All information is retrieved from the in-memory data store.");
+                    }
                 } else {
                     log.info("Application not found in the data store for uuid " + key.getApplicationUUID());
                 }