not-node 6.3.53 → 6.3.55

package/package.json

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

package/src/identity/providers/session.js

@@ -5,7 +5,7 @@ module.exports = class IdentityProviderSession {
     static #options = {};
 
     static setOptions(options = {}) {
-        this.#options = options;
+        this.#options = {...this.#options, ...options};
     }
 
     static #getOptions() {

package/src/identity/providers/token.js

@@ -1,5 +1,8 @@
-const { error, log } = require("not-log")(module, "Identity//Token");
-const { notRequestError } = require("not-error");
+const Log = require("not-log")(module, "Identity//Token");
+const notRequestError = require("not-error/src/request.error.node.cjs");
+const notCommon = require("../../common");
+const Request = require("http").IncomingMessage;
+
 const CONST = require("../../auth/const");
 const ROLES = require("../../auth/roles");
 const { objHas } = require("../../common");
@@ -7,14 +10,22 @@ const phrase = require("not-locale").modulePhrase("not-node");
 
 const JWT = require("jsonwebtoken");
 
+const TOKEN_OBJECT_REQUIRED_PROPERTIES = ["_id", "role", "active", "username"];
+
 module.exports = class IdentityProviderToken {
+    /**
+     * @type {null|object}
+     */
     #tokenContent = null;
+    /**
+     * @type {null|string}
+     */
     #token = null;
 
     static #options = {};
 
     static setOptions(options = {}) {
-        this.#options = options;
+        this.#options = { ...this.#options, ...options };
     }
 
     static #getOptions() {
@@ -30,9 +41,12 @@ module.exports = class IdentityProviderToken {
     }
 
     constructor(req) {
-        this.req = req;
-        this.#extractToken(req);
-        this.#extractTokenContent();
+        if (IdentityProviderToken.sourceIsRequest(req)) {
+            this.#extractToken(req);
+            this.#extractTokenContent();
+        } else if (IdentityProviderToken.sourceIsTokenContent(req)) {
+            this.#tokenContent = IdentityProviderToken.copyTokenContent(req);
+        }
         return this;
     }
 
@@ -70,20 +84,20 @@ module.exports = class IdentityProviderToken {
             }
             return null;
         } catch (e) {
-            error(e.message);
+            Log && Log.error(e.message);
             return null;
         }
     }
 
     #encodeTokenContent() {
         try {
-            if (this.#token) {
+            if (this.#token && this.#tokenContent) {
                 const secret = IdentityProviderToken.#getOptions().secret;
                 return JWT.sign(this.#tokenContent, secret);
             }
             return null;
         } catch (e) {
-            error(e.message);
+            Log && Log.error(e.message);
             return null;
         }
     }
@@ -119,7 +133,7 @@ module.exports = class IdentityProviderToken {
 
     static #validateTTLForToken(tokenTTL) {
         if (tokenTTL <= 0 || isNaN(tokenTTL)) {
-            log(phrase("user_token_ttl_not_set"));
+            Log && Log.log(phrase("user_token_ttl_not_set"));
             tokenTTL = CONST.TOKEN_TTL;
         }
         return tokenTTL;
@@ -193,7 +207,7 @@ module.exports = class IdentityProviderToken {
         const roles = this.getRole();
         for (let role of roles) {
             if (
-                IdentityProviderToken.#getOptions().primaryRoles.includes(role)
+                IdentityProviderToken.#getOptions()?.primaryRoles.includes(role)
             ) {
                 return role;
             }
@@ -298,7 +312,29 @@ module.exports = class IdentityProviderToken {
         this.setGuest();
     }
 
-    static test(req) {
-        return !!this.getTokenFromRequest(req);
+    static test(some) {
+        if (this.sourceIsRequest(some)) {
+            return !!this.getTokenFromRequest(some);
+        } else if (this.sourceIsTokenContent(some)) {
+            return !!this.copyTokenContent(some);
+        }
+        return false;
+    }
+
+    static sourceIsRequest(some) {
+        return some instanceof Request;
+    }
+
+    static sourceIsTokenContent(some) {
+        return (
+            typeof some === "object" &&
+            notCommon.objHas(some, TOKEN_OBJECT_REQUIRED_PROPERTIES)
+        );
+    }
+
+    static copyTokenContent(obj) {
+        return {
+            ...obj,
+        };
     }
 };

package/src/manifest/route.js

@@ -208,12 +208,15 @@ class notRoute {
 
     async executeRoute(modRoute, actionName, { req, res, next }) {
         try {
+            let prepared = undefined;
             //waiting preparation
-            let prepared = await this.executeFunction(
-                modRoute,
-                CONST_BEFORE_ACTION,
-                [req, res, next]
-            );
+            if (modRoute[CONST_AFTER_ACTION]) {
+                prepared = await this.executeFunction(
+                    modRoute,
+                    CONST_BEFORE_ACTION,
+                    [req, res, next]
+                );
+            }
             //waiting results
             let result = await this.executeFunction(modRoute, actionName, [
                 req,
@@ -234,12 +237,16 @@ class notRoute {
                 notManifestRouteResultFilter.filter(req.notRouteData, result);
             }
             //run after with results, continue without waiting when it finished
-            return this.executeFunction(modRoute, CONST_AFTER_ACTION, [
-                req,
-                res,
-                next,
-                result,
-            ]);
+            if (modRoute[CONST_AFTER_ACTION]) {
+                return this.executeFunction(modRoute, CONST_AFTER_ACTION, [
+                    req,
+                    res,
+                    next,
+                    result,
+                ]);
+            } else {
+                return result;
+            }
         } catch (e) {
             next(e);
         }