Merge pull request #1324 from AmaliMatharaarachchi/version_all

Fix version * subscribed apis validation
wso2 · Jul 16, 2020 · bd44eb7 · bd44eb7
2 parents 9603fbd + cb2fe14
commit bd44eb7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/components/micro-gateway-core/src/main/ballerina/src/gateway/handlers/jwt_auth_handler.bal b/components/micro-gateway-core/src/main/ballerina/src/gateway/handlers/jwt_auth_handler.bal
@@ -223,7 +223,8 @@ public function getAPIDetails(jwt:JwtPayload payload, string apiName, string api
             int index = 0;
             while (index < l) {
                 var subscription = subscribedAPIList[index];
-                if (subscription.name.toString() == apiName && subscription.'version.toString() == apiVersion) {
+                if (subscription.name.toString() == apiName && 
+                (subscription.'version.toString() == apiVersion || subscription.'version.toString() == "*")) {
                     // API is found in the subscribed APIs
                     if (isDebugEnabled) {
                         printDebug(KEY_JWT_AUTH_PROVIDER, "Found the API in subscribed APIs:" + subscription.name.toString()
@@ -233,7 +234,7 @@ public function getAPIDetails(jwt:JwtPayload payload, string apiName, string api
                         apiDetails["apiName"] = subscription.name.toString();
                     }
                     if (subscription.'version is json) {
-                        apiDetails["apiVersion"] = subscription.'version.toString();
+                        apiDetails["apiVersion"] = apiVersion;
                     }
                     if (subscription.context is json) {
                         apiDetails["apiContext"] = subscription.context.toString();

diff --git a/components/micro-gateway-core/src/main/ballerina/src/gateway/utils/jwt_util.bal b/components/micro-gateway-core/src/main/ballerina/src/gateway/utils/jwt_util.bal
@@ -149,7 +149,8 @@ public function handleSubscribedAPIs(string apiKeyToken, jwt:JwtPayload payload,
         int index = 0;
         while (index < l) {
             var subscription = subscribedAPIList[index];
-            if (subscription.name.toString() == apiName && subscription.'version.toString() == apiVersion) {
+            if (subscription.name.toString() == apiName && 
+            (subscription.'version.toString() == apiVersion || subscription.'version.toString() == "*")) {
                 // Successfully validated the API. Then set authenticated to true.
                 authenticationContext.authenticated = true;
                 if (isDebugEnabled) { 
@@ -183,6 +184,7 @@ public function handleSubscribedAPIs(string apiKeyToken, jwt:JwtPayload payload,
             index += 1;
         }
     }
+    printDebug(JWT_UTIL, "matching API is not found as subscribed API");
     if (isDebugEnabled) { 
         printDebug(JWT_UTIL, "Set username : " + authenticationContext.username + ", keytype : " 
         + authenticationContext.keyType + ", consumer key : " + authenticationContext.consumerKey