soajs.controller 4.2.38 → 4.2.40

package/README.md

@@ -38,6 +38,7 @@ Enabling CORS allows different domains to communicate with SOAJS via its gateway
 More information on the Controller is available on the website section [Controller](https://soajsorg.atlassian.net/wiki/x/loAwb)
 
 
+
 ### License
 *Copyright SOAJS All Rights Reserved.*
 

package/lib/apiPathParam2apiRegExp.js

@@ -15,12 +15,12 @@ const coreLibs = require("soajs.core.libs");
  * @param {Object} originalAclObj
  */
 module.exports = (originalAclObj) => {
-	
+
 	let aclObj = null;
 	if (originalAclObj) {
 		aclObj = coreLibs.utils.cloneObj(originalAclObj);
 	}
-	
+
 	/**
 	 * changes all tokens found in url with a regular expression
 	 * @param {String} route
@@ -28,14 +28,18 @@ module.exports = (originalAclObj) => {
 	 */
 	function constructRegExp(route) {
 		const { pathToRegexp } = require("path-to-regexp");
-		let keys = [];
-		let out = pathToRegexp(route, keys, {sensitive: true});
-		if (out && out.keys && out.keys.length > 0) {
-			out = new RegExp(out.toString());
+		// let keys = [];
+		// let out = pathToRegexp(route, keys, {sensitive: true});
+		let out = pathToRegexp(route, { sensitive: true });
+		if (out.regexp) {
+			return out.regexp;
 		}
+		// if (out && out.keys && out.keys.length > 0) {
+		// 	out = new RegExp(out.toString());
+		// }
 		return out;
 	}
-	
+
 	/**
 	 * check if the given route contains the path param attribute "/:"
 	 * @param {String} route
@@ -44,7 +48,7 @@ module.exports = (originalAclObj) => {
 	function isAttributeRoute(route) {
 		return route.includes("/:");
 	}
-	
+
 	/**
 	 * recursively loop in acl object,
 	 * fetch each entry and its sub entries
@@ -55,9 +59,9 @@ module.exports = (originalAclObj) => {
 	 * @param {string} currentSub
 	 */
 	function fetchSubObjectsAndReplace(ancestor, object, currentSub) {
-		
+
 		let current = (currentSub) ? object[currentSub] : object;
-		
+
 		/**
 		 * if current entry is an object and object has properties and property neither the first nor the last child in object
 		 * recursively loop on this child
@@ -66,7 +70,7 @@ module.exports = (originalAclObj) => {
 		if (currentSub && siblings.indexOf(currentSub) !== (siblings.length - 1)) {
 			fetchSubObjectsAndReplace(ancestor, object, siblings[siblings.indexOf(currentSub) + 1]);
 		}
-		
+
 		/**
 		 * if current entry is an object and object has properties
 		 * recursively loop on first child in object
@@ -77,32 +81,32 @@ module.exports = (originalAclObj) => {
 				fetchSubObjectsAndReplace(object, current, subObjects[0]);
 			}
 		}
-		
+
 		/**
 		 * if the the route has an attribute
 		 * copy all the info of apis[route]
 		 * create a new entry from copied information and push it to apisRegExp
 		 */
 		if (currentSub && isAttributeRoute(currentSub)) {
-			
+
 			let oldCurrentSub = currentSub;
-			
+
 			if (!ancestor.apisRegExp) {
 				ancestor.apisRegExp = [];
 			}
-			
+
 			let regExp = constructRegExp(currentSub);
 			let obj = object[oldCurrentSub];
 			obj.regExp = regExp;
 			ancestor.apisRegExp.push(obj);
-			
+
 			delete object[oldCurrentSub];
 		}
 	}
-	
+
 	if (aclObj && typeof aclObj === 'object' && Object.keys(aclObj).length > 0) {
 		fetchSubObjectsAndReplace(null, aclObj, null);
 	}
-	
+
 	return aclObj;
 };

package/mw/awareness/ha.js

@@ -240,7 +240,7 @@ let ha = {
 				return cb(hostname);
 			} else {
 				if (process.env.SOAJS_DEPLOY_HA === 'kubernetes' && serviceName && version) {
-					serviceName += "-v" + version + "-service";
+					// serviceName += "-v" + version + "-service";
 					return cb(env + "-" + serviceName + "-v" + version + "-service");
 				} else {
 					lib.getHostFromAPI(serviceName, version, cb);

package/mw/mt/index.js

@@ -325,6 +325,7 @@ module.exports = (configuration) => {
 																injectObj.awareness.interConnect.push(item);
 															} else {
 																req.soajs.log.debug(serviceName + " interConnect failed to fetch latestVersion for [" + item.name + "]");
+																injectObj.awareness.interConnect.push(item);
 															}
 															return callback();
 														});

package/mw/mt/utils.js

@@ -36,11 +36,15 @@ if (process.env.SOAJS_SENSITIVE_ENVS) {
 const { pathToRegexp } = require("path-to-regexp");
 
 function constructRegExp(route) {
-	let keys = [];
-	let out = pathToRegexp(route, keys, { sensitive: true });
-	if (out && out.keys && out.keys.length > 0) {
-		out = new RegExp(out.toString());
+	// let keys = [];
+	// let out = pathToRegexp(route, keys, { sensitive: true });
+	let out = pathToRegexp(route, { sensitive: true });
+	if (out.regexp) {
+		return out.regexp;
 	}
+	// if (out && out.keys && out.keys.length > 0) {
+	// 	out = new RegExp(out.toString());
+	// }
 	return out;
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.controller",
   "description": "soajs multi tenant API gateway",
-  "version": "4.2.38",
+  "version": "4.2.40",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"
@@ -27,17 +27,17 @@
     "merge": "2.1.1",
     "netmask": "2.0.2",
     "oauth2-server": "2.4.1",
-    "path-to-regexp": "6.2.2",
+    "path-to-regexp": "8.3.0",
     "soajs.core.libs": "1.2.1",
-    "soajs.core.modules": "5.2.15",
-    "soajs.urac.driver": "3.2.12",
+    "soajs.core.modules": "5.2.16",
+    "soajs.urac.driver": "3.2.13",
     "useragent": "2.3.0"
   },
   "devDependencies": {
-    "@babel/core": "7.27.1",
-    "@babel/plugin-transform-runtime": "7.27.1",
-    "@babel/preset-env": "7.27.2",
-    "@babel/runtime": "7.27.1",
+    "@babel/core": "7.28.4",
+    "@babel/plugin-transform-runtime": "7.28.3",
+    "@babel/preset-env": "7.28.3",
+    "@babel/runtime": "7.28.4",
     "express": "4.21.1",
     "grunt": "1.6.1",
     "grunt-babel": "8.0.0",
@@ -49,9 +49,9 @@
     "grunt-istanbul": "0.8.0",
     "grunt-jsdoc": "2.4.1",
     "grunt-mocha-test": "0.13.3",
-    "mocha": "11.5.0",
-    "nock": "14.0.4",
+    "mocha": "11.7.2",
+    "nock": "14.0.10",
     "request": "2.88.2",
-    "sinon": "20.0.0"
+    "sinon": "21.0.0"
   }
 }

package/test/unit/lib/apiPathParam2apiRegExp.js

@@ -26,6 +26,9 @@ describe("Unit test for: lib - apiPathParam2apiRegExp", function () {
                     },
                     "/refreshToken/:token": {
                         access: false
+                    },
+                    "/refreshToken/:token/user/:userId": {
+                        access: false
                     }
                 }
             }
@@ -34,6 +37,9 @@ describe("Unit test for: lib - apiPathParam2apiRegExp", function () {
     it("Vanilla test", function (done) {
         let response = lib(acl);
         assert.ok(response.oauth.delete.apisRegExp);
+        let _path = "/refreshToken/12242rde21sew/user/ed2ed23werd2wfd3"
+        let test = _path.match(response.oauth.delete.apisRegExp[0].regExp);
+        assert.ok(test);
         done();
     });
 });