@adaptivestone/framework 3.0.9 → 3.0.12

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+### 3.0.12
+
+[NEW] ability to pass "mergeParams" options to express
+[UPDATE] update deps
+
+### 3.0.11
+
+[UPDATE] more verbose email error
+
+### 3.0.10
+
+[UPDATE] update deps
+[CHANGE] tests afterAll not using timeout anymore (conflict with jest 28-alpha)
+[NEW] config for mail now supports "EMAIL_TRANSPORT" env variable. SMTP by default (as was)
+
 ### 3.0.9
 
 [UPDATE] update deps

package/config/mail.js

@@ -17,7 +17,7 @@ module.exports = {
       connectionTimeout: 10000, // timeout to 10 seconds
     },
   },
-  transport: 'smtp',
+  transport: process.env.EMAIL_TRANSPORT || 'smtp',
   webResources: {
     // https://github.com/jrit/web-resource-inliner path to find resources
     relativeTo: 'build',

package/modules/AbstractController.js

@@ -16,13 +16,15 @@ const Auth = require('../services/http/middleware/Auth');
  * In most cases you will want to have a 'home' route that not include controller name. For this case please check 'getExpressPath'
  */
 class AbstractController extends Base {
-  constructor(app, prefix) {
+  constructor(app, prefix, isExpressMergeParams = false) {
     const time = Date.now();
     super(app);
     this.prefix = prefix;
     this.router = express.Router();
     const { routes } = this;
-    const expressPath = this.getExpressPath();
+    const expressPath = this.getExpressPath({
+      mergeParams: isExpressMergeParams,
+    });
 
     /**
      * Grab route middleware onlo one Map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "3.0.9",
+  "version": "3.0.12",
   "description": "Adaptive stone node js framework",
   "main": "index.js",
   "repository": {

package/services/messaging/email/index.js

@@ -32,7 +32,9 @@ class Mail extends Base {
         this.template = `${__dirname}/templates/${path.basename(template)}`;
       } else {
         this.template = `${__dirname}/templates/emptyTemplate`;
-        this.logger.error('not found');
+        this.logger.error(
+          `Template '${template}' not found. Using 'emptyTemplate' as a fallback`,
+        );
       }
     }
     this.templateData = templateData;

package/tests/setup.js

@@ -67,11 +67,11 @@ afterAll(async () => {
     global.server.app.httpServer.shutdown();
     global.server.app.events.emit('shutdown');
   }
-  setTimeout(async () => {
-    if (typeof global.testSetup.afterAll === 'function') {
-      await global.testSetup.afterAll();
-    }
-    await mongoose.disconnect();
-    await mongoMemoryServerInstance.stop();
-  }, 2000);
+  // setTimeout(async () => {
+  if (typeof global.testSetup.afterAll === 'function') {
+    await global.testSetup.afterAll();
+  }
+  await mongoose.disconnect();
+  await mongoMemoryServerInstance.stop();
+  // }, 2000);
 });