not-node 6.3.20 → 6.3.22

package/package.json

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

package/src/env.js

@@ -22,7 +22,7 @@ module.exports = class notEnv {
      *  Setting application environment variable
      *  @param   {string}      key  name of var
      *  @param   {object}      val  value
-     *  @return {notDomain}      chainable
+     *  @return     {notEnv}      chainable
      */
     static setEnv(key, val) {
         ENVS[key] = val;

package/src/generic/form.authorizedAction.js

@@ -2,12 +2,7 @@
 const Form = require("../form/form");
 const { firstLetterToUpper } = require("../common");
 //form
-const FIELDS = [
-    ["activeUserId", { required: true }, "not-node//objectId"],
-    ["activeUser", "not-node//requiredObject"],
-    ["ip", "not-node//ip"],
-    ["identity", "not-node//requiredObject"],
-];
+const FIELDS = [["identity", "not-node//requiredObject"]];
 
 module.exports = ({ MODULE_NAME, MODEL_NAME, actionName }) => {
     const FORM_NAME = `${MODULE_NAME}:${MODEL_NAME}:${firstLetterToUpper(

package/src/generic/form.getByID.js

@@ -4,9 +4,7 @@ const { firstLetterToUpper } = require("../common");
 //form
 const FIELDS = [
     ["targetID", { required: true }, "not-node//ID"],
-    ["activeUserId", { required: true }, "not-node//objectId"],
-    ["activeUser", "not-node//requiredObject"],
-    ["ip", "not-node//ip"],
+
     ["identity", "not-node//requiredObject"],
 ];
 

package/src/generic/form.getById.js

@@ -5,9 +5,6 @@ const { firstLetterToUpper } = require("../common");
 //form
 const FIELDS = [
     ["targetId", { required: true }, "not-node//objectId"],
-    ["activeUserId", { required: true }, "not-node//objectId"],
-    ["activeUser", "not-node//requiredObject"],
-    ["ip", "not-node//ip"],
     ["identity", "not-node//requiredObject"],
 ];
 

package/src/generic/form.list.js

@@ -5,9 +5,6 @@ const notAppIdentity = require("../identity");
 
 const FIELDS = [
     ["query", `not-filter//_filterQuery`],
-    ["activeUserId", { required: true }, "not-node//objectId"],
-    ["activeUser", "not-node//requiredObject"],
-    ["ip", "not-node//ip"],
     ["identity", "not-node//requiredObject"],
 ];
 

package/src/generic/form.listAndCount.js

@@ -5,9 +5,6 @@ const notAppIdentity = require("../identity");
 
 const FIELDS = [
     ["query", `not-filter//_filterQuery`],
-    ["activeUserId", { required: true }, "not-node//objectId"],
-    ["activeUser", "not-node//requiredObject"],
-    ["ip", "not-node//ip"],
     ["identity", "not-node//requiredObject"],
 ];
 

package/src/init/lib/rateLimiter.js

@@ -1,5 +1,7 @@
 const log = require("not-log")(module, "RateLimiter");
 const { partCopyObj } = require("../../common");
+const notEnv = require("../../env");
+const { RateLimiterRedis } = require("rate-limiter-flexible");
 
 const DEFAULT_OPTIONS = {
     keyPrefix: "rateLimiterMiddleware",
@@ -44,15 +46,43 @@ module.exports = class InitRateLimiter {
         };
     }
 
-    static createRateLimiter({ master, config }) {
-        const { RateLimiterRedis } = require("rate-limiter-flexible");
-        const storeClient = config.get(
-            "modules.rateLimiter.client",
-            DEFAULT_CLIENT
+    static createRateLimiter({ config }) {
+        const storeClient = InitRateLimiter.getClient(
+            InitRateLimiter.getClientName({ config })
         );
         return new RateLimiterRedis({
-            storeClient: master.getEnv(`db.${storeClient}`),
-            ...InitRateLimiter.getOptions({ master, config }),
+            storeClient,
+            ...InitRateLimiter.getOptions({ config }),
+        });
+    }
+
+    /**
+     *  Returns redis client name in "db.*" of notEnv
+     *
+     * @static
+     * @param {object} { config }
+     * @return {string}
+     */
+    static getClientName({ config }) {
+        return config.get("modules.rateLimiter.client", DEFAULT_CLIENT);
+    }
+
+    static getClient(storeClient) {
+        return notEnv.getEnv(`db.${storeClient}`);
+    }
+
+    static initCustom(
+        options = {
+            keyPrefix: "rateLimiterCustom",
+            points: 20,
+            duration: 1,
+        },
+        storeName = DEFAULT_CLIENT
+    ) {
+        const storeClient = InitRateLimiter.getClient(storeName);
+        return new RateLimiterRedis({
+            storeClient,
+            ...options,
         });
     }
 };

package/src/init/lib/security.js

@@ -4,7 +4,6 @@ module.exports = class InitSecurity {
     getCSPDirectives({ config }) {
         try {
             let corsArr = config.get("cors");
-            let corsLine = corsArr ? corsArr.join(" ") : "";
             let CSPDirectives = config.get("CSP");
             let result = {};
             Object.keys(CSPDirectives).forEach((nm) => {
@@ -13,7 +12,7 @@ module.exports = class InitSecurity {
                     Array.isArray(corsArr) &&
                     ["default-src", "connect-src"].includes(nm)
                 ) {
-                    result[nm].push(...corsLine);
+                    result[nm].push(...corsArr);
                 }
             });
             return result;

package/src/manifest/route.js

@@ -71,7 +71,7 @@ class notRoute {
 
     /**
      *	Select rule from available or return null
-     *	@param	{import('../types').ExtendedExpressRequest}	req 	Express Request Object
+     *	@param	{import('../types').notNodeExpressRequest}	req 	Express Request Object
      *	@return	{import('../types').notRouteRule | null}	rule or null
      */
     selectRule(req) {
@@ -85,7 +85,7 @@ class notRoute {
     /**
      *
      *
-     * @param {import('../types').ExtendedExpressRequest}       req
+     * @param {import('../types').notNodeExpressRequest}       req
      * @param {import('../types').notRouteData} notRouteData
      * @memberof notRoute
      */
@@ -112,7 +112,7 @@ class notRoute {
 
     /**
      *	Executes route action if such exist
-     *	@param	{import('../types').ExtendedExpressRequest}	req 	Express Request Object
+     *	@param	{import('../types').notNodeExpressRequest}	req 	Express Request Object
      *	@param	{import('express').Response}	res		Express Response Object
      *	@param	{function}	next
      *	@return {object}	result of execution or HttpError