soajs.multitenant 2.0.35 → 2.0.39

package/.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 
-node_js: 12
+node_js: 16
 
 jobs:
   include:
@@ -56,9 +56,11 @@ jobs:
     - docker tag soajsorg/multitenant:latest soajsorg/multitenant:${MAJOR_VERSION}.x
 
     - docker push soajsorg/multitenant
+    - docker push soajsorg/multitenant:${PACKAGE_VERSION}
+    - docker push soajsorg/multitenant:${MAJOR_VERSION}.x
     deploy:
       on:
         all_branches: true
       provider: releases
       api_key: ${GIT_TOKEN}
-      skip_cleanup: true
+      skip_cleanup: true

package/_index.js

@@ -509,6 +509,11 @@ function run(serviceStartCb) {
 					return res.json(req.soajs.buildResponse(error, data));
 				});
 			});
+			service.get("/admin/tenant/name", (req, res) => {
+				bl.tenant.get(req.soajs, req.soajs.inputmaskData, (error, data) => {
+					return res.json(req.soajs.buildResponse(error, data));
+				});
+			});
 			
 			service.get("/tenant/console", (req, res) => {
 				req.soajs.inputmaskData.soajs = true;
@@ -915,4 +920,4 @@ module.exports = {
 			stop(null);
 		}
 	}
-};
+};

package/bl/tenant.js

@@ -7,6 +7,7 @@
  */
 
 'use strict';
+const uuid = require("uuid");
 const async = require('async');
 const request = require("request");
 
@@ -216,8 +217,9 @@ let bl = {
 		let data = {};
 		data.id = inputmaskData.id;
 		data.code = inputmaskData.code;
+		data.name = inputmaskData.name;
 		
-		if (!data.id && !data.code) {
+		if (!data.id && !data.code && !data.name) {
 			data.id = soajs.tenant.id;
 		}
 		data.soajs = !!inputmaskData.soajs;
@@ -494,6 +496,9 @@ let bl = {
 		}
 		if (inputmaskData.oauth) {
 			record.oauth = inputmaskData.oauth;
+			if (!record.oauth.secret || record.oauth.secret === "") {
+				record.oauth.secret = uuid.v4();
+			}
 		}
 		if (inputmaskData.profile) {
 			record.profile = inputmaskData.profile;
@@ -1740,4 +1745,4 @@ let bl = {
 	},
 };
 
-module.exports = bl;
+module.exports = bl;

package/config.js

@@ -974,6 +974,19 @@ module.exports = {
 					}
 				}
 			},
+			"/admin/tenant/name": {
+				_apiInfo: {
+					"l": "Get admin tenant by name",
+					"group": "Admin Tenant"
+				},
+				"name": {
+					"source": ['query.name'],
+					"required": true,
+					"validation": {
+						"type": "string"
+					}
+				}
+			},
 			"/admin/tenant/application": {
 				_apiInfo: {
 					"l": "Get tenant application",
@@ -3408,4 +3421,4 @@ module.exports = {
 			}
 		}
 	}
-};
+};

package/model/mongo/tenant.js

@@ -109,8 +109,8 @@ Tenant.prototype.getTenants = function (data, cb) {
 
 Tenant.prototype.getTenant = function (data, cb) {
 	let __self = this;
-	if (!data || !(data.id || data.code)) {
-		let error = new Error("id or code is required.");
+	if (!data || !(data.id || data.code || data.name)) {
+		let error = new Error("id, code, or name is required.");
 		return cb(error, null);
 	}
 	
@@ -136,11 +136,13 @@ Tenant.prototype.getTenant = function (data, cb) {
 			condition.$and.push({'_id': id});
 			__self.mongoCore.findOne(colName, condition, null, cb);
 		});
+	} else if (data.code) {
+		condition.$and.push({'code': data.code});
+		__self.mongoCore.findOne(colName, condition, null, cb);
 	} else {
-		if (data.code) {
-			condition.$and.push({'code': data.code});
+		if (data.name) {
+			condition.$and.push({'name': data.name});
 		}
-		
 		__self.mongoCore.findOne(colName, condition, null, cb);
 	}
 };
@@ -590,4 +592,4 @@ Tenant.prototype.closeConnection = function () {
 	__self.mongoCore.closeDb();
 };
 
-module.exports = Tenant;
+module.exports = Tenant;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.multitenant",
   "description": "soajs multitenant service",
-  "version": "2.0.35",
+  "version": "2.0.39",
   "author": "soajs team <team@soajs.org>",
   "repository": {
     "type": "git",
@@ -31,11 +31,12 @@
     "mocha": "6.2.2",
     "nock": "13.0.3",
     "request": "2.88.2",
-    "soajs.controller": "4.0.38"
+    "soajs.controller": "4.0.48"
   },
   "dependencies": {
-    "async": "3.2.0",
-    "soajs": "4.0.24",
-    "soajs.core.libs": "1.2.0"
+    "async": "3.2.2",
+    "soajs": "4.0.33",
+    "soajs.core.libs": "1.2.0",
+    "uuid": "8.3.2"
   }
 }

package/test/data/provision_integration/resources/dash_cluster.js

@@ -23,10 +23,9 @@ let res = {
             batchSize: 1000
         },
         URLParam: {
-            bufferMaxEntries: 0
         },
         timeConnected: 1552747598093
     }
 };
 
-module.exports = res;
+module.exports = res;

package/test/integration/product/delete/deleteProduct.test.js

@@ -105,10 +105,10 @@ describe("Testing delete product API", () => {
             assert.ifError(error);
             assert.ok(body);
             assert.ok(body.data);
-            assert.deepEqual(body.data.ok, 1);
+            assert.strictEqual(body.data.acknowledged, true);
             let check = validator.validate(body, deleteProductSchema);
-            assert.deepEqual(check.valid, true);
-            assert.deepEqual(check.errors, []);
+            assert.strictEqual(check.valid, true);
+            assert.deepStrictEqual(check.errors, []);
             done();
         });
         
@@ -173,4 +173,4 @@ describe("Testing delete product API", () => {
             done();
         });
     });
-});
+});

package/test/integration/product/schemas/deleteProduct.js

@@ -22,12 +22,12 @@ let deleteProductSchema = {
             "type": "object",
             "required": false,
             "properties": {
-                "n": {
+                "deletedCount": {
                     "type": "integer",
                     "required": true
                 },
-                "ok": {
-                    "type": "integer",
+                "acknowledged": {
+                    "type": "boolean",
                     "required": true
                 }
             }
@@ -49,4 +49,4 @@ let deleteProductSchema = {
     }
 };
 
-module.exports = deleteProductSchema;
+module.exports = deleteProductSchema;

package/test/integration/tenant/get/getTenant.test.js

@@ -69,7 +69,27 @@ describe("Testing get tenant API", () => {
             done();
         });
     });
-
+    
+	it("Success - will return tenant record - name (admin)", (done) => {
+		let params = {
+			qs: {
+				name: selectedTenant.name
+			}
+		};
+		requester('/admin/tenant/name', 'get', params, (error, body) => {
+			assert.ifError(error);
+			assert.ok(body);
+			assert.ok(body.data);
+			assert.deepEqual(body.data.name, 'Test 2 Tenant');
+			assert.deepEqual(body.data.code, 'test2');
+			assert.deepEqual(body.data.description, 'this is a description for test tenant');
+			let check = validator.validate(body, getTenantsSchema);
+			assert.deepEqual(check.valid, true);
+			assert.deepEqual(check.errors, []);
+			done();
+		});
+	});
+	
     it("Success - will return tenant record - no id", (done) => {
         let params = {
             qs: {
@@ -120,4 +140,4 @@ describe("Testing get tenant API", () => {
             done();
         });
     });
-});
+});

package/test/integration/tenant/schemas/deleteTenant.js

@@ -1,4 +1,3 @@
-
 /**
  * @license
  * Copyright SOAJS All Rights Reserved.
@@ -10,43 +9,43 @@
 "use strict";
 
 let deleteTenantsSchema = {
-    "type": "object",
-    "required": true,
-    "additionalProperties": false,
-    "properties": {
-        "result": {
-            "type": "boolean",
-            "required": true
-        },
-        "data": {
-            "type": "object",
-            "required": false,
-            "properties": {
-                "n": {
-                    "type": "integer",
-                    "required": true
-                },
-                "ok": {
-                    "type": "integer",
-                    "required": true
-                }
-            }
-        },
-        "errors": {
-            "type": "object",
-            "required": false,
-            "properties": {
-                "codes": {
-                    "type": "array",
-                    "required": true
-                },
-                "details": {
-                    "type": "array",
-                    "required": true
-                }
-            }
-        }
-    }
+	"type": "object",
+	"required": true,
+	"additionalProperties": false,
+	"properties": {
+		"result": {
+			"type": "boolean",
+			"required": true
+		},
+		"data": {
+			"type": "object",
+			"required": false,
+			"properties": {
+				"deletedCount": {
+					"type": "integer",
+					"required": true
+				},
+				"acknowledged": {
+					"type": "boolean",
+					"required": true
+				}
+			}
+		},
+		"errors": {
+			"type": "object",
+			"required": false,
+			"properties": {
+				"codes": {
+					"type": "array",
+					"required": true
+				},
+				"details": {
+					"type": "array",
+					"required": true
+				}
+			}
+		}
+	}
 };
 
 module.exports = deleteTenantsSchema;

package/test/unit/bl/index.test.js

@@ -71,8 +71,7 @@ describe("Unit test for: BLs", () => {
                             ],
                             "credentials": null,
                             "URLParam": {
-                                "poolSize": 5,
-                                "autoReconnect": true
+															"useUnifiedTopology": true
                             }
                         }
                     }
@@ -89,4 +88,4 @@ describe("Unit test for: BLs", () => {
         });
     });
 
-});
+});

package/test/unit/model/mongo/product.indexes.test.js

@@ -1,4 +1,3 @@
-
 /**
  * @license
  * Copyright SOAJS All Rights Reserved.
@@ -14,77 +13,77 @@ const Product = helper.requireModule('model/mongo/product.js');
 const assert = require('assert');
 
 describe("Unit test for: Model - product - indexes", () => {
-    let model;
-    let service = {
-        config: {
-            "errors": {},
-        },
-        log: {
-            error: () => {
-                console.log();
-            },
-            debug: () => {
-                console.log();
-            }
-        },
-        registry: {
-            get: () => {
-                return {
-                    coreDB: {
-                        provision: {
-                            "name": "core_provision",
-                            "prefix": '',
-                            "servers": [
-                                {
-                                    "host": "127.0.0.1",
-                                    "port": 27017
-                                }
-                            ],
-                            "credentials": null,
-                            "URLParam": {
-                                "poolSize": 5,
-                                "autoReconnect": true
-                            }
-                        }
-                    }
-                };
-            }
-        }
-    };
-
-    before((done) => {
-        model = new Product(service);
-        done();
-    });
-
-    afterEach((done) => {
-        done();
-    });
-
-    it('Fails - Add Product - Code Exists - Index unique', (done) => {
-        model.addProduct({
-            name: "Console UI Product",
-            code: "DSBRD"
-        }, (err) => {
-            assert.deepEqual(err.name, 'MongoError');
-            assert.deepEqual(err.message, 'E11000 duplicate key error collection: core_provision.products index: code_1 dup key: { : "DSBRD" }');
-            assert.ok(err);
-            done();
-        });
-    });
-
-    it('Fails - Add Product - Code null - Index unique', (done) => {
-        model.addProduct({
-            name: "Console UI Product",
-            code: null
-        }, (err) => {
-            assert.ok(err);
-            done();
-        });
-    });
-
-    it("Success - closeConnection", (done) => {
-        model.closeConnection();
-        done();
-    });
-});
+	let model;
+	let service = {
+		config: {
+			"errors": {},
+		},
+		log: {
+			error: () => {
+				console.log();
+			},
+			debug: () => {
+				console.log();
+			}
+		},
+		registry: {
+			get: () => {
+				return {
+					coreDB: {
+						provision: {
+							"name": "core_provision",
+							"prefix": '',
+							"servers": [
+								{
+									"host": "127.0.0.1",
+									"port": 27017
+								}
+							],
+							"credentials": null,
+							"URLParam": {
+								"useUnifiedTopology": true
+							}
+						}
+					}
+				};
+			}
+		}
+	};
+	
+	before((done) => {
+		model = new Product(service);
+		done();
+	});
+	
+	afterEach((done) => {
+		done();
+	});
+	
+	it('Fails - Add Product - Code Exists - Index unique', (done) => {
+		model.addProduct({
+			name: "Console UI Product",
+			code: "DSBRD"
+		}, (err) => {
+			// assert.deepEqual(err.name, 'MongoServerError');
+			assert.ok(err.message.indexOf("E11000 duplicate key") !== -1);
+			// assert.deepEqual(err.message, 'E11000 duplicate key error collection: core_provision.products index: code_1 dup key: { code: "DSBRD" }');
+			assert.ok(err);
+			done();
+		});
+	});
+	
+	it('Fails - Add Product - Code null - Index unique', (done) => {
+		model.addProduct({
+			name: "Console UI Product",
+			code: null
+		}, (err) => {
+			assert.ok(err);
+			done();
+		});
+	});
+	
+	it("Success - closeConnection", (done) => {
+		model.closeConnection();
+		done();
+	});
+});

package/test/unit/model/mongo/product.test.js

@@ -41,8 +41,7 @@ describe("Unit test for: Model - product", () => {
 							],
 							"credentials": null,
 							"URLParam": {
-								"poolSize": 5,
-								"autoReconnect": true
+								"useUnifiedTopology": true
 							}
 						}
 					}
@@ -257,8 +256,7 @@ describe("Unit test for: Model - product", () => {
 				],
 				"credentials": null,
 				"URLParam": {
-					"poolSize": 5,
-					"autoReconnect": true
+					"useUnifiedTopology": true
 				}
 			}, null);
 			done();
@@ -539,8 +537,7 @@ describe("Unit test for: Model - product", () => {
 				"index": "test",
 				"credentials": null,
 				"URLParam": {
-					"poolSize": 5,
-					"autoReconnect": true
+					"useUnifiedTopology": true
 				},
 			}, null);
 			model.closeConnection();
@@ -560,12 +557,11 @@ describe("Unit test for: Model - product", () => {
 				"index": "test",
 				"credentials": null,
 				"URLParam": {
-					"poolSize": 5,
-					"autoReconnect": true
+					"useUnifiedTopology": true
 				},
 				"dbConfig": {}
 			}, null);
 			done();
 		});
 	});
-});
+});