soajs.controller 4.2.18 → 4.2.20

package/mw/awareness/ha.js

@@ -24,7 +24,7 @@ let awarenessCache = {};
 
 let lib = {
 	"getInfraToken": (envCode, cb) => {
-		registryModule.loadByEnv({envCode: envCode}, (err, envRecord) => {
+		registryModule.loadByEnv({ envCode: envCode }, (err, envRecord) => {
 			if (err) {
 				return cb(err);
 			}
@@ -55,7 +55,7 @@ let lib = {
 			}
 		});
 	},
-	
+
 	"getHostFromCache": function (serviceName, version) {
 		if (awarenessCache[serviceName] &&
 			awarenessCache[serviceName][version] &&
@@ -63,10 +63,10 @@ let lib = {
 			param.log.debug('Got ' + serviceName + ' - ' + version + ' - ' + awarenessCache[serviceName][version].host + ' from awareness cache');
 			return awarenessCache[serviceName][version].host;
 		}
-		
+
 		return null;
 	},
-	
+
 	"getHostFromAPI": function (serviceName, version, cb) {
 		if (!version) {
 			lib.getInfraToken(regEnvironment, (error, configuration) => {
@@ -94,7 +94,7 @@ let lib = {
 		} else {
 			getHost(version);
 		}
-		
+
 		function getHost(version) {
 			lib.getInfraToken(regEnvironment, (error, configuration) => {
 				if (error) {
@@ -105,7 +105,7 @@ let lib = {
 				let options = null;
 				let input = {
 					"configuration": configuration,
-					"item": {"name": serviceName, "version": version, "env": regEnvironment}
+					"item": { "name": serviceName, "version": version, "env": regEnvironment }
 				};
 				param.infraModule.kubernetes.get.host(param, input, options, (error, host) => {
 					if (error) {
@@ -126,7 +126,7 @@ let lib = {
 			});
 		}
 	},
-	
+
 	"rebuildAwarenessCache": function () {
 		lib.getInfraToken(regEnvironment, (error, configuration) => {
 			if (error) {
@@ -155,11 +155,11 @@ let lib = {
 					if (oneService.metadata.labels && oneService.metadata.labels['soajs.service.version']) {
 						version = oneService.metadata.labels['soajs.service.version'];
 					}
-					
+
 					if (oneService.metadata.labels && oneService.metadata.labels['soajs.service.name']) {
 						serviceName = oneService.metadata.labels['soajs.service.name'];
 					}
-					
+
 					if (!serviceName) {
 						return callback();
 					}
@@ -177,7 +177,7 @@ let lib = {
 					awarenessCache = myCache;
 					param.log.debug("Awareness cache rebuilt successfully");
 					param.log.debug(JSON.stringify(awarenessCache));
-					
+
 					let cacheTTL = registryModule.get().serviceConfig.awareness.cacheTTL;
 					if (cacheTTL) {
 						if (timeout) {
@@ -197,7 +197,7 @@ let ha = {
 		param = _param;
 		lib.rebuildAwarenessCache();
 	},
-	
+
 	"getServiceHost": function () {
 		let env = regEnvironment;
 		let serviceName = param.serviceName, version = null, cb = arguments[arguments.length - 1];
@@ -206,20 +206,20 @@ let ha = {
 			case 2:
 				serviceName = arguments[0];
 				break;
-			
+
 			//controller, 1, cb
 			case 3:
 				serviceName = arguments[0];
 				version = arguments[1];
 				break;
-			
+
 			//controller, 1, dash, cb [dash is ignored]
 			case 4:
 				serviceName = arguments[0];
 				version = arguments[1];
 				break;
 		}
-		
+
 		if (serviceName === param.serviceName) {
 			if (process.env.SOAJS_DEPLOY_HA === 'kubernetes') {
 				serviceName += "-v" + param.serviceVersion + "-service";
@@ -239,16 +239,21 @@ let ha = {
 			if (hostname) {
 				return cb(hostname);
 			} else {
-				lib.getHostFromAPI(serviceName, version, cb);
+				if (process.env.SOAJS_DEPLOY_HA === 'kubernetes' && serviceName && version) {
+					serviceName += "-v" + version + "-service";
+					return cb(env + "-" + serviceName + "-v" + version + "-service");
+				} else {
+					lib.getHostFromAPI(serviceName, version, cb);
+				}
 			}
 		}
 	},
-	
+
 	"getLatestVersion": function (name, cb) {
 		if (!awarenessCache[name]) {
 			return cb(null);
 		}
-		
+
 		let serviceVersions = Object.keys(awarenessCache[name]);
 		if (serviceVersions.length === 0) {
 			return cb(null);
@@ -263,7 +268,7 @@ let ha = {
 			return cb(null);
 		}
 	},
-	
+
 	"getLatestVersionFromCluster": function (name, cb) {
 		lib.getInfraToken(regEnvironment, (error, configuration) => {
 			if (error) {

package/mw/gotoService/redirectToService.js

@@ -41,13 +41,14 @@ module.exports = (configuration) => {
 			try {
 				let log_monitor = (doc) => {
 					let soamonitor = "soamonitor";
+					let soamonitorVersion = "1";
 					let port = get(["registry", "services", "soamonitor", "port"], req.soajs);
 					if (!port) {
 						port = "4050";
 					}
 					let api = "/monitor/item";
 
-					req.soajs.awareness.getHost(soamonitor, function (host) {
+					req.soajs.awareness.getHost(soamonitor, soamonitorVersion, function (host) {
 						if (!host) {
 							req.soajs.log.error('Unable to find any healthy host for service ' + soamonitor);
 						} else {

package/mw/soajsRoutes/keyACL/index.js

@@ -12,7 +12,7 @@ const coreLibs = require("soajs.core.libs");
 
 module.exports = (configuration) => {
 	let core = configuration.core;
-	
+
 	let return_SOAJS_keyACL = (req) => {
 		let ACL = null;
 		let ALLOWED_PACKAGES = null;
@@ -73,21 +73,47 @@ module.exports = (configuration) => {
 				}
 			}
 		}
+
+		let urac = null;
+		if (req.soajs.uracDriver) {
+			let uracObj = req.soajs.uracDriver.getProfile();
+			if (uracObj) {
+				urac = {
+					"_id": uracObj._id
+				};
+			}
+		}
+
+		let tenant = null;
+		let keyObj = req.soajs.controller.serviceParams.keyObj;
+		if (keyObj && keyObj.application && keyObj.application.package) {
+			tenant = {
+				"id": keyObj.tenant.id,
+				"name": keyObj.tenant.name,
+				"code": keyObj.tenant.code,
+				// "locked": keyObj.tenant.locked,
+				// "roaming": data.req.soajs.tenant.roaming,
+				"type": keyObj.tenant.type
+			};
+		}
+
 		let response = {
 			"acl": ACL,
 			"finalACL": finalACL,
-			"packages": ALLOWED_PACKAGES
+			"packages": ALLOWED_PACKAGES,
+			"urac": urac,
+			"tenant": tenant
 		};
 		return req.soajs.controllerResponse(response);
 	};
-	
+
 	return (req, res, next) => {
-		
+
 		//doesn't work without a key in the headers
 		if (!req.headers || !req.headers.key) {
 			return req.soajs.controllerResponse(core.error.getError(132));
 		}
-		
+
 		//mimic a service named controller with route /key/permission/get
 		let serviceName = configuration.serviceName;
 		req.soajs.controller.serviceParams.registry = req.soajs.registry.services[serviceName];
@@ -112,10 +138,10 @@ module.exports = (configuration) => {
 				]
 			}
 		};
-		
+
 		//assign the correct method to gotoservice in controller
 		req.soajs.controller.gotoservice = return_SOAJS_keyACL;
 		return next();
-		
+
 	};
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.controller",
   "description": "soajs multi tenant API gateway",
-  "version": "4.2.18",
+  "version": "4.2.20",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"

package/test/integration/UC1-gateway-routes/index.js

@@ -84,6 +84,7 @@ describe("Integration for Usecase 1", function () {
 			}
 		};
 		requester('get', options, (error, body) => {
+			assert.ok(body.finalACL);
 			assert.ok(body.acl);
 			done();
 		});