not-node 6.1.7 → 6.1.9

package/package.json

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

package/src/identity/identity.js

@@ -17,6 +17,25 @@ class Identity {
         token: IdentityProviderToken,
     };
 
+    static #primaryRoles = [];
+    static #secondaryRoles = [];
+
+    static setPrimaryRoles(list = []) {
+        this.#primaryRoles = [...list];
+        Object.keys(this.#providers).forEach((itm) => {
+            this.#providers[itm].setPrimaryRoles([...list]);
+        });
+        return this;
+    }
+
+    static setSecondaryRoles(list = []) {
+        this.#secondaryRoles = [...list];
+        Object.keys(this.#providers).forEach((itm) => {
+            this.#providers[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 = []) {
+        IdentityProviderSession.#getOptions().primaryRoles = [...list];
+    }
+
+    static setSecondaryRoles(list = []) {
+        IdentityProviderSession.#getOptions().secondaryRoles = [...list];
+    }
+
     constructor(req) {
         this.req = req;
         return this;
@@ -27,9 +35,27 @@ 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 (
+                IdentityProviderSession.#getOptions().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 = []) {
+        IdentityProviderToken.#getOptions().primaryRoles = [...list];
+    }
+
+    static setSecondaryRoles(list = []) {
+        IdentityProviderToken.#getOptions().secondaryRoles = [...list];
+    }
+
     constructor(req) {
         this.req = req;
         this.#extractToken(req);
@@ -171,6 +179,22 @@ 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 (
+                IdentityProviderToken.#getOptions().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