soajs.controller 4.0.51 → 4.1.0

package/mw/maintenanceMode/index.js

@@ -0,0 +1,27 @@
+'use strict';
+
+/**
+ * @license
+ * Copyright SOAJS All Rights Reserved.
+ *
+ * Use of this source code is governed by an Apache license that can be
+ * found in the LICENSE file at the root of this repository
+ */
+
+const get = (p, o) => p.reduce((xs, x) => (xs && xs[x]) ? xs[x] : null, o);
+
+module.exports = () => {
+
+	return (req, res, next) => {
+
+		let maintenanceMode = get(["registry", "custom", "gateway", "value", "maintenanceMode"], req.soajs);
+		if (maintenanceMode && maintenanceMode.on) {
+			req.soajs.controllerResponse({
+				'status': maintenanceMode.status || 503,
+				'msg': maintenanceMode.message || "Maintenance mode is on, come back soon"
+			});
+		} else {
+			return next();
+		}
+	};
+};

package/mw/mt/index.js

@@ -157,6 +157,9 @@ module.exports = (configuration) => {
 										if (err && err.message) {
 											req.soajs.log.error(err.message);
 										}
+										if (err && err.name === "OAuth2Error") {
+											return next(err);
+										}
 										//doesn't work if you are not logged in
 										return next(158);
 									} else {

package/mw/mt/urac.js

@@ -32,14 +32,17 @@ function Urac(param) {
 			}
 			if (param.oauth.bearerToken.user.loginMode === "oauth") {
 				_self.userRecord = param.oauth.bearerToken.user;
-			}
-			else if (_self.soajs.registry.serviceConfig.oauth.getUserFromToken) {
+			} else if (_self.soajs.registry.serviceConfig.oauth.getUserFromToken) {
 				// NOTE:
 				// if roaming, must load again user
 				// if the clientId is not the same as _self.soajs.tenant.id then we should get the record
 				if (!_self.soajs.tenant.roaming && (param.oauth.bearerToken.clientId === _self.soajs.tenant.id)) {
 					_self.userRecord = param.oauth.bearerToken.user;
 				}
+			} else {
+				if (_self.soajs.tenant.roaming) {
+					_self.userRecord = param.oauth.bearerToken.user;
+				}
 			}
 		} else if (param._id) {
 			_self.id = param._id;
@@ -248,4 +251,4 @@ Urac.prototype.getAllowedPackages = function () {
 	return allowedPackages;
 };
 
-module.exports = Urac;
+module.exports = Urac;

package/mw/mt/utils.js

@@ -586,10 +586,10 @@ let utils = {
 		if (obj.skipOAUTH) {
 			return cb(null, obj);
 		}
-		let callURACDriver = function () {
+		let callURACDriver = function (roaming) {
 			obj.req.soajs.uracDriver = new UracDriver({"soajs": obj.req.soajs, "oauth": obj.req.oauth});
 			obj.req.soajs.uracDriver.init((error) => {
-				if (error) {
+				if (error && !roaming) {
 					obj.req.soajs.log.error(error.message);
 					return cb (146);
 				}
@@ -674,11 +674,10 @@ let utils = {
 					if (response.registry && response.registry.tenantMetaDB) {
 						obj.req.soajs.tenant.roaming.tenantMetaDB = response.registry.tenantMetaDB;
 					}
-					
-					return callURACDriver();
+					return callURACDriver(true);
 				});
 			} else {
-				return callURACDriver();
+				return callURACDriver(false);
 			}
 		} else {
 			return cb(null, obj);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.controller",
   "description": "soajs multi tenant API gateway",
-  "version": "4.0.51",
+  "version": "4.1.0",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"
@@ -18,7 +18,7 @@
     "test": "grunt test"
   },
   "dependencies": {
-    "async": "3.2.2",
+    "async": "3.2.4",
     "connect": "3.7.0",
     "http-proxy": "1.18.1",
     "jsonwebtoken": "8.5.1",
@@ -30,8 +30,8 @@
     "path-to-regexp": "6.2.0",
     "request": "2.88.2",
     "soajs.core.libs": "1.2.0",
-    "soajs.core.modules": "5.0.23",
-    "soajs.urac.driver": "3.0.25",
+    "soajs.core.modules": "5.1.2",
+    "soajs.urac.driver": "3.1.2",
     "useragent": "2.3.0"
   },
   "devDependencies": {

package/server/controller.js

@@ -27,6 +27,7 @@ const favicon_mw = require('../mw/favicon/index');
 const cors_mw = require('../mw/cors/index');
 const soajs_mw = require('../mw/soajs/index');
 const response_mw = require('../mw/response/index');
+const maintenanceMode_mw = require('../mw/maintenanceMode/index');
 const enhancer_mw = require('../mw/enhancer/index');
 const awareness_mw = require('../mw/awareness/index');
 const awarenessEnv_mw = require("../mw/awarenessEnv/index");
@@ -85,6 +86,7 @@ Controller.prototype.init = function (callback) {
 			}));
 			app.use(cors_mw());
 			app.use(response_mw({"controllerResponse": true}));
+			app.use(maintenanceMode_mw()); //NOTE: this is for global maintenance mode
 			
 			log.info("Loading Provision ...");
 			let dbConfig = registry.coreDB.provision;
@@ -131,6 +133,8 @@ Controller.prototype.init = function (callback) {
 					
 					app.use(key_mw({"provision": provision, "regEnvironment": regEnvironment}));
 					
+					//TODO: add maintenance by tenant here req.soajs.controller.serviceParams.keyObj.config
+
 					app.use(keyACL_mw());
 					
 					app.use(gotoService_mw({

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

@@ -68,7 +68,7 @@ describe("Integration for Usecase 1", function () {
 		requester('get', options, (error, body) => {
 			assert.ok(body);
 			assert.strictEqual(body.result, false);
-			assert.deepStrictEqual(body.errors.codes, [158]);
+			assert.deepStrictEqual(body.errors.codes, [400]);
 			done();
 		});
 	});