not-node 6.1.6 → 6.1.8

package/package.json

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

package/src/cli/actions/project.mjs

@@ -52,31 +52,31 @@ async function createProjectToolsAndConfigs(projectDir, projectConfig) {
 export default (program, { CWD }) => {
     program
         .command("create")
-        .addOption(
+        /*.addOption(
             new Option("-d, --dir <dir>").default(
                 CWD,
                 "current working directory"
             )
-        )
+        )*/
+        .argument("<dir>", "target dir")
         .addOption(
             new Option("-v, --verbose").default(false, "extensive output")
         )
         .description(
             "create application in target directory (create -d [pathToDir])"
         )
-        .action(async (opts) => {
-            //      console.log("create command called :" + opts.dir);
-            if (!isAbsolute(opts.dir)) {
-                opts.dir = resolve(CWD, opts.dir);
+        .action(async (dir, ...opts) => {
+            if (!isAbsolute(dir)) {
+                dir = resolve(CWD, dir);
             }
-            const siteDir = resolve(opts.dir, "./site");
-            if (opts.v) {
+            const siteDir = resolve(dir, "./site");
+            if (opts.verbose) {
                 Logger.setSilent(false);
             }
-            console.log("creating project in", opts.dir);
+            console.log("creating project in", dir);
             console.log("creating site in", siteDir);
             const ProjectConfig = {
-                path: opts.dir,
+                path: dir,
             };
             //
             ProjectConfig.AppName = await Readers.AppName(
@@ -119,15 +119,15 @@ export default (program, { CWD }) => {
                 inquirer,
                 ProjectConfig
             );
-            await createDir(opts.dir);
-            await createDirContent(opts.dir, ProjectStructure, ProjectConfig);
-            await createProjectToolsAndConfigs(opts.dir, ProjectConfig);
+            await createDir(dir);
+            await createDirContent(dir, ProjectStructure, ProjectConfig);
+            await createProjectToolsAndConfigs(dir, ProjectConfig);
             const PATH_MODULES_SERVER = resolve(
-                opts.dir,
+                dir,
                 Options.DEFAULT_SERVER_MODULES_SUB_PATH
             );
             const PATH_MODULES_FRONT = resolve(
-                opts.dir,
+                dir,
                 Options.DEFAULT_FRONT_MODULES_SUB_PATH
             );
             while (await Readers.isUserNeedCreateServerModule(inquirer)) {

package/src/identity/identity.js

@@ -17,6 +17,25 @@ class Identity {
         token: IdentityProviderToken,
     };
 
+    static #primaryRoles = [];
+    static #secondaryRoles = [];
+
+    static setPrimaryRoles(list = []) {
+        this.#primaryRoles = [...list];
+        this.#providers.forEach((itm) => {
+            itm.setPrimaryRoles([...list]);
+        });
+        return this;
+    }
+
+    static setSecondaryRoles(list = []) {
+        this.#secondaryRoles = [...list];
+        this.#providers.forEach((itm) => {
+            itm.setSecondaryRoles([...list]);
+        });
+        return this;
+    }
+
     static of(req) {
         const Provider = this.providerSelector(req);
         return new Provider(req);

package/src/identity/index.js

@@ -23,6 +23,7 @@ module.exports = class notAppIdentity {
             root: identity.isRoot(),
             auth: identity.isUser(),
             role: identity.getRole(),
+            primaryRole: identity.getPrimaryRole(),
             uid: identity.getUserId(),
             sid: identity.getSessionId(),
             ip: getIP(req),

package/src/identity/providers/session.js

@@ -12,6 +12,14 @@ module.exports = class IdentityProviderSession {
         return this.#options;
     }
 
+    static setPrimaryRoles(list = []) {
+        this.#options.primaryRoles = list;
+    }
+
+    static setSecondaryRoles(list = []) {
+        this.#options.secondaryRoles = list;
+    }
+
     constructor(req) {
         this.req = req;
         return this;
@@ -27,9 +35,23 @@ module.exports = class IdentityProviderSession {
         return req && req.session && req.session.user ? true : false;
     }
 
+    /**
+     *	Returns primary user role from request object
+     *	@return {string} user role
+     **/
+    getPrimaryRole() {
+        const roles = this.getRole();
+        for (let role of roles) {
+            if (this.#options.primaryRoles.includes(role)) {
+                return role;
+            }
+        }
+        return CONST.DEFAULT_USER_ROLE_FOR_GUEST;
+    }
+
     /**
      *	Returns user role from request object
-     *	@return user role
+     *	@return {Array<string>} user role
      **/
     getRole() {
         const req = this.req;

package/src/identity/providers/token.js

@@ -21,6 +21,14 @@ module.exports = class IdentityProviderToken {
         return this.#options;
     }
 
+    static setPrimaryRoles(list = []) {
+        this.#options.primaryRoles = list;
+    }
+
+    static setSecondaryRoles(list = []) {
+        this.#options.secondaryRoles = list;
+    }
+
     constructor(req) {
         this.req = req;
         this.#extractToken(req);
@@ -171,6 +179,20 @@ module.exports = class IdentityProviderToken {
         return !!this.tokenContent?._id;
     }
 
+    /**
+     *	Returns primary user role from request object
+     *	@return {string} user role
+     **/
+    getPrimaryRole() {
+        const roles = this.getRole();
+        for (let role of roles) {
+            if (this.#options.primaryRoles.includes(role)) {
+                return role;
+            }
+        }
+        return CONST.DEFAULT_USER_ROLE_FOR_GUEST;
+    }
+
     /**
      *	Returns user role from token object
      *	@return user role

package/src/init/lib/identity.js

@@ -0,0 +1,19 @@
+const log = require("not-log")(module, "not-node//init//identity");
+const notAppIdentity = require("../../identity");
+
+module.exports = class InitIdentity {
+    async run({ config, options, master, emit }) {
+        await emit("identity.pre", { config, options, master });
+
+        log.info("Setting up user Identity roles...");
+
+        const roles = config.get("modules.user.roles");
+        if (roles) {
+            notAppIdentity.identity
+                .setPrimaryRoles(roles?.primary || [])
+                .setSecondaryRoles(roles?.secondary || []);
+        }
+
+        await emit("identity.post", { config, options, master });
+    }
+};

package/src/init/sequence.standart.js

@@ -1,5 +1,6 @@
 const initEnv = require("./lib/env");
 const initDB = require("./lib/db");
+const initIdentity = require("./lib/identity");
 const InitDBRedlock = require("./lib/redlock");
 const initExpress = require("./lib/express");
 const initCompression = require("./lib/compression");
@@ -27,6 +28,8 @@ module.exports = [
     initEnv,
     //DB access drivers
     initDB,
+    //user Identity roles
+    initIdentity,
     //locking mech based upon ioredis
     InitDBRedlock,
     //http(s) server

package/src/metas.js

@@ -6,7 +6,7 @@ const Auth = require("./auth"),
 function getRole(req) {
     const identity = new notAppIdentity(req);
     if (identity.isUser()) {
-        return identity.getRole();
+        return identity.getPrimaryRole();
     } else {
         return Auth.DEFAULT_USER_ROLE_FOR_GUEST;
     }

package/.env

@@ -1,12 +0,0 @@
-NOT_NODE_ERROR_KEY=2f721c40-30c5-4f35-9e45-cfea1be33f03
-NOT_NODE_ERROR_URL_NODE=https://reporter.local/api/key/collect
-NOT_NODE_ERROR_URL_BROWSER=https://reporter.local/api/key/collect
-INIT_ROOT_USERNAME=root
-INIT_ROOT_EMAIL=admin@appmon.ru
-INIT_ROOT_PASSWORD=tester
-db__mongoose__uri=mongodb://localhost/reporter?authSource=reporter
-db__mongoose__options__user=reporter
-db__mongoose__options__pass=developer
-db__mongoose__options__db=reporter
-db__mongoose__options__host=localhost
-db__mongoose__options__authSource=reporter

package/playground/.env

@@ -1,16 +0,0 @@
-
-NOT_NODE_ERROR_KEY=123456
-NOT_NODE_ERROR_URL_NODE=https://appmon.ru/api/key/collect
-NOT_NODE_ERROR_URL_BROWSER=https://appmon.ru/api/key/collect
-
-
-NOT_NODE_MONITOR_INTERVAL=5000
-NOT_NODE_MONITOR_REPORT_INTERVAL=60
-NOT_NODE_MONITOR_REPORT_KEY=123456
-NOT_NODE_MONITOR_REPORT_URL=https://appmon.ru/api/key/collect
-
-
-INIT_ROOT_USERNAME=root
-INIT_ROOT_EMAIL=admin@not-node-application.local
-INIT_ROOT_PASSWORD=cuPbvauK5F
-

package/playground/deploy/production.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-echo 'deploying notNodeApplication to production'
-cd site
-npm run production
-cd ../
-echo 'syncing data'
-ssh cypher@not-node-application "echo '1' > /var/server/not-node-application/deploying"
-rsync -av --progress --exclude-from='./deploy/.exclude' site cypher@not-node-application:/var/server/not-node-application/
-rsync -av --progress deploy/production.json cypher@not-node-application:/var/server/not-node-application/pm2/production.json
-ssh cypher@not-node-application "cd /var/server/not-node-application/site && npm i"
-ssh cypher@not-node-application "cd /var/server/not-node-application && pm2 startOrRestart pm2/production.json"
-ssh cypher@not-node-application "rm /var/server/not-node-application/deploying"
-exit 0;

package/playground/deploy/stage.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-echo 'deploying notNodeApplication to stage'
-cd site
-npm run stage
-cd ../
-echo 'syncing data'
-ssh cypher@stage.not-node-application "echo '1' > /var/server/not-node-application/deploying"
-rsync -av --progress --exclude-from='./deploy/.exclude' site cypher@stage.not-node-application:/var/server/not-node-application/
-rsync -av --progress deploy/stage.json cypher@stage.not-node-application:/var/server/not-node-application/pm2/stage.json
-ssh cypher@stage.not-node-application "cd /var/server/not-node-application/site && npm i"
-ssh cypher@stage.not-node-application "cd /var/server/not-node-application && pm2 startOrRestart pm2/stage.json"
-ssh cypher@stage.not-node-application "rm /var/server/not-node-application/deploying"
-exit 0;

package/playground/nginx/development.conf

@@ -1,55 +0,0 @@
-map $http_upgrade $connection_upgrade {
-    default upgrade;
-    '' close;
-}
-
-upstream websocket2 {
-    server :;
-}
-
-server {
-    listen 80  ssl   http2   ;
-    root /var/server/nn/playground/site/app/static;
-    index index.html index.htm;
-    server_name not-node-application.local;
-    
-    location /assets/{expires 365d; alias /var/server/nn/playground/site/app/static/assets/;}	
-    location /css/{	expires 365d; alias /var/server/nn/playground/site/app/static/css/;}	
-    location /js/{	expires 365d;alias /var/server/nn/playground/site/app/static/js/;	}
-    location /img/{	expires 365d;alias /var/server/nn/playground/site/app/static/img/;}
-    location /webfonts/{	expires 365d;alias /var/server/nn/playground/site/app/static/webfonts/;	}
-    location /favicon.ico {	expires 365d;alias /var/server/nn/playground/site/app/static/favicon.ico;	}
-    location /sitemap.xml {	expires 1d; alias /var/server/nn/playground/site/app/static/sitemap.xml;	}
-    location /robots.txt {	expires 365d;alias /var/server/nn/playground/site/app/static/robots.txt;	}
-    location /manifest.webmaniest {	expires 365d;alias /var/server/nn/playground/site/app/static/manifest.webmaniest;	}
-
-
-    location /api {
-        expires -1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-FILENAME $http_x_filename;
-        proxy_set_header SessionID $http_SessionID;
-        proxy_pass http://not-node-application.local:3000/api;
-    }
-
-    
-
-
-    location / {		
-        expires 365d;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-FILENAME $http_x_filename;
-        proxy_set_header SessionID $http_SessionID;
-        proxy_pass http://not-node-application.local:3000/;
-    }
-
-    
-    listen 443 ssl  http2   ;
-    
-}

package/playground/nginx/production.conf

@@ -1,55 +0,0 @@
-map $http_upgrade $connection_upgrade {
-    default upgrade;
-    '' close;
-}
-
-upstream websocket2 {
-    server :;
-}
-
-server {
-    listen 80  ssl   http2   ;
-    root /var/server/not-node-application/site/app/static;
-    index index.html index.htm;
-    server_name not-node-application;
-    
-    location /assets/{expires 365d; alias /var/server/not-node-application/site/app/static/assets/;}	
-    location /css/{	expires 365d; alias /var/server/not-node-application/site/app/static/css/;}	
-    location /js/{	expires 365d;alias /var/server/not-node-application/site/app/static/js/;	}
-    location /img/{	expires 365d;alias /var/server/not-node-application/site/app/static/img/;}
-    location /webfonts/{	expires 365d;alias /var/server/not-node-application/site/app/static/webfonts/;	}
-    location /favicon.ico {	expires 365d;alias /var/server/not-node-application/site/app/static/favicon.ico;	}
-    location /sitemap.xml {	expires 1d; alias /var/server/not-node-application/site/app/static/sitemap.xml;	}
-    location /robots.txt {	expires 365d;alias /var/server/not-node-application/site/app/static/robots.txt;	}
-    location /manifest.webmaniest {	expires 365d;alias /var/server/not-node-application/site/app/static/manifest.webmaniest;	}
-
-
-    location /api {
-        expires -1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-FILENAME $http_x_filename;
-        proxy_set_header SessionID $http_SessionID;
-        proxy_pass http://not-node-application:3000/api;
-    }
-
-    
-
-
-    location / {		
-        expires 365d;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-FILENAME $http_x_filename;
-        proxy_set_header SessionID $http_SessionID;
-        proxy_pass http://not-node-application:3000/;
-    }
-
-    
-    listen 443 ssl  http2   ;
-    
-}

package/playground/nginx/stage.conf

@@ -1,55 +0,0 @@
-map $http_upgrade $connection_upgrade {
-    default upgrade;
-    '' close;
-}
-
-upstream websocket2 {
-    server :;
-}
-
-server {
-    listen 80  ssl   http2   ;
-    root /var/server/not-node-application/site/app/static;
-    index index.html index.htm;
-    server_name stage.not-node-application;
-    
-    location /assets/{expires 365d; alias /var/server/not-node-application/site/app/static/assets/;}	
-    location /css/{	expires 365d; alias /var/server/not-node-application/site/app/static/css/;}	
-    location /js/{	expires 365d;alias /var/server/not-node-application/site/app/static/js/;	}
-    location /img/{	expires 365d;alias /var/server/not-node-application/site/app/static/img/;}
-    location /webfonts/{	expires 365d;alias /var/server/not-node-application/site/app/static/webfonts/;	}
-    location /favicon.ico {	expires 365d;alias /var/server/not-node-application/site/app/static/favicon.ico;	}
-    location /sitemap.xml {	expires 1d; alias /var/server/not-node-application/site/app/static/sitemap.xml;	}
-    location /robots.txt {	expires 365d;alias /var/server/not-node-application/site/app/static/robots.txt;	}
-    location /manifest.webmaniest {	expires 365d;alias /var/server/not-node-application/site/app/static/manifest.webmaniest;	}
-
-
-    location /api {
-        expires -1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-FILENAME $http_x_filename;
-        proxy_set_header SessionID $http_SessionID;
-        proxy_pass http://stage.not-node-application:3000/api;
-    }
-
-    
-
-
-    location / {		
-        expires 365d;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-FILENAME $http_x_filename;
-        proxy_set_header SessionID $http_SessionID;
-        proxy_pass http://stage.not-node-application:3000/;
-    }
-
-    
-    listen 443 ssl  http2   ;
-    
-}

package/playground/pm2/development.json

@@ -1,46 +0,0 @@
-{
-	"apps": [
-		{
-			"name": "not-node-application.development",
-			"script": "./site/app/server/index.js",
-			"node_args": [
-				"--stack-trace-limit=50",
-                
-				"--inspect=3002"
-                
-			],
-			"watch": true,
-			"ignore_watch": [
-				"./site/node_modules",
-				"./site/docs",
-				"./site/app/static",
-				"./site/app/front/build",
-				"./db.dumps"
-			],
-			"exec_mode": "fork",
-			"env": {
-				"hostname": "https://not-node-application.local",
-				"NODE_ENV": "development",
-                
-				"NOT_NODE_ERROR_KEY": "123456",
-				"NOT_NODE_ERROR_URL_NODE": "https://appmon.ru/api/key/collect",
-				"NOT_NODE_ERROR_URL_BROWSER": "https://appmon.ru/api/key/collect",
-                
-                
-				"NOT_NODE_MONITOR_INTERVAL": 5000,
-				"NOT_NODE_MONITOR_REPORT_INTERVAL": 60,
-				"NOT_NODE_MONITOR_REPORT_KEY": "123456",
-				"NOT_NODE_MONITOR_REPORT_URL": "https://appmon.ru/api/key/collect"
-                
-                               
-				"db__mongoose__uri": "mongodb:///test?authSource=admin",
-                "db__mongoose__options__host": "",
-				"db__mongoose__options__user": "tester",
-				"db__mongoose__options__pass": "test",
-				"db__mongoose__options__db": "test",
-                
-				
-			}
-		}
-	]
-}

package/playground/pm2/production.json

@@ -1,46 +0,0 @@
-{
-	"apps": [
-		{
-			"name": "not-node-application.production",
-			"script": "./site/app/server/index.js",
-			"node_args": [
-				"--stack-trace-limit=50",
-                
-				"--inspect=3002"
-                
-			],
-			"watch": true,
-			"ignore_watch": [
-				"./site/node_modules",
-				"./site/docs",
-				"./site/app/static",
-				"./site/app/front/build",
-				"./db.dumps"
-			],
-			"exec_mode": "fork",
-			"env": {
-				"hostname": "https://not-node-application",
-				"NODE_ENV": "production",
-                
-				"NOT_NODE_ERROR_KEY": "123456",
-				"NOT_NODE_ERROR_URL_NODE": "https://appmon.ru/api/key/collect",
-				"NOT_NODE_ERROR_URL_BROWSER": "https://appmon.ru/api/key/collect",
-                
-                
-				"NOT_NODE_MONITOR_INTERVAL": 5000,
-				"NOT_NODE_MONITOR_REPORT_INTERVAL": 60,
-				"NOT_NODE_MONITOR_REPORT_KEY": "123456",
-				"NOT_NODE_MONITOR_REPORT_URL": "https://appmon.ru/api/key/collect"
-                
-                               
-				"db__mongoose__uri": "mongodb:///test?authSource=admin",
-                "db__mongoose__options__host": "",
-				"db__mongoose__options__user": "tester",
-				"db__mongoose__options__pass": "test",
-				"db__mongoose__options__db": "test",
-                
-				
-			}
-		}
-	]
-}

package/playground/pm2/stage.json

@@ -1,46 +0,0 @@
-{
-	"apps": [
-		{
-			"name": "not-node-application.stage",
-			"script": "./site/app/server/index.js",
-			"node_args": [
-				"--stack-trace-limit=50",
-                
-				"--inspect=3002"
-                
-			],
-			"watch": true,
-			"ignore_watch": [
-				"./site/node_modules",
-				"./site/docs",
-				"./site/app/static",
-				"./site/app/front/build",
-				"./db.dumps"
-			],
-			"exec_mode": "fork",
-			"env": {
-				"hostname": "https://stage.not-node-application",
-				"NODE_ENV": "stage",
-                
-				"NOT_NODE_ERROR_KEY": "123456",
-				"NOT_NODE_ERROR_URL_NODE": "https://appmon.ru/api/key/collect",
-				"NOT_NODE_ERROR_URL_BROWSER": "https://appmon.ru/api/key/collect",
-                
-                
-				"NOT_NODE_MONITOR_INTERVAL": 5000,
-				"NOT_NODE_MONITOR_REPORT_INTERVAL": 60,
-				"NOT_NODE_MONITOR_REPORT_KEY": "123456",
-				"NOT_NODE_MONITOR_REPORT_URL": "https://appmon.ru/api/key/collect"
-                
-                               
-				"db__mongoose__uri": "mongodb:///test?authSource=admin",
-                "db__mongoose__options__host": "",
-				"db__mongoose__options__user": "tester",
-				"db__mongoose__options__pass": "test",
-				"db__mongoose__options__db": "test",
-                
-				
-			}
-		}
-	]
-}

package/playground/site/.babelrc

@@ -1,11 +0,0 @@
-{
-    "presets": ["@babel/preset-env"],
-    "plugins": [
-        [
-            "@babel/plugin-proposal-class-properties",
-            {
-                "loose": true
-            }
-        ]
-    ]
-}

package/playground/site/.eslintignore

@@ -1,4 +0,0 @@
-node_modules/**
-coverage/**
-app/static/**
-app/server/views/**

package/playground/site/.eslintrc.json

@@ -1,23 +0,0 @@
-{
-    "parserOptions": {
-        "ecmaVersion": 10,
-        "sourceType": "module"
-    },
-    "env": {
-        "browser": true,
-        "es6": true,
-        "node": true,
-        "mongo": true,
-        "mocha": true
-    },
-    "globals": {
-        "ENV": true
-    },
-    "extends": "eslint:recommended",
-    "rules": {
-        "indent": "error",
-        "linebreak-style": ["error", "unix"],
-        "semi": ["error", "always"],
-        "no-useless-escape": [0]
-    }
-}