not-node 6.5.20 → 6.5.21

package/eslint.config.cjs

@@ -19,9 +19,9 @@ module.exports = [
         ],
     },
     ...compat.extends(
-        "eslint:recommended",
+        "eslint:recommended"
         //"plugin:node/recommended",
-        "plugin:sonarjs/recommended-legacy"
+        //"plugin:sonarjs/recommended-legacy"
     ),
     {
         languageOptions: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.5.20",
+	"version": "6.5.21",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {
@@ -12,7 +12,7 @@
 		"watch:build:cover:dev": "npm-run-all --parallel js-watch",
 		"cover": "nyc npm test",
 		"clear:playground": "rm -rf ./playground",
-		"prepare": "husky install"
+		"prepare": "husky"
 	},
 	"bin": {
 		"not-node": "bin/not-node.js",
@@ -59,7 +59,7 @@
 		"mongoose-validator": "*",
 		"nconf": "*",
 		"not-config": "*",
-		"not-filter": "*",
+		"not-filter": "^0.3.15",
 		"not-inform": "*",
 		"not-locale": "^0.0.22",
 		"not-log": "*",
@@ -135,4 +135,4 @@
 			]
 		}
 	}
-}
+}

package/src/auth/const.js

@@ -29,7 +29,10 @@ const METHOD_SIGNAURES = {
 
 const OBJECT_STRING = "[object String]";
 
+//document owned by registered user
 const DOCUMENT_OWNER_FIELD_NAME = "owner";
+//document owned by guest user
+const DOCUMENT_SESSION_FIELD_NAME = "session";
 const TOKEN_TTL = 3600;
 
 module.exports = {
@@ -39,6 +42,7 @@ module.exports = {
     DEFAULT_USER_ROLE_FOR_ROOT,
     DEFAULT_USER_ROLE_FOR_ADMIN,
     DOCUMENT_OWNER_FIELD_NAME,
+    DOCUMENT_SESSION_FIELD_NAME,
     ACTION_SIGNATURES,
     METHOD_SIGNAURES,
 };

package/src/core/locales/ru.json

@@ -76,5 +76,6 @@
   "select_from_list_label": "Выберите из списка...",
   "field_actions_label": "Действия",
   "form_exception_field_extractor_is_undefined": "Экстрактор для поля входных данных отсутствует",
+  "form_exception_identity_or_query_is_undefined": "Identity или Query отсутствуют",
   "versioning_error_same_old_data": "Данные не изменились, сохранение отклонено."
 }

package/src/exceptions/form.js

@@ -34,3 +34,16 @@ class FormExceptionTooManyRequests extends HttpExceptionTooManyRequests {
 }
 
 module.exports.FormExceptionTooManyRequests = FormExceptionTooManyRequests;
+
+Error("no prepared identity or query");
+
+class FormExceptionIdentityOrQueryIsUndefined extends notRequestError {
+    constructor(formName) {
+        super("not-node:form_exception_identity_or_query_is_undefined", {
+            params: { formName },
+        });
+    }
+}
+
+module.exports.FormExceptionIdentityOrQueryIsUndefined =
+    FormExceptionIdentityOrQueryIsUndefined;

package/src/fields/filter.js

@@ -8,6 +8,7 @@ const { getSafeFieldsForRoleAction } = require("../auth/fields");
 const {
     DEFAULT_USER_ROLE_FOR_GUEST,
     ACTION_SIGNATURES,
+    DOCUMENT_SESSION_FIELD_NAME,
 } = require("../auth/const");
 /**
  * notFieldsFilter.filter(fields, getApp().getModelSchema(MODEL_NAME), {action});
@@ -144,7 +145,11 @@ class notFieldsFilter {
                     system
                 );
             },
-            [SPECIAL_SET_UNSAFE]: ["salt", "password", "session"],
+            [SPECIAL_SET_UNSAFE]: [
+                "salt",
+                "password",
+                DOCUMENT_SESSION_FIELD_NAME,
+            ],
             [SPECIAL_SET_TIMESTAMPS]: ["createdAt", "updatedAt"],
             [SPECIAL_SET_OWNAGE]: (schema) => {
                 const inSchema = Object.keys(schema);

package/src/generic/form.js

@@ -15,6 +15,7 @@ function createDefaultInstance({
     MODULE_NAME,
     MODEL_NAME,
     actionName,
+    config,
     /* validators = [],
     dataValidators = [],*/
 }) {
@@ -23,7 +24,7 @@ function createDefaultInstance({
         ["data", `${MODULE_NAME}//_${Common.firstLetterToLower(MODEL_NAME)}`],
     ];
     const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
-    return new Form({ FIELDS, FORM_NAME, app, MODULE_NAME });
+    return new Form({ FIELDS, FORM_NAME, app, MODULE_NAME, config });
 }
 
 module.exports = createDefaultInstance;

package/src/generic/forms/form._data.js

@@ -5,9 +5,16 @@ const Form = require("../../form/form");
  * @param {object} param0
  * @param {string} param0.MODULE_NAME
  * @param {string} param0.MODEL_NAME
- * @param {string} param0.actionName
- * @param {Array<function>} param0.validators
- * @param {function} param0.afterExtract
+ * @param {string} [param0.actionName = '_data']
+ * @param {Array<function>} [param0.validators=[]]
+ * @param {function} [param0.afterExtract = async (input, req = null) => input || req]
+ * @param {import('../../types.js').notAppConfigReader} [param0.config]
+ * @param {Object.<string, Function>} [param0.EXTRACTORS]
+ * @param {Object.<string, Function>} [param0.TRANSFORMERS]
+ * @param {import('../../types.js').notAppFormProcessingPipe} [param0.INSTRUCTIONS]
+ * @param {Array<Function>} [param0.AFTER_EXTRACT_TRANSFORMERS]
+ * @param {Object.<string, import('../../types.js').notAppFormEnvExtractor>} [param0.ENV_EXTRACTORS]
+ * @param   {import('../../types.js').notAppFormRateLimiterOptions}    [param0.rate]
  * @returns
  */
 module.exports = ({
@@ -16,15 +23,34 @@ module.exports = ({
     actionName = "_data",
     validators = [],
     afterExtract = async (input, req = null) => input || req,
+    EXTRACTORS = {},
+    ENV_EXTRACTORS = {},
+    TRANSFORMERS = {},
+    INSTRUCTIONS = undefined,
+    AFTER_EXTRACT_TRANSFORMERS = [],
+    rate = undefined,
 }) => {
     return class extends Form {
         /**
          *
          * @param {object} param0
          * @param {import('../../app')} param0.app
+         * @param {import('../../types.js').notAppConfigReader} param0.config
          */
-        constructor({ app }) {
-            super({ app, MODULE_NAME, MODEL_NAME, actionName });
+        constructor({ app, config }) {
+            super({
+                app,
+                config,
+                MODULE_NAME,
+                MODEL_NAME,
+                actionName,
+                EXTRACTORS,
+                ENV_EXTRACTORS,
+                TRANSFORMERS,
+                INSTRUCTIONS,
+                AFTER_EXTRACT_TRANSFORMERS,
+                rate,
+            });
         }
 
         extract(data) {

package/src/generic/forms/form.list.js

@@ -1,8 +1,10 @@
 const Form = require("../../form/form");
-
+const {
+    DOCUMENT_OWNER_FIELD_NAME,
+    DOCUMENT_SESSION_FIELD_NAME,
+} = require("../../auth/const");
 const notFilter = require("not-filter");
-const notAppIdentity = require("../../identity");
-
+const FormExceptions = require("../../exceptions/form");
 const FIELDS = [
     ["query", `not-filter//_filterQuery`],
     ["identity", "not-node//identity"],
@@ -30,29 +32,41 @@ const FactoryFormList = ({ MODULE_NAME, MODEL_NAME, actionName = "list" }) => {
         }
 
         /**
-         *
-         *
+         * Adds owner id or session to query.filter
+         * @param {import('../../types').PreparedData}  prepared
          * @param {import('../../types').notNodeExpressRequest} req
          * @return {Promise<import('../../types').PreparedData>}
          */
-        async extract(req) {
-            const envs = this.extractRequestEnvs(req);
-            const user = notAppIdentity.extractAuthData(req);
-            if (user.auth && !user.root && !user.admin) {
-                if (!envs.query.filter) {
-                    envs.query.filter = notFilter.filter.createFilter();
-                }
-                envs.query.filter = notFilter.filter.modifyRules(
-                    envs.query.filter,
+        async afterExtract(prepared, req) {
+            prepared = await super.afterExtract(prepared, req);
+            if (!prepared.identity || !prepared.query) {
+                throw new FormExceptions.FormExceptionIdentityOrQueryIsUndefined(
+                    this.FORM_NAME
+                );
+            }
+            if (!prepared.query.filter) {
+                prepared.query.filter = notFilter.filter.createANDFilter();
+            }
+            if (
+                prepared.identity.auth &&
+                !prepared.identity.root &&
+                !prepared.identity.admin
+            ) {
+                prepared.query.filter = notFilter.filter.modifyRules(
+                    prepared.query.filter,
                     {
-                        owner: user.uid,
+                        [DOCUMENT_OWNER_FIELD_NAME]: prepared.identity.uid,
+                    }
+                );
+            } else if (!prepared.identity.auth && prepared.identity.sid) {
+                prepared.query.filter = notFilter.filter.modifyRules(
+                    prepared.query.filter,
+                    {
+                        [DOCUMENT_SESSION_FIELD_NAME]: prepared.identity.sid,
                     }
                 );
             }
-
-            return {
-                ...envs,
-            };
+            return prepared;
         }
     };
 };

package/src/generic/forms/form.listAndCount.js

@@ -1,63 +1,8 @@
-const Form = require("../../form/form");
+const FactoryFormList = require("./form.list");
 
-const notFilter = require("not-filter");
-const notAppIdentity = require("../../identity");
-
-const FIELDS = [
-    ["query", `not-filter//_filterQuery`],
-    ["identity", "not-node//identity"],
-];
-
-/**
- * Generates generic form to get perform list and count action
- *
- * @param {object}  params
- * @param {string}  params.MODULE_NAME  //module name
- * @param {string}  params.MODEL_NAME   //model name
- * @param {string}  params.actionName   //action name
- * @return {Form}   form class definition
- */
-const FactoryFormListAndCount = ({
-    MODULE_NAME,
-    MODEL_NAME,
-    actionName = "listAndCount",
-}) => {
-    return class extends Form {
-        constructor(params) {
-            super({
-                ...params,
-                FIELDS,
-                MODULE_NAME,
-                MODEL_NAME,
-                actionName,
-            });
-        }
-
-        /**
-         *
-         *
-         * @param {import('../../types').notNodeExpressRequest} req
-         * @return {Promise<import('../../types').PreparedData>}
-         */
-        async extract(req) {
-            const envs = this.extractRequestEnvs(req);
-            const user = notAppIdentity.extractAuthData(req);
-            if (user.auth && !user.root && !user.admin) {
-                if (!envs.query.filter) {
-                    envs.query.filter = notFilter.filter.createFilter();
-                }
-                envs.query.filter = notFilter.filter.modifyRules(
-                    envs.query.filter,
-                    {
-                        owner: user.uid,
-                    }
-                );
-            }
-            return {
-                ...envs,
-            };
-        }
-    };
+module.exports = (params) => {
+    if (!params.actionName) {
+        params.actionName = "listAndCount";
+    }
+    return FactoryFormList(params);
 };
-
-module.exports = FactoryFormListAndCount;