soajs.multitenant 2.1.9 → 2.1.11

package/.travis.yml

@@ -1,7 +1,6 @@
-language: node_js
-node_js: 18
-cache: false
 dist: focal
+language: node_js
+node_js: 20
 
 jobs:
   include:

package/_index.js

@@ -844,6 +844,12 @@ function run(serviceStartCb) {
 			});
 			//* DELETE
 			
+			service.delete("/tenants", (req, res) => {
+				bl.tenant.deleteMany(req.soajs, req.soajs.inputmaskData, (error, data) => {
+					return res.json(req.soajs.buildResponse(error, data));
+				});
+			});
+
 			service.delete("/tenant", (req, res) => {
 				bl.tenant.delete(req.soajs, req.soajs.inputmaskData, (error, data) => {
 					return res.json(req.soajs.buildResponse(error, data));

package/bl/tenant.js

@@ -1425,6 +1425,20 @@ let bl = {
 		});
 	},
 	
+	"deleteMany": (soajs, inputmaskData, cb) => {
+		if (!inputmaskData) {
+			return cb(bl.handleError(soajs, 400, null));
+		}
+		let modelObj = bl.mp.getModel(soajs);
+		modelObj.deleteTenants(inputmaskData, (err, result) => {
+			bl.mp.closeModel(soajs, modelObj);
+			if (err) {
+				return cb(bl.handleError(soajs, 602, err));
+			}
+			return cb(null, result);
+		});
+	},
+
 	"delete": (soajs, inputmaskData, cb) => {
 		if (!inputmaskData) {
 			return cb(bl.handleError(soajs, 400, null));

package/config.js

@@ -2145,6 +2145,26 @@ module.exports = {
 				}
 			},
 
+			"/tenants": {
+				_apiInfo: {
+					"l": "Delete tenants",
+					"group": "Tenant"
+				},
+				"ids": {
+					"source": ['query.ids'],
+					"validation": {
+						"type": "array",
+						"minItems": 1,
+						"items": {
+							"type": "string",
+							"pattern": `^[a-f\\d]{24}$`,
+							"errorMessage": {
+								"pattern": "Tenant Id provided is not valid."
+							}
+						}
+					}
+				}
+			},
 			"/tenant": {
 				_apiInfo: {
 					"l": "Delete tenant",

package/model/mongo/tenant.js

@@ -15,7 +15,7 @@ let indexing = {};
 
 function Tenant(service, options, mongoCore) {
 	let __self = this;
-	
+
 	if (mongoCore) {
 		__self.mongoCore = mongoCore;
 	}
@@ -26,23 +26,23 @@ function Tenant(service, options, mongoCore) {
 			let registry = service.registry.get();
 			__self.mongoCore = new Mongo(registry.coreDB.provision);
 		}
-		
+
 		let index = "default";
 		if (options && options.index) {
 			index = options.index;
 		}
 		if (indexing && !indexing[index]) {
 			indexing[index] = true;
-			__self.mongoCore.createIndex(colName, {'code': 1}, {unique: true}, () => {
+			__self.mongoCore.createIndex(colName, { 'code': 1 }, { unique: true }, () => {
 			});
-			__self.mongoCore.createIndex(colName, {'_id': 1, 'locked': 1}, {}, () => {
+			__self.mongoCore.createIndex(colName, { '_id': 1, 'locked': 1 }, {}, () => {
 			});
-			__self.mongoCore.createIndex(colName, {'name': 1}, {}, () => {
+			__self.mongoCore.createIndex(colName, { 'name': 1 }, {}, () => {
 			});
-			__self.mongoCore.createIndex(colName, {'type': 1}, {}, () => {
+			__self.mongoCore.createIndex(colName, { 'type': 1 }, {}, () => {
 			});
-			
-			__self.mongoCore.createIndex(colName, {'console': 1, 'type': 1, 'tenant.code': 1, 'name': 1, 'code': 1}, {
+
+			__self.mongoCore.createIndex(colName, { 'console': 1, 'type': 1, 'tenant.code': 1, 'name': 1, 'code': 1 }, {
 				partialFilterExpression: {
 					"tenant.code": {
 						"$exists": true
@@ -50,16 +50,16 @@ function Tenant(service, options, mongoCore) {
 				}
 			}, () => {
 			});
-			
-			__self.mongoCore.createIndex(colName, {'console': 1, 'type': 1, 'name': 1, 'code': 1}, {}, () => {
+
+			__self.mongoCore.createIndex(colName, { 'console': 1, 'type': 1, 'name': 1, 'code': 1 }, {}, () => {
 			});
-			__self.mongoCore.createIndex(colName, {'_id': 1, 'console': 1}, {}, () => {
+			__self.mongoCore.createIndex(colName, { '_id': 1, 'console': 1 }, {}, () => {
 			});
-			__self.mongoCore.createIndex(colName, {'applications.keys.extKeys.env': 1}, {}, () => {
+			__self.mongoCore.createIndex(colName, { 'applications.keys.extKeys.env': 1 }, {}, () => {
 			});
-			__self.mongoCore.createIndex(colName, {'applications.keys.key': 1}, {}, () => {
+			__self.mongoCore.createIndex(colName, { 'applications.keys.key': 1 }, {}, () => {
 			});
-			
+
 			service.log.debug("Tenant: Indexes for " + index + " Updated!");
 		}
 	}
@@ -67,12 +67,12 @@ function Tenant(service, options, mongoCore) {
 
 Tenant.prototype.validateId = function (id, cb) {
 	let __self = this;
-	
+
 	if (!id) {
 		let error = new Error("id is required.");
 		return cb(error, null);
 	}
-	
+
 	try {
 		id = __self.mongoCore.ObjectId(id);
 		return cb(null, id);
@@ -87,23 +87,23 @@ Tenant.prototype.getTenants = function (data, cb) {
 		let error = new Error("Array of codes is required.");
 		return cb(error, null);
 	}
-	
+
 	let partial = [
 		{
 			console: !!data.soajs
 		}
 	];
 	if (!data.soajs) {
-		partial.push({console: null});
+		partial.push({ console: null });
 	}
 	let condition = {
 		'$and': [{
 			"$or": partial
 		}]
 	};
-	
-	condition.$and.push({'code': {'$in': data.codes}});
-	
+
+	condition.$and.push({ 'code': { '$in': data.codes } });
+
 	__self.mongoCore.find(colName, condition, null, cb);
 };
 
@@ -113,37 +113,37 @@ Tenant.prototype.getTenant = function (data, cb) {
 		let error = new Error("id, code, or name is required.");
 		return cb(error, null);
 	}
-	
+
 	let partial = [
 		{
 			console: !!data.soajs
 		}
 	];
 	if (!data.soajs) {
-		partial.push({console: null});
+		partial.push({ console: null });
 	}
 	let condition = {
 		'$and': [{
 			"$or": partial
 		}]
 	};
-	
+
 	if (data.id) {
 		__self.validateId(data.id, (err, id) => {
 			if (err) {
 				return cb(err, null);
 			}
-			condition.$and.push({'_id': id});
+			condition.$and.push({ '_id': id });
 			__self.mongoCore.findOne(colName, condition, null, cb);
 		});
 	} else if (data.code) {
-		condition.$and.push({'code': data.code});
+		condition.$and.push({ 'code': data.code });
 		__self.mongoCore.findOne(colName, condition, null, cb);
 	} else {
 		if (data.name) {
 			data.name = data.name.trim();
 			// data.name = data.name.toLowerCase();
-			condition.$and.push({'name': data.name});
+			condition.$and.push({ 'name': data.name });
 		}
 		__self.mongoCore.findOne(colName, condition, null, cb);
 	}
@@ -157,17 +157,17 @@ Tenant.prototype.listTenantSubTenants = function (data, cb) {
 	}
 	let condition = {
 		"$or": [
-			{console: false},
-			{console: null}
+			{ console: false },
+			{ console: null }
 		]
 	};
 	let andCond = [];
-	andCond.push({'type': "client"});
-	andCond.push({'tenant.code': data.code});
-	
+	andCond.push({ 'type': "client" });
+	andCond.push({ 'tenant.code': data.code });
+
 	if (data.keywords) {
 		let rePattern = new RegExp(data.keywords, 'i');
-		andCond.push({"$or": [{"name": {"$regex": rePattern}}, {"code": {"$regex": rePattern}}]});
+		andCond.push({ "$or": [{ "name": { "$regex": rePattern } }, { "code": { "$regex": rePattern } }] });
 	}
 	if (andCond.length > 0) {
 		condition.$and = andCond;
@@ -175,7 +175,7 @@ Tenant.prototype.listTenantSubTenants = function (data, cb) {
 	let options = {
 		"skip": 0,
 		"limit": 50,
-		"sort": {"name": 1}
+		"sort": { "name": 1 }
 	};
 	if (data && data.limit) {
 		options.limit = data.limit;
@@ -218,31 +218,31 @@ Tenant.prototype.listTenantSubTenants = function (data, cb) {
 
 Tenant.prototype.listTenants = function (data, cb) {
 	let __self = this;
-	
+
 	let condition = {
 		"$or": [
-			{"console": false},
-			{"console": null}
+			{ "console": false },
+			{ "console": null }
 		]
 	};
 	let andCond = [];
 	if (data && data.type) {
-		andCond.push({"type": data.type});
+		andCond.push({ "type": data.type });
 	}
 	if (data.keywords) {
 		let rePattern = new RegExp(data.keywords, 'i');
-		andCond.push({"$or": [{"name": {"$regex": rePattern}}, {"code": {"$regex": rePattern}}]});
+		andCond.push({ "$or": [{ "name": { "$regex": rePattern } }, { "code": { "$regex": rePattern } }] });
 	}
 	if (data.category) {
 		if (data.category === "tenant") {
 			andCond.push({
 				"$or": [
-					{"category": data.category},
-					{"category": null}
+					{ "category": data.category },
+					{ "category": null }
 				]
 			});
 		} else {
-			andCond.push({"category": data.category});
+			andCond.push({ "category": data.category });
 		}
 	}
 	if (andCond.length > 0) {
@@ -251,7 +251,7 @@ Tenant.prototype.listTenants = function (data, cb) {
 	let options = {
 		"skip": 0,
 		"limit": 500,
-		"sort": {"name": 1}
+		"sort": { "name": 1 }
 	};
 	if (data && data.limit) {
 		options.limit = data.limit;
@@ -294,19 +294,19 @@ Tenant.prototype.listTenants = function (data, cb) {
 
 Tenant.prototype.count = function (data, condition, cb) {
 	let __self = this;
-	
+
 	let options = {};
 	__self.mongoCore.countDocuments(colName, condition, options, cb);
-	
+
 };
 
 Tenant.prototype.listConsoleTenants = function (data, cb) {
 	let __self = this;
-	
+
 	let options = {
 		"skip": 0,
 		"limit": 500,
-		"sort": {"name": 1}
+		"sort": { "name": 1 }
 	};
 	if (data && data.limit) {
 		options.limit = data.limit;
@@ -315,28 +315,28 @@ Tenant.prototype.listConsoleTenants = function (data, cb) {
 		options.skip = data.start;
 	}
 	let condition = {
-		'$and': [{console: true}]
+		'$and': [{ console: true }]
 	};
 	if (data.keywords) {
 		let rePattern = new RegExp(data.keywords, 'i');
-		condition.$and.push({"$or": [{"name": {"$regex": rePattern}}, {"code": {"$regex": rePattern}}]});
+		condition.$and.push({ "$or": [{ "name": { "$regex": rePattern } }, { "code": { "$regex": rePattern } }] });
 	}
 	if (data && data.type) {
-		condition.$and.push({'type': data.type});
+		condition.$and.push({ 'type': data.type });
 	}
 	if (data.category) {
 		if (data.category === "tenant") {
 			condition.$and.push({
 				"$or": [
-					{"category": data.category},
-					{"category": null}
+					{ "category": data.category },
+					{ "category": null }
 				]
 			});
 		} else {
-			condition.$and.push({"category": data.category});
+			condition.$and.push({ "category": data.category });
 		}
 	}
-	
+
 	let find = (condition) => {
 		__self.mongoCore.find(colName, condition, options, (error, response) => {
 			if (error) {
@@ -370,13 +370,13 @@ Tenant.prototype.listConsoleTenants = function (data, cb) {
 			}
 		});
 	};
-	
+
 	if (data.scope === "other") {
 		__self.validateId(data.id, (err, id) => {
 			if (err) {
 				return cb(err, null);
 			}
-			condition.$and.push({"_id": {"$ne": id}});
+			condition.$and.push({ "_id": { "$ne": id } });
 			find(condition);
 		});
 	} else {
@@ -386,7 +386,7 @@ Tenant.prototype.listConsoleTenants = function (data, cb) {
 
 Tenant.prototype.listAllTenants = function (data, cb) {
 	let __self = this;
-	
+
 	let fields = null;
 	if (data) {
 		if (data.fields && Array.isArray(data.fields) && data.fields.length > 0) {
@@ -396,8 +396,8 @@ Tenant.prototype.listAllTenants = function (data, cb) {
 			});
 		}
 	}
-	
-	__self.mongoCore.find(colName, {}, {"fields": fields}, cb);
+
+	__self.mongoCore.find(colName, {}, { "fields": fields }, cb);
 };
 
 Tenant.prototype.countTenants = function (data, cb) {
@@ -406,13 +406,13 @@ Tenant.prototype.countTenants = function (data, cb) {
 		let error = new Error("name is required.");
 		return cb(error, null);
 	}
-	
+
 	data.name = data.name.trim();
 	// data.name = data.name.toLowerCase();
 	let condition = {
 		name: data.name
 	};
-	
+
 	if (data.code) {
 		condition.code = data.code;
 	}
@@ -427,7 +427,7 @@ Tenant.prototype.generateId = function () {
 
 Tenant.prototype.addTenant = function (data, cb) {
 	let __self = this;
-	
+
 	if (!data || !data.code || !data.name) {
 		let error = new Error("name and code are required.");
 		return cb(error, null);
@@ -436,22 +436,38 @@ Tenant.prototype.addTenant = function (data, cb) {
 	// data.name = data.name.toLowerCase();
 	__self.mongoCore.insertOne(colName, data, {}, (err, record) => {
 		if (record && Array.isArray(record)) {
-			record = record [0];
+			record = record[0];
 		}
 		return cb(err, record);
 	});
 };
 
+Tenant.prototype.deleteTenants = function (data, cb) {
+	let __self = this;
+
+	if (!data || !data.ids) {
+		let error = new Error("ids is required.");
+		return cb(error, null);
+	}
+	const objectIdsArray = data.ids.map((id) => __self.mongoCore.ObjectId(id));
+	let condition = {
+		"_id": { "$in": objectIdsArray }
+	};
+	__self.mongoCore.deleteMany(colName, condition, {}, (err, result) => {
+		return cb(err, result);
+	});
+};
+
 Tenant.prototype.deleteTenant = function (data, cb) {
 	let __self = this;
-	
+
 	if (!data || !(data._id || data.code)) {
 		let error = new Error("id or code is required.");
 		return cb(error, null);
 	}
-	
+
 	let condition = {};
-	
+
 	if (data._id) {
 		condition._id = data._id;
 	} else {
@@ -468,42 +484,42 @@ Tenant.prototype.updateTenant = function (data, cb) {
 		let error = new Error("_id is required.");
 		return cb(error, null);
 	}
-	
-	let condition = {'_id': data._id};
-	let options = {'upsert': false, 'safe': true};
+
+	let condition = { '_id': data._id };
+	let options = { 'upsert': false, 'safe': true };
 	let fields = {
 		'$set': {}
 	};
 	if (data.description) {
 		fields.$set.description = data.description;
 	}
-	
+
 	if (data.name) {
 		data.name = data.name.trim();
 		// data.name = data.name.toLowerCase();
 		fields.$set.name = data.name;
 	}
-	
+
 	if (data.tag) {
 		fields.$set.tag = data.tag;
 	}
-	
+
 	if (data.category) {
 		fields.$set.category = data.category;
 	}
-	
+
 	if (data.profile) {
 		fields.$set.profile = data.profile;
 	}
-	
+
 	if (data.applications) {
 		fields.$set.applications = data.applications;
 	}
-	
+
 	if (data.oauth) {
 		fields.$set.oauth = data.oauth;
 	}
-	
+
 	if (Object.keys(fields.$set).length === 0) {
 		//nothing to update
 		return cb(null, 0);
@@ -524,7 +540,7 @@ Tenant.prototype.updateTenant = function (data, cb) {
 			return cb(err, result);
 		}
 	});
-	
+
 };
 
 Tenant.prototype.removeApplication = function (data, cb) {
@@ -533,10 +549,10 @@ Tenant.prototype.removeApplication = function (data, cb) {
 		let error = new Error("_id and appId are required.");
 		return cb(error, null);
 	}
-	
-	let condition = {'_id': data._id};
-	let options = {'upsert': false, 'safe': true};
-	
+
+	let condition = { '_id': data._id };
+	let options = { 'upsert': false, 'safe': true };
+
 	try {
 		data.appId = __self.mongoCore.ObjectId(data.appId);
 	} catch (e) {
@@ -549,7 +565,7 @@ Tenant.prototype.removeApplication = function (data, cb) {
 			}
 		}
 	};
-	
+
 	__self.mongoCore.updateOne(colName, condition, fields, options, (err, result) => {
 		if (err) {
 			return cb(err);
@@ -583,8 +599,8 @@ Tenant.prototype.removeApplicationKey = function (data, cb) {
 		'_id': data._id,
 		'applications.appId': data.appId
 	};
-	let options = {'upsert': false, 'safe': true};
-	
+	let options = { 'upsert': false, 'safe': true };
+
 	let fields = {
 		'$pull': {
 			'applications.$.keys': {
@@ -592,7 +608,7 @@ Tenant.prototype.removeApplicationKey = function (data, cb) {
 			}
 		}
 	};
-	
+
 	__self.mongoCore.updateOne(colName, condition, fields, options, (err, result) => {
 		if (err) {
 			return cb(err);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.multitenant",
   "description": "soajs multitenant service",
-  "version": "2.1.9",
+  "version": "2.1.11",
   "author": "soajs team <team@soajs.org>",
   "repository": {
     "type": "git",
@@ -19,24 +19,24 @@
     "test": "grunt test"
   },
   "devDependencies": {
-    "grunt": "1.0.4",
-    "grunt-contrib-clean": "2.0.0",
+    "grunt": "1.6.1",
+    "grunt-contrib-clean": "2.0.1",
     "grunt-contrib-copy": "1.0.0",
-    "grunt-contrib-jshint": "2.1.0",
+    "grunt-contrib-jshint": "3.2.0",
     "grunt-coveralls": "2.0.0",
     "grunt-env": "1.0.1",
     "grunt-istanbul": "0.8.0",
-    "grunt-jsdoc": "2.4.0",
+    "grunt-jsdoc": "2.4.1",
     "grunt-mocha-test": "0.13.3",
-    "mocha": "6.2.2",
-    "nock": "13.0.3",
+    "mocha": "10.7.3",
+    "nock": "13.5.4",
     "request": "2.88.2",
-    "soajs.controller": "4.2.12"
+    "soajs.controller": "4.2.15"
   },
   "dependencies": {
     "async": "3.2.5",
-    "soajs": "4.1.9",
+    "soajs": "4.1.10",
     "soajs.core.libs": "1.2.0",
-    "uuid": "9.0.1"
+    "uuid": "10.0.0"
   }
 }

package/test/integration/tenant/delete/deleteTenants.test.js

@@ -0,0 +1,96 @@
+
+/**
+ * @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
+ */
+
+"use strict";
+const assert = require('assert');
+const requester = require('../../requester');
+
+let params = {
+    body: {
+        "name": "tenant ddd1",
+        "code": "ddd1",
+        "description": "tenant delete",
+        "type": "product",
+        "profile": {},
+        "tag": "tag",
+        "oauth": {
+            "secret": "this is a secret test",
+            "redirectURI": "http://domain.com",
+            "grants": [
+                "password",
+                "refresh_token"
+            ],
+            "disabled": 0,
+            "type": 1,
+            "loginMode": "urac"
+        }
+    }
+};
+let ids = [];
+
+describe("Testing delete tenants API", () => {
+
+    before(function (done) {
+        done();
+    });
+
+    afterEach((done) => {
+        console.log("=======================================");
+        done();
+    });
+
+    it("Success - will add ddd1 ", (done) => {
+        params.body.name = "tenant ddd1";
+        params.body.code = "ddd1";
+
+        requester('/tenant', 'post', params, (error, body) => {
+            assert.ifError(error);
+            assert.ok(body);
+            assert.ok(body.data);
+            ids.push(body.data._id);
+            done();
+        });
+    });
+    it("Success - will add ddd2 ", (done) => {
+        params.body.name = "tenant ddd2";
+        params.body.code = "ddd2";
+
+        requester('/tenant', 'post', params, (error, body) => {
+            assert.ifError(error);
+            assert.ok(body);
+            assert.ok(body.data);
+            ids.push(body.data._id);
+            done();
+        });
+    });
+    it("Success - will add ddd3 ", (done) => {
+        params.body.name = "tenant ddd3";
+        params.body.code = "ddd3";
+
+        requester('/tenant', 'post', params, (error, body) => {
+            assert.ifError(error);
+            assert.ok(body);
+            assert.ok(body.data);
+            ids.push(body.data._id);
+            done();
+        });
+    });
+
+    it("Success - delete tenants ", (done) => {
+        let params1 = { "qs": { "ids": ids } };
+        requester('/tenants', 'delete', params1, (error, body) => {
+            assert.ifError(error);
+            assert.ok(body);
+            assert.ok(body.data);
+            assert.strictEqual(body.data.deletedCount, 3);
+            done();
+        });
+    });
+
+});

package/test/integration/tenant/tenant.test.js

@@ -50,6 +50,7 @@ describe("starting tenant integration tests", () => {
         require("./delete/deleteAppKey.test.js");
         require("./delete/deleteApplication.test.js");
         require("./delete/deleteTenant.test.js");
+        require("./delete/deleteTenants.test.js");
 
         done();
     });