Merge branch 'develop'

antoinehage · antoinehage · commit 4f3cbca5ef41 · 2025-09-19T13:52:13.000-04:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "soajs.core.modules",
   "description": "SOAJS core modules package",
-  "version": "5.2.15",
+  "version": "5.2.16",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"
@@ -50,8 +50,8 @@
     "install": "0.13.0",
     "jsonschema": "1.5.0",
     "lodash": "4.17.21",
-    "mongodb": "6.16.0",
-    "nodemailer": "6.10.1",
+    "mongodb": "6.20.0",
+    "nodemailer": "7.0.6",
     "object-hash": "3.0.0",
     "soajs.core.libs": "1.2.1"
   }
diff --git a/soajs.core/mail/index.js b/soajs.core/mail/index.js
@@ -14,7 +14,7 @@ let nodemailer = require("nodemailer");
 
 let mailer = function (configuration) {
 	let transport;
-	
+
 	//if no conf, switch to direct transport driver with default options
 	if (!configuration) {
 		transport = config.transport.default.options;
@@ -30,7 +30,7 @@ let mailer = function (configuration) {
 			}
 			throw new Error("transport error: " + err.join(" - "));
 		}
-		
+
 		//check type and use corresponding transport driver
 		switch (configuration.type.toLowerCase()) {
 			case 'smtp':
@@ -42,7 +42,7 @@ let mailer = function (configuration) {
 				break;
 		}
 	}
-	
+
 	//initialize the transporter with driver from above
 	this.transporter = nodemailer.createTransport(transport);
 };
@@ -58,9 +58,12 @@ mailer.prototype.send = function (mailOptions, callback) {
 		}
 		return callback(new Error("mailOptions error: " + err.join(" - ")));
 	}
-	
+
 	//tell the driver to send the mail
-	this.transporter.sendMail(mailOptions, callback);
+	this.transporter
+		.sendMail(mailOptions)
+		.then((info) => { callback(null, info); })
+		.catch((error) => { callback(error, null); });
 };
 
 module.exports = mailer;
diff --git a/test/data/import.sh b/test/data/import.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 
 pushd ./provision
-mongo ./environment.js
-mongo ./oauth.js
-mongo ./product.js
-mongo ./tenant.js
-mongo ./resources.js
-mongo ./customRegistry.js
+
+mongosh ./environment.js
+mongosh ./oauth.js
+mongosh ./product.js
+mongosh ./tenant.js
+mongosh ./resources.js
+mongosh ./customRegistry.js
+
 popd
diff --git a/test/data/provision/customRegistry.js b/test/data/provision/customRegistry.js
@@ -1,18 +1,20 @@
 let provDb = db.getSiblingDB('core_provision');
 
-let files = listFiles('./customRegistry');
-for (let i = 0; i < files.length; i++) {
-    load(files[i].name);
-}
+load('./customRegistry/test.js');
 
 provDb.custom_registry.drop();
 
 let records = [];
 let index = 0;
 
-records.push(customRegistry[index++]);
+if (typeof customRegistry !== 'undefined' && customRegistry.length > 0) {
+    records.push(customRegistry[index++]);
+}
 
-provDb.custom_registry.insert(records);
+// Use insertMany() which is the modern method for bulk inserts
+if (records.length > 0) {
+    provDb.custom_registry.insertMany(records);
+}
 
 /* Indexes for products */
-provDb.custom_registry.createIndex({ code: 1 }, { unique: true });
+provDb.custom_registry.createIndex({ code: 1 }, { unique: true });
diff --git a/test/data/provision/environment.js b/test/data/provision/environment.js
@@ -1,17 +1,24 @@
 let provDb = db.getSiblingDB('core_provision');
 provDb.dropDatabase();
 
-let files = listFiles('./environments');
-for (let i = 0; i < files.length; i++) {
-    load(files[i].name);
-}
+load('./environments/dev.js');
+load('./environments/test.js');
 
 provDb.environment.drop();
 
+// Define the records from the loaded files
 let records = [];
-records.push(dev);
-records.push(test);
-provDb.environment.insert(records);
+if (typeof dev !== 'undefined') {
+    records.push(dev);
+}
+if (typeof test !== 'undefined') {
+    records.push(test);
+}
+
+// Insert the records
+if (records.length > 0) {
+    provDb.environment.insertMany(records);
+}
 
-/* Indexes for products */
-provDb.environment.createIndex({ code: 1 }, { unique: true });
+// Create an index on the 'code' field
+provDb.environment.createIndex({ code: 1 }, { unique: true });
diff --git a/test/data/provision/oauth.js b/test/data/provision/oauth.js
@@ -1,13 +1,15 @@
 let provDb = db.getSiblingDB('core_provision');
 
-/* oAuth URAC */
-let files = listFiles('./oauth');
-for (let i = 0; i < files.length; i++) {
-    load(files[i].name);
-}
+load('./oauth/oauthuser.js'); 
 
 provDb.oauth_urac.drop();
 
 let records = [];
-records.push(oauthuser);
-provDb.oauth_urac.insert(records);
+if (typeof oauthuser !== 'undefined') {
+    records.push(oauthuser);
+}
+
+// use insertMany() for inserting an array of records
+if (records.length > 0) {
+    provDb.oauth_urac.insertMany(records);
+}
diff --git a/test/data/provision/oauth/oauthuser.js b/test/data/provision/oauth/oauthuser.js
diff --git a/test/data/provision/product.js b/test/data/provision/product.js
@@ -1,19 +1,19 @@
 let provDb = db.getSiblingDB('core_provision');
-//provDb.dropDatabase();
 
-/* Tenants */
-let files = listFiles('./products');
-for (let i = 0; i < files.length; i++) {
-    load(files[i].name);
-}
+load('./products/testProduct.js'); 
 
 provDb.products.drop();
 
 let records = [];
-records.push(testProduct);
-provDb.products.insert(records);
+if (typeof testProduct !== 'undefined') {
+    records.push(testProduct);
+}
 
+// Use insertMany() for inserting an array of records
+if (records.length > 0) {
+    provDb.products.insertMany(records);
+}
 
 /* Indexes for products */
 provDb.products.createIndex({ code: 1 }, { unique: true });
-provDb.products.createIndex({ 'packages.code': 1 });
+provDb.products.createIndex({ 'packages.code': 1 });
diff --git a/test/data/provision/products/testProduct.js b/test/data/provision/products/testProduct.js
diff --git a/test/data/provision/resources.js b/test/data/provision/resources.js
@@ -1,20 +1,21 @@
 let provDb = db.getSiblingDB('core_provision');
 
-let files = listFiles('./resources');
-for (let i = 0; i < files.length; i++) {
-    load(files[i].name);
-}
+load('./resources/resources.js');
 
 provDb.resources.drop();
 
 let records = [];
 let index = 0;
 
-records.push(resources[index++]);
-records.push(resources[index++]);
-records.push(resources[index++]);
-records.push(resources[index++]);
-provDb.resources.insert(records);
+// Push the loaded objects to the array
+if (typeof resources !== 'undefined' && resources.length > 0) {
+    records.push(resources[index++]);
+    records.push(resources[index++]);
+    records.push(resources[index++]);
+    records.push(resources[index++]);
+}
 
-/* Indexes for products */
-provDb.resources.createIndex({ code: 1 }, { unique: true });
+// Use insertMany() which is the modern method for bulk inserts
+if (records.length > 0) {
+    provDb.resources.insertMany(records);
+}
diff --git a/test/data/provision/resources/resources.js b/test/data/provision/resources/resources.js
diff --git a/test/data/provision/tenant.js b/test/data/provision/tenant.js
@@ -1,20 +1,24 @@
 let provDb = db.getSiblingDB('core_provision');
-//provDb.dropDatabase();
 
 /* Tenants */
-let files = listFiles('./tenants');
-for (let i = 0; i < files.length; i++) {
-    load(files[i].name);
-}
+// Explicitly load the tenant file(s) as listFiles is not available
+load('./tenants/test.js'); 
 
 provDb.tenants.drop();
 
 let records = [];
-records.push(test);
-provDb.tenants.insert(records);
+// Check if the loaded variable 'test' is defined before pushing it
+if (typeof test !== 'undefined') {
+    records.push(test);
+}
+
+// Use insertMany() for inserting an array of records
+if (records.length > 0) {
+    provDb.tenants.insertMany(records);
+}
 
 
 /* Indexes for tenants */
 provDb.tenants.createIndex({ code: 1 }, { unique: true });
-provDb.tenants.createIndex({ 'applications.appId': 1 } );
-provDb.tenants.createIndex({ 'applications.keys.key': 1 } );
+provDb.tenants.createIndex({ 'applications.appId': 1 });
+provDb.tenants.createIndex({ 'applications.keys.key': 1 });
