not-node 5.1.18 → 5.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "not-node",
-  "version": "5.1.18",
+  "version": "5.1.21",
   "description": "node complimentary part for client side notFramework.",
   "main": "index.js",
   "scripts": {

package/src/auth/fields.js

@@ -13,7 +13,6 @@ function getOwnerId(data, ownerFieldName = CONST.DOCUMENT_OWNER_FIELD_NAME) {
         return undefined;
     }
     if (
-        objHas(data, ownerFieldName) &&
         data[ownerFieldName] &&
         COMMON.validateObjectId(data[ownerFieldName].toString())
     ) {

package/src/form/extractors/fromBody.js

@@ -0,0 +1,3 @@
+module.exports = (req, name) => {
+    return req.body[name];
+};

package/src/form/extractors/fromParams.js

@@ -0,0 +1,3 @@
+module.exports = (req, name) => {
+    return req.params[name];
+};

package/src/form/extractors/fromQuery.js

@@ -0,0 +1,3 @@
+module.exports = (req, name) => {
+    return req.query[name];
+};

package/src/form/form.js

@@ -2,13 +2,17 @@ const FormFabric = require("./fabric");
 
 const { createSchemaFromFields } = require("../fields");
 
-const { objHas } = require("../common");
+const { objHas, isFunc } = require("../common");
 
 const ValidationBuilder = require("not-validation").Builder;
 const ValidationSession = require("not-validation").Session;
 
 const { notValidationError, notError } = require("not-error");
 
+const fromBody = require("./extractors/fromBody.js");
+const fromQuery = require("./extractors/fromQuery.js");
+const fromParams = require("./extractors/fromParams.js");
+
 /**
  * Generic form validation class
  **/
@@ -26,12 +30,18 @@ class Form {
     #FORM_NAME;
     #PROTO_FIELDS;
     #VALIDATOR;
+    #EXTRACTORS = {
+        fromQuery,
+        fromBody,
+        fromParams,
+    };
 
-    constructor({ FIELDS, FORM_NAME, app }) {
+    constructor({ FIELDS, FORM_NAME, app, EXTRACTORS = {} }) {
         this.#FORM_NAME = FORM_NAME;
         this.#PROTO_FIELDS = FIELDS;
         this.#createValidationSchema(app);
         this.#augmentValidationSchema();
+        this.#addExtractors(EXTRACTORS);
     }
 
     /**
@@ -207,6 +217,23 @@ class Form {
     static fabric() {
         return FormFabric;
     }
+
+    #addExtractors(extractors = {}) {
+        if (extractors) {
+            this.#EXTRACTORS = { ...this.#EXTRACTORS, ...extractors };
+        }
+    }
+
+    extractByInstructions(req, instructions) {
+        const results = {};
+        for (let fieldName of instructions) {
+            const instruction = instructions[fieldName];
+            if (isFunc(instruction)) {
+                results[fieldName] = instruction(req, fieldName);
+            }
+        }
+        return results;
+    }
 }
 
 module.exports = Form;