Only send descriptor values if ratelimit tier specified in subscription

wso2 · Oct 15, 2024 · 2599de5 · 2599de5
1 parent 60372dd
commit 2599de5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...o2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/jwt/APIKeyAuthenticator.java b/...o2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/jwt/APIKeyAuthenticator.java
@@ -306,7 +306,7 @@ private AuthenticationContext processAPIKey(RequestContext requestContext, Strin
                         String versionToMatch = requestContext.getMatchedAPI().getVersion();
                         Matcher matcher = pattern.matcher(versionToMatch);
                         if (matcher.matches()) {
-                            if (!"Unlimited".equals(subscription.getRatelimitTier())) {
+                            if (!"Unlimited".equals(subscription.getRatelimitTier()) && subscription.getRatelimitTier() != null && !subscription.getRatelimitTier().isEmpty()) {
                                 String subscriptionId = subscription.getSubscribedApi().getName() + ":" +
                                         app.getUUID() + subscription.getSubscriptionId();
                                 requestContext.addMetadataToMap("ratelimit:subscription", subscriptionId);

diff --git a/...o2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/jwt/Oauth2Authenticator.java b/...o2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/jwt/Oauth2Authenticator.java
@@ -270,7 +270,7 @@ public AuthenticationContext authenticate(RequestContext requestContext) throws
                                 String versionToMatch = requestContext.getMatchedAPI().getVersion();
                                 Matcher matcher = pattern.matcher(versionToMatch);
                                 if (matcher.matches()) {
-                                    if (!"Unlimited".equals(subscription.getRatelimitTier())) {
+                                    if (!"Unlimited".equals(subscription.getRatelimitTier()) && subscription.getRatelimitTier() != null && !subscription.getRatelimitTier().isEmpty()) {
                                         String subscriptionId = subscription.getSubscribedApi().getName() + ":" +
                                                 applicationId + subscription.getSubscriptionId();
                                         requestContext.addMetadataToMap("ratelimit:subscription", subscriptionId);