not-node 6.3.28 → 6.3.30

package/package.json

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

package/src/bootstrap/route.js

@@ -87,9 +87,8 @@ module.exports = ({
 
     const createDefaultForm = function ({ actionName, MODULE_NAME }) {
         const FIELDS = [
-            ["activeUser", "not-node//requiredObject"],
+            ["identity", "not-node//requiredObject"],
             ["data", `${MODULE_NAME}//_data`],
-            ["ip", "not-node//ip"],
         ];
         const FORM_NAME = `${MODULE_NAME}:${firstLetterToUpper(
             actionName
@@ -117,16 +116,19 @@ module.exports = ({
     };
 
     const beforeDecorator = async (req, res, next) => {
+        Log?.debug(
+            req.method,
+            req.originalUrl,
+            JSON.stringify(req.notRouteData, null, 4)
+        );
         const actionName = req.notRouteData.actionName;
         const trimmedActionName = actionName.replace("_", "");
         const FormValidator = getForm(trimmedActionName);
-        if (FormValidator) {
-            const prepared = await FormValidator.run(req, res, next);
-            checkAccessRules(trimmedActionName, prepared);
-            return prepared;
-        } else {
-            return {};
-        }
+        const prepared = FormValidator
+            ? await FormValidator.run(req, res, next)
+            : {};
+        await checkAccessRules(trimmedActionName, prepared, req);
+        return prepared;
     };
 
     const afterDecorator = (req, res, next, result) => {

package/src/generic/logic.js

@@ -4,10 +4,9 @@ const { deleteResponseSuccess } = require("../model/utils.js");
 const {
     DBExceptionDocumentIsNotFound,
     DBExceptionDeleteWasNotSuccessful,
-} = require("../exceptions/db.js");
-const {
     DBExceptionDocumentIsNotOwnerByActiveUser,
-} = require("../exceptions/http");
+} = require("../exceptions/db.js");
+
 const isOwnerImported = require("../auth/fields.js").isOwner;
 const { DOCUMENT_OWNER_FIELD_NAME } = require("../auth/const.js");
 const notFilter = require("not-filter");
@@ -81,7 +80,7 @@ module.exports = ({
             checkShouldOwn(data, shouldOwn, identity);
             const res = await getModel().add(data);
             LogAction(action, identity, {
-                targetId: res._id,
+                targetId: res?._id,
             });
             return res;
         }
@@ -134,7 +133,7 @@ module.exports = ({
             const result = await getModel().update(query, data);
             LogAction(action, identity, {
                 targetId,
-                version: result.__version,
+                version: result?.__version,
             });
             return result;
         }
@@ -185,7 +184,7 @@ module.exports = ({
             const result = await getModel().getOne(targetId, populate, query);
             LogAction(action, identity, {
                 targetId,
-                version: result.__version,
+                version: result?.__version,
             });
             return result;
         }
@@ -243,7 +242,7 @@ module.exports = ({
             );
             LogAction(action, identity, {
                 targetID,
-                version: result.__version,
+                version: result?.__version,
             });
             return result;
         }
@@ -293,7 +292,7 @@ module.exports = ({
             const result = await getModel().getOneRaw(targetId, query);
             LogAction(action, identity, {
                 targetId,
-                version: result.__version,
+                version: result?.__version,
             });
             return result;
         }

package/src/manifest/route.js

@@ -133,14 +133,16 @@ class notRoute {
                 );
             }
             obsoleteRuleFields(rule, req.originalUrl);
-            let actionName = this.selectActionName(rule);
-            let mod = this.notApp.getModule(this.moduleName);
+            const actionName = this.selectActionName(rule);
+            const mod = this.notApp.getModule(this.moduleName);
             if (!mod) {
                 return next(
                     new HttpError(
                         404,
                         [
                             "module not found",
+                            req.method,
+                            req.originalUrl,
                             this.moduleName,
                             this.routeName,
                             actionName,
@@ -148,7 +150,7 @@ class notRoute {
                     )
                 );
             }
-            let modRoute = mod.getRoute(this.routeName);
+            const modRoute = mod.getRoute(this.routeName);
             this.setRequestRouteData(
                 req,
                 this.createRequestRouteData(actionName, rule)
@@ -165,6 +167,8 @@ class notRoute {
                         404,
                         [
                             "route not found",
+                            req.method,
+                            req.originalUrl,
                             this.moduleName,
                             this.routeName,
                             actionName,