not-node 6.2.18 → 6.2.20

package/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm test

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.2.18",
+	"version": "6.2.20",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {
@@ -11,7 +11,8 @@
 		"js-watch": "watch 'npm run cover' ./src ./test --interval=5",
 		"watch:build:cover:dev": "npm-run-all --parallel js-watch",
 		"cover": "nyc npm test",
-		"clear:playground": "rm -rf ./playground"
+		"clear:playground": "rm -rf ./playground",
+		"prepare": "husky install"
 	},
 	"bin": {
 		"not-node": "./bin/not-node.js",
@@ -35,7 +36,6 @@
 		"url": "https://github.com/interrupter/not-node/issues"
 	},
 	"dependencies": {
-		"xss": "*",
 		"body-parser": "^1.20.1",
 		"commander": "^9.5.0",
 		"compression": "^1.7.4",
@@ -63,7 +63,8 @@
 		"not-config": "*",
 		"not-error": "*",
 		"not-filter": "*",
-		"not-locale": "*",
+		"not-inform": "*",
+		"not-locale": "^0.0.22",
 		"not-log": "*",
 		"not-monitor": "*",
 		"not-path": "*",
@@ -76,6 +77,7 @@
 		"serve-static": "*",
 		"simple-git": "*",
 		"validator": "*",
+		"xss": "*",
 		"yargs": "*"
 	},
 	"devDependencies": {
@@ -85,6 +87,7 @@
 		"eslint": "^8.31.0",
 		"eslint-plugin-node": "^11.1.0",
 		"eslint-plugin-sonarjs": "^0.17.0",
+		"husky": "^8.0.3",
 		"ink-docstrap": "^1.3.2",
 		"ioredis": "^5.2.4",
 		"jsdoc": "^4.0.0",

package/src/auth/roles.js

@@ -16,6 +16,14 @@ function compareRolesArrayAgainstArray(userRoles, actionRoles, strict) {
     }
 }
 
+function compareRolesStrict(userRoles, actionRoles) {
+    if (actionRoles.length === 1) {
+        return actionRoles.includes(userRoles);
+    } else {
+        return false;
+    }
+}
+
 /**
  *	Compares two list of roles
  *	@param	{array|string}	userRoles 		roles of user
@@ -41,7 +49,7 @@ function compareRoles(userRoles, actionRoles, strict = true) {
     } else {
         if (Array.isArray(actionRoles)) {
             if (strict) {
-                return false;
+                return compareRolesStrict(userRoles, actionRoles);
             } else {
                 return actionRoles.indexOf(userRoles) > -1;
             }

package/src/auth/rules.js

@@ -17,13 +17,13 @@ function compareWithRoot(rule, root) {
     }
 }
 
-function compareRuleRoles(rule, role, auth) {
-    if (ROLES.compareRoles(rule.role, role)) {
-        if (objHas(rule, "auth")) {
-            if (rule.auth && auth) {
+function compareRuleRoles(actionRule, userRole, auth) {
+    if (ROLES.compareRoles(userRole, actionRule.role)) {
+        if (objHas(actionRule, "auth")) {
+            if (actionRule.auth && auth) {
                 return true;
             } else {
-                return !rule.auth && !auth;
+                return !actionRule.auth && !auth;
             }
         } else {
             return true;

package/src/cli/actions/env.mjs

@@ -1 +1 @@
-export default (program, { CWD }) => {};
+export default (/*program, { /*CWD }*/) => {};

package/src/cli/actions/nginx.mjs

@@ -1 +1 @@
-export default (program, { CWD }) => {};
+export default (/*program, { CWD }*/) => {};

package/src/cli/actions/pm2.mjs

@@ -1 +1 @@
-export default (program, { CWD }) => {};
+export default (/*program, { CWD }*/) => {};

package/src/common.js

@@ -155,7 +155,7 @@ module.exports.executeFunctionAsAsync = executeFunctionAsAsync;
  * @return {Promise}          results of method execution
  **/
 module.exports.executeObjectFunction = async (obj, name, params) => {
-    if (obj) {
+    if (!obj) {
         return;
     }
     if (name.indexOf(".") > -1) {

package/src/domain.js

@@ -63,19 +63,27 @@ class notDomain extends EventEmitter {
         return this;
     }
 
-    getOptions() {
+    get modules() {
+        return this.#modules;
+    }
+
+    get options() {
         return this.#options;
     }
 
+    getOptions() {
+        return this.options;
+    }
+
     /**
      *  Cycles throu all imported modules, passes name, module, and itself
      *  to argument function
      *  @param   {function}  func  function to perfom some action with module
      **/
     forEachMod(func) {
-        if (this.#modules) {
-            for (let t of Object.keys(this.#modules)) {
-                let mod = this.#modules[t];
+        if (this.modules) {
+            for (let t of Object.keys(this.modules)) {
+                let mod = this.modules[t];
                 if (mod) {
                     func(t, mod, this);
                 }
@@ -105,14 +113,18 @@ class notDomain extends EventEmitter {
         let mod = new notModule({
             modPath: modulePath,
             modObject: null,
-            mongoose: this.#options.mongoose,
+            mongoose: this.options.mongoose,
             notApp: this,
-            fields: this.#options.fields,
+            fields: this.options.fields,
         });
         this.importModule(mod, mod.getName() || moduleName);
         return this;
     }
 
+    setModule(name, val) {
+        this.#modules[name] = val;
+    }
+
     /**
      *  Import module object. Chainable.
      *  @param   {object}  mod      notModule instance
@@ -120,7 +132,7 @@ class notDomain extends EventEmitter {
      *  @return {object}        notDomain
      **/
     importModule(mod, moduleName) {
-        this.#modules[moduleName] = mod;
+        this.setModule(moduleName, mod);
         return this;
     }
 
@@ -132,8 +144,8 @@ class notDomain extends EventEmitter {
     getRoute(name) {
         if (name.indexOf("//") > 0) {
             let [moduleName, routeName, routeFunctionName] = name.split("//");
-            if (this.#modules && objHas(this.#modules, moduleName)) {
-                let route = this.#modules[moduleName].getRoute(routeName);
+            if (this.modules && objHas(this.modules, moduleName)) {
+                let route = this.getModule(moduleName).getRoute(routeName);
                 if (objHas(route, routeFunctionName)) {
                     return route[routeFunctionName];
                 }
@@ -177,8 +189,8 @@ class notDomain extends EventEmitter {
 
     getByFullPath(name, type) {
         let [moduleName, resourceName] = name.split("//");
-        if (this.#modules && objHas(this.#modules, moduleName)) {
-            return this.#modules[moduleName][`get${firstLetterToUpper(type)}`](
+        if (this.modules && objHas(this.modules, moduleName)) {
+            return this.getModule(moduleName)[`get${firstLetterToUpper(type)}`](
                 resourceName
             );
         } else {
@@ -188,9 +200,9 @@ class notDomain extends EventEmitter {
     }
 
     getByShortPath(resourceName, type) {
-        for (let moduleName of Object.keys(this.#modules)) {
+        for (let moduleName of Object.keys(this.modules)) {
             const res =
-                this.#modules[moduleName][`get${firstLetterToUpper(type)}`](
+                this.getModule(moduleName)[`get${firstLetterToUpper(type)}`](
                     resourceName
                 );
             if (res) {
@@ -257,12 +269,12 @@ class notDomain extends EventEmitter {
      *  @return {object}  module
      **/
     getModule(moduleName) {
-        if (this.#modules && objHas(this.#modules, moduleName)) {
-            return this.#modules[moduleName];
+        if (this.modules && objHas(this.modules, moduleName)) {
+            return this.modules[moduleName];
         } else {
-            for (let t in this.#modules) {
-                if (this.#modules[t].getName() === moduleName) {
-                    return this.#modules[t];
+            for (let t in this.modules) {
+                if (this.modules[t].getName() === moduleName) {
+                    return this.modules[t];
                 }
             }
             return null;
@@ -275,7 +287,7 @@ class notDomain extends EventEmitter {
      *  @param {Object}  params         params to pass to method
      **/
     async execInModules(methodName, params) {
-        for (let mod of Object.values(this.#modules)) {
+        for (let mod of Object.values(this.modules)) {
             try {
                 await executeObjectFunction(mod, "exec", [methodName, params]);
             } catch (e) {
@@ -289,7 +301,7 @@ class notDomain extends EventEmitter {
      *  Create mongoose models.
      **/
     fabricate() {
-        for (let mod of Object.values(this.#modules)) {
+        for (let mod of Object.values(this.modules)) {
             mod.fabricateModels && mod.fabricateModels();
         }
     }
@@ -406,7 +418,7 @@ class notDomain extends EventEmitter {
      * @return {Object}  complex object with results
      **/
     getStatus() {
-        const mods = Object.keys(this.#modules);
+        const mods = Object.keys(this.modules);
         let stats = {
             modules: {
                 count: mods.length,
@@ -434,8 +446,8 @@ class notDomain extends EventEmitter {
                 list: [],
             },
         };
-        for (let modName in this.#modules) {
-            const mod = this.#modules[modName];
+        for (let modName in this.modules) {
+            const mod = this.modules[modName];
             let modStatus = mod.getStatus();
             stats.modules.content[modName] = modStatus;
             stats.routes.count += modStatus.routes.count;
@@ -469,7 +481,7 @@ class notDomain extends EventEmitter {
     }
 
     getModulesNames() {
-        return Object.keys(this.#modules);
+        return Object.keys(this.modules);
     }
 }
 

package/src/form/env_extractors/index.js

@@ -3,10 +3,10 @@
  */
 
 module.exports = {
-    _id: require("./_id.js"),
     ID: require("./ID.js"),
+    _id: require("./_id.js"),
     activeUser: require("./activeUser.js"),
     ip: require("./ip.js"),
-    query: require("./query.js"),
     modelNameID: require("./modelNameID.js"),
+    query: require("./query.js"),
 };

package/src/form/extractors/index.js

@@ -5,6 +5,6 @@ module.exports = {
     activeUserId: require("./activeUserId.js"),
     activeUserModelName: require("./activeUserModelName.js"),
     fromBody: require("./fromBody.js"),
-    fromQuery: require("./fromQuery.js"),
     fromParams: require("./fromParams.js"),
+    fromQuery: require("./fromQuery.js"),
 };

package/src/identity/providers/session.js

@@ -43,6 +43,9 @@ module.exports = class IdentityProviderSession {
         const roles = this.getRole();
         for (let role of roles) {
             if (
+                Array.isArray(
+                    IdentityProviderSession.#getOptions().primaryRoles
+                ) &&
                 IdentityProviderSession.#getOptions().primaryRoles.includes(
                     role
                 )

package/src/manifest/batchRunner.js

@@ -8,6 +8,10 @@ module.exports = class BatchRunner {
         this.setProcessors(processors);
     }
 
+    get processors() {
+        return this.#processors;
+    }
+
     setProcessors(list = []) {
         this.#processors = [...list];
     }
@@ -24,7 +28,7 @@ module.exports = class BatchRunner {
      * @return {boolean}                       true - executed, false - no paths
      **/
     exec({ nModule }) {
-        if (!nModule.module.paths) {
+        if (!nModule?.module?.paths) {
             return false;
         }
         //starting from simpliest forms and moving upwards

package/src/manifest/registrator/fields.js

@@ -87,12 +87,12 @@ module.exports = class notModuleRegistratorFields {
     }
 
     register({ nModule, fromPath }) {
-        let fields = notModuleRegistratorFields.openFile(fromPath);
-        if (fields && objHas(fields, "FIELDS")) {
+        let file = notModuleRegistratorFields.openFile(fromPath);
+        if (file && objHas(file, "FIELDS")) {
             //collection
             this.registerFields({
                 nModule,
-                lib: fields.FIELDS, //fields dictionary
+                lib: file.FIELDS, //fields dictionary
                 fromPath,
             });
         } else {
@@ -101,7 +101,7 @@ module.exports = class notModuleRegistratorFields {
             this.registerField({
                 nModule,
                 name: parts.name, //fields name
-                field: fields, //field description
+                field: file, //field description
                 fromPath,
             });
         }

package/src/manifest/route.js

@@ -108,6 +108,7 @@ class notRoute {
                     )
                 );
             }
+            console.log(rule);
             obsoleteWarning(rule, req.originalUrl);
             let actionName = this.selectActionName(rule);
             let mod = this.notApp.getModule(this.moduleName);
@@ -190,6 +191,14 @@ class notRoute {
                 prepared,
             ]);
             //filter result IF actionData.return specified
+            if (typeof result.toObject === "function") {
+                result = result.toObject();
+            }
+            if (Array.isArray(result)) {
+                result = result.map((itm) =>
+                    itm.toObject ? itm.toObject() : itm
+                );
+            }
             notManifestRouteResultFilter.filter(req.notRouteData, result);
             //run after with results, continue without waiting when it finished
             return this.executeFunction(modRoute, CONST_AFTER_ACTION, [

package/src/model/exceptions.js

@@ -7,13 +7,13 @@ class VersioningExceptionSameOldData extends notError {
 }
 module.exports.VersioningExceptionSameOldData = VersioningExceptionSameOldData;
 
-class VersioningExceptionNoPpreviousVersions extends notError {
+class VersioningExceptionNoPreviousVersions extends notError {
     constructor() {
         super("not-node:versioning_error_no_previous_versions");
     }
 }
-module.exports.VersioningExceptionNoPpreviousVersions =
-    VersioningExceptionNoPpreviousVersions;
+module.exports.VersioningExceptionNoPreviousVersions =
+    VersioningExceptionNoPreviousVersions;
 
 class IncrementExceptionIDGeneratorRebaseFailed extends notError {
     constructor() {

package/src/model/versioning.js

@@ -16,7 +16,7 @@ function toObject(obj) {
 }
 
 const {
-    VersioningExceptioNoPpreviousVersions,
+    VersioningExceptionNoPreviousVersions,
     VersioningExceptionSameOldData,
 } = require("./exceptions.js");
 
@@ -78,7 +78,7 @@ class ModelVersioning {
                 toObject(previous)
             );
         } else {
-            throw new VersioningExceptioNoPpreviousVersions();
+            throw new VersioningExceptionNoPreviousVersions();
         }
     }
 

package/test/auth/routes.js

@@ -3,6 +3,8 @@ const {
     HttpExceptionForbidden,
 } = require("../../src/exceptions/http");
 
+const notAppIdentity = require("../../src/identity/index");
+
 module.exports = ({ Auth, expect }) => {
     describe("Routes", () => {
         describe("getIP", () => {
@@ -31,6 +33,7 @@ module.exports = ({ Auth, expect }) => {
                     socket: {
                         remoteAddress: "127.0.0.1",
                     },
+                    get() {},
                 };
                 let result = Auth.getIP(req);
                 expect(result).to.deep.equal("127.0.0.1");
@@ -55,15 +58,19 @@ module.exports = ({ Auth, expect }) => {
                     headers: {
                         "x-forwarded-for": "127.0.0.1",
                     },
+                    get() {},
                     user: {},
-                    session: {},
+                    session: {
+                        save() {},
+                    },
                 };
                 let result = Auth.extractAuthData(req);
                 expect(result).to.deep.equal({
                     root: false,
                     auth: false,
-                    role: undefined,
-                    uid: undefined,
+                    role: [Auth.DEFAULT_USER_ROLE_FOR_GUEST],
+                    primaryRole: Auth.DEFAULT_USER_ROLE_FOR_GUEST,
+                    uid: null,
                     sid: undefined,
                     ip: "127.0.0.1",
                 });
@@ -76,6 +83,7 @@ module.exports = ({ Auth, expect }) => {
                         session: {
                             user: true,
                         },
+                        get() {},
                     },
                     next = function (val) {
                         return val;
@@ -89,6 +97,7 @@ module.exports = ({ Auth, expect }) => {
                         session: {
                             user: false,
                         },
+                        get() {},
                     },
                     next = function (val) {
                         return val;
@@ -101,6 +110,7 @@ module.exports = ({ Auth, expect }) => {
         describe("checkRoot", function () {
             it("check if admin exists and continues", function () {
                 const req = {
+                        get() {},
                         session: {
                             user: true,
                             role: [Auth.DEFAULT_USER_ROLE_FOR_ADMIN],
@@ -119,6 +129,7 @@ module.exports = ({ Auth, expect }) => {
                             user: true,
                             role: "manager",
                         },
+                        get() {},
                     },
                     next = function (val) {
                         return val;
@@ -135,24 +146,33 @@ module.exports = ({ Auth, expect }) => {
                             user: true,
                             role: [Auth.DEFAULT_USER_ROLE_FOR_ADMIN],
                         },
+                        get() {},
                     },
                     next = function (val) {
                         return val;
                     };
-                let result = Auth.checkAdmin(req, false, next);
+                let result = Auth.checkRoot(req, false, next);
                 expect(result).to.deep.equal();
             });
         });
 
         describe("checkRoleBuilder", function () {
             it("Role", function () {
+                notAppIdentity.identity = class {
+                    static of() {
+                        return class {
+                            static getRole() {
+                                return "user";
+                            }
+                            static getUserId() {}
+                            static isUser() {
+                                return true;
+                            }
+                        };
+                    }
+                };
                 const role = "user",
-                    req = {
-                        session: {
-                            user: true,
-                            role: "user",
-                        },
-                    },
+                    req = {},
                     next = function (val) {
                         return val;
                     };
@@ -162,9 +182,13 @@ module.exports = ({ Auth, expect }) => {
             });
 
             it("Role with error", function () {
+                let saved = false;
                 const role = "manager",
                     req = {
                         session: {
+                            save() {
+                                saved = true;
+                            },
                             user: true,
                             role: "user",
                         },

package/test/fakes.js

@@ -0,0 +1,52 @@
+const { DEFAULT_USER_ROLE_FOR_GUEST } = require("../src/auth");
+
+module.exports = {
+    createFakeEmit: (val, err) => {
+        return async () => {
+            if (err) {
+                throw err;
+            } else {
+                return val;
+            }
+        };
+    },
+    fakeIdentity: (
+        id = {
+            root: false,
+            auth: false,
+            role: [DEFAULT_USER_ROLE_FOR_GUEST],
+            primaryRole: DEFAULT_USER_ROLE_FOR_GUEST,
+            uid: undefined,
+            sid: undefined,
+            ip: undefined,
+        }
+    ) => {
+        return class {
+            static of() {
+                return class {
+                    static isRoot() {
+                        return id.root;
+                    }
+                    static isUser() {
+                        return id.auth;
+                    }
+                    static getRole() {
+                        return id.role;
+                    }
+                    static getPrimaryRole() {
+                        return id.primaryRole;
+                    }
+                    static getUserId() {
+                        return id.uid;
+                    }
+                    static getSessionId() {
+                        return id.sid;
+                    }
+                    static getIP() {
+                        return id.ip;
+                    }
+                };
+            }
+        };
+    },
+};