soajs.controller 4.3.21 → 4.3.22

package/mw/soajsRoutes/keyACL/index.js

@@ -44,7 +44,7 @@ module.exports = (configuration) => {
 							if (finalACL[s] && finalACL[s].version) {
 								let version = coreLibs.version.getLatest(finalACL[s].version, v);
 								if (version !== v) {
-									break;
+									continue;
 								}
 							}
 							finalACL[s] = {
@@ -53,7 +53,7 @@ module.exports = (configuration) => {
 							if (sv.apisPermission && sv.apisPermission === "restricted") {
 								for (let m in sv) {
 									if (sv.hasOwnProperty(m)) {
-										if (m !== "access" || m !== "apisPermission") {
+										if (m !== "access" && m !== "apisPermission") {
 											if (sv[m].apis) {
 												for (let a in sv[m].apis) {
 													if (sv[m].apis.hasOwnProperty(a)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.controller",
   "description": "soajs multi tenant API gateway",
-  "version": "4.3.21",
+  "version": "4.3.22",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"
@@ -29,17 +29,17 @@
     "oauth2-server": "2.4.1",
     "path-to-regexp": "8.4.2",
     "soajs.core.libs": "1.2.2",
-    "soajs.core.modules": "5.2.21",
-    "soajs.urac.driver": "3.2.18",
+    "soajs.core.modules": "5.2.22",
+    "soajs.urac.driver": "3.2.20",
     "useragent": "2.3.0"
   },
   "devDependencies": {
-    "@babel/core": "7.29.0",
-    "@babel/plugin-transform-runtime": "7.29.0",
-    "@babel/preset-env": "7.29.0",
+    "@babel/core": "7.29.7",
+    "@babel/plugin-transform-runtime": "7.29.7",
+    "@babel/preset-env": "7.29.7",
     "@babel/runtime": "7.28.6",
-    "express": "5.2.1",
-    "grunt": "1.6.1",
+    "express": "5.3.0",
+    "grunt": "1.6.3",
     "grunt-babel": "8.0.0",
     "grunt-contrib-clean": "2.0.1",
     "grunt-contrib-copy": "1.0.0",

package/test/unit/index.js

@@ -36,6 +36,7 @@ describe("Starting Gateway Unit test", () => {
         require("./mw/oauth/index.js");
         require("./mw/response/index.js");
         require("./mw/soajs/index.js");
+        require("./mw/soajsRoutes/keyACL.js");
         require("./mw/traffic/index.js");
         require("./mw/idempotency/index.js");
         require("./mw/idempotency/memory.js");

package/test/unit/mw/soajsRoutes/keyACL.js

@@ -0,0 +1,105 @@
+"use strict";
+
+const helper = require("../../../helper.js");
+const mw = helper.requireModule('./mw/soajsRoutes/keyACL/index');
+const assert = require('assert');
+
+let configuration = {
+	core: {
+		error: {
+			getError: (code) => {
+				return {code: code};
+			}
+		}
+	},
+	serviceName: "controller",
+	serviceVersion: "1"
+};
+
+let getACL = (acl, cb) => {
+	let req = {
+		headers: {key: "extKey"},
+		soajs: {
+			registry: {services: {controller: {}}},
+			controller: {
+				serviceParams: {
+					keyObj: {
+						tenant: {id: "t1", name: "Tenant", code: "TNT", type: "product"},
+						application: {package: "PROD_PCK", acl: acl}
+					},
+					packObj: {}
+				}
+			},
+			log: {
+				debug: () => {
+				}
+			},
+			controllerResponse: (response) => {
+				return cb(response);
+			}
+		}
+	};
+	mw(configuration)(req, {}, () => {
+		req.soajs.controller.gotoservice(req);
+	});
+};
+
+describe("Unit test for: mw - soajsRoutes keyACL", () => {
+
+	it("Fail - no key", (done) => {
+		let req = {
+			headers: {},
+			soajs: {
+				controllerResponse: (response) => {
+					assert.deepStrictEqual(response, {code: 132});
+					done();
+				}
+			}
+		};
+		mw(configuration)(req, {}, () => {
+		});
+	});
+
+	it("Success - picks the latest version whatever the order of the versions", (done) => {
+		// integer keys are always walked in ascending order, decimal keys in insertion order
+		getACL({
+			"urac": {
+				"2.1": {"access": true},
+				"1.5": {"access": true},
+				"3.5": {"access": true}
+			}
+		}, (response) => {
+			assert.deepStrictEqual(response.finalACL, {"urac": {"version": "3.5"}});
+			assert.deepStrictEqual(response.packages, ["PROD_PCK"]);
+			assert.deepStrictEqual(response.tenant, {id: "t1", name: "Tenant", code: "TNT", type: "product"});
+			done();
+		});
+	});
+
+	it("Success - restricted lists the apis of the latest version per method", (done) => {
+		getACL({
+			"urac": {
+				"2": {
+					"access": true,
+					"apisPermission": "restricted",
+					"get": {"apis": {"/user": {}, "/users": {}}},
+					"post": {"apis": {"/user": {}}}
+				},
+				"1": {
+					"access": true,
+					"apisPermission": "restricted",
+					"delete": {"apis": {"/user": {}}}
+				}
+			}
+		}, (response) => {
+			assert.deepStrictEqual(response.finalACL, {
+				"urac": {
+					"version": "2",
+					"get": ["/user", "/users"],
+					"post": ["/user"]
+				}
+			});
+			done();
+		});
+	});
+});