@adaptivestone/framework 3.0.11 → 3.0.14

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+### 3.0.14
+
+[NEW] now possible to show all errors during validation (default one) by parameter controllerValidationAbortEarly
+[UPDATE] update deps
+
+### 3.0.13
+
+[UPDATE] bug fix with "mergeParams"
+
+### 3.0.12
+
+[NEW] ability to pass "mergeParams" options to express router
+[UPDATE] update deps
+
 ### 3.0.11
 
 [UPDATE] more verbose email error

package/config/validate.js

@@ -0,0 +1,3 @@
+module.exports = {
+  controllerValidationAbortEarly: true, // abort validation on first error and return first error
+};

package/modules/AbstractController.js

@@ -16,11 +16,13 @@ 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();
+    this.router = express.Router({
+      mergeParams: isExpressMergeParams,
+    });
     const { routes } = this;
     const expressPath = this.getExpressPath();
 
@@ -186,7 +188,8 @@ class AbstractController extends Base {
               new MiddlewareFunction(this.app, params).getMiddleware(),
           );
         }
-
+        const { controllerValidationAbortEarly } =
+          this.app.getConfig('validate');
         this.router[verb](
           path,
           additionalMiddlewares || [],
@@ -201,7 +204,9 @@ class AbstractController extends Base {
               const bodyAndQuery = merge(req.query, req.body);
 
               try {
-                await routeObject.request.validate(bodyAndQuery);
+                await routeObject.request.validate(bodyAndQuery, {
+                  abortEarly: controllerValidationAbortEarly,
+                });
               } catch (e) {
                 let { errors } = e;
                 // translate it
@@ -212,10 +217,22 @@ class AbstractController extends Base {
                   `Request validation failed with message: ${e.message}. errors: ${errors}`,
                 );
 
+                const errorAnswer = {};
+                if (!e.inner.length) {
+                  errorAnswer[e.path] = errors;
+                } else {
+                  e.inner.forEach((err) => {
+                    errorAnswer[err.path] = err.errors;
+                    if (req.i18n && err.errors) {
+                      errorAnswer[err.path] = err.errors.map((err1) =>
+                        req.i18n.t(err1),
+                      );
+                    }
+                  });
+                }
+
                 return res.status(400).json({
-                  errors: {
-                    [e.path]: errors,
-                  },
+                  errors: errorAnswer,
                 });
               }
               req.appInfo.request = routeObject.request.cast(bodyAndQuery, {

package/package.json

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