not-node 6.3.65 → 6.3.67

package/package.json

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

package/src/form/form.js

@@ -189,7 +189,7 @@ class Form {
     getModelName(req) {
         if (this.#MODEL_NAME) {
             return this.#MODEL_NAME;
-        } else if (req) {
+        } else if (req && req.notRouteData) {
             return firstLetterToUpper(req.notRouteData.modelName);
         }
         return undefined;

package/src/generic/logic.js

@@ -185,6 +185,8 @@ module.exports = ({
             LogAction(action, identity, {
                 targetId,
                 version: result?.__version,
+                populate,
+                query,
             });
             return result;
         }
@@ -242,6 +244,8 @@ module.exports = ({
             );
             LogAction(action, identity, {
                 targetID,
+                query,
+                populate,
                 version: result?.__version,
             });
             return result;
@@ -292,6 +296,7 @@ module.exports = ({
             const result = await getModel().getOneRaw(targetId, query);
             LogAction(action, identity, {
                 targetId,
+                query,
                 version: result?.__version,
             });
             return result;
@@ -344,7 +349,12 @@ module.exports = ({
                 if (!itm) {
                     throw new DBExceptionDocumentIsNotFound();
                 }
-                if (shouldOwn && !isOwner(itm, identity?.uid)) {
+                if (
+                    shouldOwn &&
+                    identity &&
+                    identity?.uid &&
+                    !isOwner(itm, identity.uid)
+                ) {
                     throw new DBExceptionDocumentIsNotOwnerByActiveUser({
                         params: {
                             targetId,
@@ -442,12 +452,12 @@ module.exports = ({
             shouldOwn = false,
         }) {
             logDebugAction(action, identity);
-            const { skip, size, sorter, filter, search } = query;
+            let { skip, size, sorter, filter, search } = query;
             let populate = await getPopulate(action, {
                 identity,
             });
             if (shouldOwn) {
-                notFilter.filter.modifyRules(filter, {
+                filter = notFilter.filter.modifyRules(filter, {
                     [ownerFieldName]: identity?.uid,
                 });
             }
@@ -484,12 +494,12 @@ module.exports = ({
 
         static async _list({ query, identity, action, shouldOwn = false }) {
             logDebugAction(action, identity);
-            const { skip, size, sorter, filter } = query;
+            let { skip, size, sorter, filter } = query;
             let populate = await getPopulate(action, {
                 identity,
             });
             if (shouldOwn) {
-                notFilter.filter.modifyRules(filter, {
+                filter = notFilter.filter.modifyRules(filter, {
                     [ownerFieldName]: identity?.uid,
                 });
             }
@@ -524,14 +534,14 @@ module.exports = ({
 
         static async _count({ query, action, identity, shouldOwn = false }) {
             logDebugAction(action, identity);
-            const { filter, search } = query;
+            let { filter, search } = query;
             if (shouldOwn) {
-                notFilter.filter.modifyRules(filter, {
+                filter = notFilter.filter.modifyRules(filter, {
                     [ownerFieldName]: identity?.uid,
                 });
             }
             if (search) {
-                notFilter.filter.modifyRules(search, filter);
+                filter = notFilter.filter.modifyRules(search, filter);
             }
             const result = await getModel().countWithFilter(search || filter);
             LogAction(action, identity, { shouldOwn });

package/src/logic/actions.before/ownage/ownage.js

@@ -18,13 +18,13 @@ module.exports = class OwnageBeforeAction {
         if (identity.uid) {
             //if searching, counting, listing and so on
             //adding condition of ownership by this excat user
-            const { filter, search } = query;
+            let { filter, search } = query;
             if (filter) {
-                notFilter.filter.modifyRules(filter, {
+                filter = notFilter.filter.modifyRules(filter, {
                     [OwnageBeforeAction.ownerFieldName]: identity?.uid,
                 });
                 if (search) {
-                    notFilter.filter.modifyRules(search, filter);
+                    search = notFilter.filter.modifyRules(search, filter);
                 }
             }
             args.defaultQueryById = {