not-node 6.5.35 → 6.5.36

package/src/core/validators/object.js

@@ -0,0 +1,10 @@
+const { MODULE_NAME } = require("../const");
+
+module.exports = [
+    {
+        validator: (val) => {
+            return typeof val === "object";
+        },
+        message: `${MODULE_NAME}:value_is_not_object`,
+    },
+];

package/src/core/validators/objectId.js

@@ -0,0 +1,13 @@
+module.exports = [
+    {
+        validator: (val, { validator }) => {
+            return (
+                val &&
+                ((typeof val === "string" && validator.isMongoId(val)) ||
+                    (typeof val.toString === "function" &&
+                        validator.isMongoId(val.toString())))
+            );
+        },
+        message: `not-node:value_item_format_is_not_objectId`,
+    },
+];

package/src/core/{fields/validators → validators}/objectId.list.js

@@ -7,5 +7,10 @@ module.exports = [
         },
         message: `not-node:value_is_not_array`,
     },
-    ...objectId,
+    {
+        validator: (val, envs) => {
+            return val.every((item) => objectId.at(0)?.validator(item, envs));
+        },
+        message: `not-node:value_items_are_not_all_objectId`,
+    },
 ];

package/src/core/validators/string.10-10000.js

@@ -0,0 +1,32 @@
+const { MODULE_NAME } = require("../const");
+
+const DEFAULT_MIN_LEN = 10;
+const DEFAULT_MAX_LEN = 10000;
+
+module.exports = [
+    ...require("./string"),
+    {
+        validator: (val, { config }) => {
+            const MIN_LEN =
+                (config && config.get(`fields.description.minLen`)) ||
+                DEFAULT_MIN_LEN;
+            if (val.length < MIN_LEN) {
+                return false;
+            }
+            return true;
+        },
+        message: `${MODULE_NAME}:value_is_too_short_10`,
+    },
+    {
+        validator: (val, { config }) => {
+            const MAX_LEN =
+                (config && config.get(`fields.description.maxLen`)) ||
+                DEFAULT_MAX_LEN;
+            if (val.length > MAX_LEN) {
+                return false;
+            }
+            return true;
+        },
+        message: `${MODULE_NAME}:value_is_too_long_10000`,
+    },
+];

package/src/core/{fields/validators/email.js → validators/string.email.js}

@@ -1,4 +1,5 @@
 module.exports = [
+    ...require("./string"),
     {
         validator(val, { validator }) {
             return validator.isEmail(val);

package/src/core/{fields/validators/ip.js → validators/string.ip.js}

@@ -1,8 +1,9 @@
 module.exports = [
+    ...require("./string"),
     {
-        validator(val, {validator}) {
+        validator(val, { validator }) {
             return validator.isIP(val);
         },
         message: "not-node:value_is_not_ip_address",
     },
-];
+];

package/src/core/validators/string.js

@@ -0,0 +1,8 @@
+module.exports = [
+    {
+        validator(val) {
+            return typeof val === "string";
+        },
+        message: "not-node:value_type_is_not_string",
+    },
+];

package/src/core/{fields/validators/title.js → validators/string.not.empty.js}

@@ -1,16 +1,17 @@
-const { MODULE_NAME } = require("not-node/src/core/const");
+const { MODULE_NAME } = require("../const");
 
 module.exports = [
+    ...require("./string"),
     {
         validator: (val) => {
             return typeof val === "string";
         },
-        message: `${MODULE_NAME}:title_value_is_not_string`,
+        message: `${MODULE_NAME}:value_type_is_not_string`,
     },
     {
         validator: (val) => {
             return val.length;
         },
-        message: `${MODULE_NAME}:title_value_is_empty`,
+        message: `${MODULE_NAME}:value_is_empty`,
     },
 ];

package/src/core/{fields/validators/telephone.js → validators/string.telephone.js}

@@ -1,8 +1,9 @@
 module.exports = [
+    ...require("./string"),
     {
         validator(val, { validator }) {
             return validator.isMobilePhone(val.replace(/\D/g, ""));
         },
-        message: "not-node:telephone_is_not_valid",
+        message: "not-node:value_is_not_telephone",
     },
 ];

package/src/core/{fields/validators/uuid.js → validators/string.uuid.js}

@@ -1,8 +1,9 @@
 module.exports = [
+    ...require("./string"),
     {
         validator(val, { validator }) {
             return validator.isUUID(val);
         },
-        message: "not-node:uuid_is_not_valid",
+        message: "not-node:value_is_not_uuid",
     },
 ];

package/src/form/form.js

@@ -1,5 +1,8 @@
 const Schema = require("mongoose").Schema;
+
 const validator = require("validator");
+const Ajv = require("ajv");
+
 const notPath = require("not-path");
 const notConfig = require("not-config");
 const FormFabric = require("./fabric");
@@ -42,6 +45,7 @@ const { ACTION_DATA_TYPES } = require("../const.js");
 
 const DEFAULT_VALIDATOR_ENVS = {
     validator,
+    ajv: new Ajv(),
     env: true, //some env variables for validators
 };
 

package/src/form/transformers/parseNumber.js

@@ -1,3 +1,3 @@
 module.exports = (input) => {
-    return ~~input;
+    return +input;
 };

package/src/identity/index.js

@@ -13,7 +13,7 @@ module.exports = class notAppIdentity {
     }
 
     static identityToAuthData(identity, req) {
-        return {
+        const data = {
             root: identity.isRoot(),
             admin: identity.isAdmin(),
             auth: identity.isUser(),
@@ -21,9 +21,16 @@ module.exports = class notAppIdentity {
             primaryRole: identity.getPrimaryRole(),
             uid: identity.getUserId(),
             sid: identity.getSessionId(),
-            ip: req ? getIP(req) : undefined,
             provider: identity.constructor.name,
         };
+
+        if (req) {
+            let ip = getIP(req);
+            if (ip) {
+                data.ip = ip;
+            }
+        }
+        return data;
     }
 
     /**