not-node 6.5.7 → 6.5.9

package/package.json

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

package/src/generic/field._data.js

@@ -22,7 +22,7 @@ const initGenericDataForm = ({
         });
         const App = getApp();
         App.getModule(MODULE_NAME).setFormConstructor(formName, cls);
-        App.getModule(MODULE_NAME).setForm(formName, new cls(App));
+        App.getModule(MODULE_NAME).setForm(formName, new cls({ app: App }));
         return true;
     } catch (e) {
         getApp().logger.error(e);

package/src/generic/manifest.js

@@ -1,4 +1,5 @@
 const ACTION_SIGNATURES = require("../auth/const").ACTION_SIGNATURES;
+const notManifestRouteResultFilter = require("../manifest/result.filter");
 
 const extraActionsBuilder = (
     MODULE_NAME,
@@ -72,6 +73,8 @@ module.exports = (MODULE_NAME, modelName, FIELDS = [], actions = {}) => {
                 rules: [
                     {
                         root: true,
+                        [notManifestRouteResultFilter.PROP_NAME_RETURN_ROOT]:
+                            "list",
                     },
                 ],
             },

package/src/identity/index.js

@@ -12,13 +12,7 @@ module.exports = class notAppIdentity {
         return this.#identity;
     }
 
-    /**
-     *  Collects various authentification and authorization data from request object
-     *  @param {import('../types').notNodeExpressRequest}  req       ExpressRequest
-     *  @return {import('../types').notAppIdentityData}  various authentification data for actor { root:boolean, auth: boolean, role: [string], uid: ObjectId, sid: string, ip:string }
-     */
-    static extractAuthData(req) {
-        const identity = this.#identity.of(req);
+    static identityToAuthData(identity, req) {
         return {
             root: identity.isRoot(),
             admin: identity.isAdmin(),
@@ -27,11 +21,21 @@ module.exports = class notAppIdentity {
             primaryRole: identity.getPrimaryRole(),
             uid: identity.getUserId(),
             sid: identity.getSessionId(),
-            ip: getIP(req),
+            ip: req ? getIP(req) : undefined,
             provider: identity.constructor.name,
         };
     }
 
+    /**
+     *  Collects various authentification and authorization data from request object
+     *  @param {import('../types').notNodeExpressRequest}  req       ExpressRequest
+     *  @return {import('../types').notAppIdentityData}  various authentification data for actor { root:boolean, auth: boolean, role: [string], uid: ObjectId, sid: string, ip:string }
+     */
+    static extractAuthData(req) {
+        const identity = this.#identity.of(req);
+        return this.identityToAuthData(identity, req);
+    }
+
     /**
      *
      * @param    {import('../types').notNodeExpressRequest}     req

package/src/manifest/manifest.filter.js

@@ -18,6 +18,7 @@ const DIRTY_FIELDS = [
 
 //allow access to safe (for a specific user auth status) fields only
 const DEFAULT_FIELDS_SET = ["@safe"];
+const DEFAULT_RETURN_SET = ["@id", "@ID", "@safe"];
 
 module.exports = class notManifestFilter {
     static schemaLoader = (name) => getApp().getModelSchema(name);
@@ -41,7 +42,6 @@ module.exports = class notManifestFilter {
         if (!route || !route.actions) {
             return result;
         }
-        console.log("actions", JSON.stringify(route.actions));
         for (let actionName in route.actions) {
             if (!route.actions[actionName]) {
                 continue;
@@ -136,7 +136,7 @@ module.exports = class notManifestFilter {
      **/
 
     static filter(manifest, auth, role, root, moduleName = "") {
-        var result = {};
+        const result = {};
         for (let routeName in manifest) {
             let routeMan = notManifestFilter.filterRoute(
                 manifest[routeName],
@@ -264,14 +264,17 @@ module.exports = class notManifestFilter {
         return returnSet;
     }
 
+    static getFieldsPropertyFromRuleSet(ruleSet) {
+        return notManifestFilter.ruleSetHasFieldsDirective(ruleSet)
+            ? [...ruleSet.fields]
+            : DEFAULT_FIELDS_SET;
+    }
+
     static filterFieldsPropOfActionRule(
         actionRule,
         { modelSchema, modelName, ruleSet, actionSignature, role, auth, root }
     ) {
-        const fields = notManifestFilter.ruleSetHasFieldsDirective(ruleSet)
-            ? [...ruleSet.fields]
-            : DEFAULT_FIELDS_SET;
-
+        const fields = notManifestFilter.getFieldsPropertyFromRuleSet(ruleSet);
         actionRule.fields = notFieldsFilter.filter(fields, modelSchema, {
             action: actionSignature,
             roles: role,
@@ -286,23 +289,27 @@ module.exports = class notManifestFilter {
         }
     }
 
+    static getReturnPropertyFromRuleSet(ruleSet) {
+        return ruleSet && Object.hasOwn(ruleSet, "return") && ruleSet.return
+            ? ruleSet.return
+            : DEFAULT_RETURN_SET;
+    }
+
     static filterReturnPropOfActionRule(
         actionRule,
         { modelSchema, modelName, ruleSet, actionSignature, role, auth, root }
     ) {
-        if (ruleSet && ruleSet.return) {
-            actionRule.return = notManifestFilter.filterReturnSet(
-                ruleSet.return,
-                modelSchema,
-                {
-                    auth,
-                    role,
-                    root,
-                    modelName,
-                    actionSignature,
-                }
-            );
-        }
+        actionRule.return = notManifestFilter.filterReturnSet(
+            notManifestFilter.getReturnPropertyFromRuleSet(ruleSet),
+            modelSchema,
+            {
+                auth,
+                role,
+                root,
+                modelName,
+                actionSignature,
+            }
+        );
     }
 
     /**
@@ -338,7 +345,7 @@ module.exports = class notManifestFilter {
         ruleSet = null
     ) {
         //full copy
-        let actionRule = merge({}, action);
+        const actionRule = merge({}, action);
         //removes server side or secret information (full list of access rules)
         notManifestFilter.clearFromDirtyFields(actionRule);
         //retrives model schema

package/src/manifest/route.js

@@ -80,10 +80,9 @@ class notRoute {
      *	@param	{import('../types').notNodeExpressRequest}	req 	Express Request Object
      *	@return	{import('../types').notRouteRule | null}	rule or null
      */
-    selectRule(req) {
-        const user = notAppIdentity.extractAuthData(req);
+    selectRule(identity) {
         if (this.actionData) {
-            return notRoute.actionAvailableByRule(this.actionData, user);
+            return notRoute.actionAvailableByRule(this.actionData, identity);
         }
         return null;
     }
@@ -107,7 +106,15 @@ class notRoute {
      * @return {import('../types').notRouteData}
      * @memberof notRoute
      */
-    createRequestRouteData(actionName, rule) {
+    createRequestRouteData(actionName, rule, identity) {
+        const actionRule = notManifestFilter.filterRouteAction(
+            this.actionData,
+            identity.auth,
+            identity.role,
+            identity.root,
+            this.routeName,
+            this.moduleName
+        );
         return {
             actionName,
             modelName: this.routeName,
@@ -116,7 +123,7 @@ class notRoute {
                 this.routeName
             )}`,
             rule: copyObj(rule),
-            actionData: copyObj(this.actionData),
+            actionData: actionRule,
             actionSignature: notManifestFilter.detectActionSignature(
                 this.actionData
             ),
@@ -132,7 +139,8 @@ class notRoute {
      **/
     exec(req, res, next) {
         try {
-            let rule = this.selectRule(req);
+            const identity = notAppIdentity.extractAuthData(req);
+            const rule = this.selectRule(identity);
             if (!rule) {
                 return next(
                     new HttpError(
@@ -166,7 +174,7 @@ class notRoute {
             const modRoute = mod.getRoute(this.routeName);
             this.setRequestRouteData(
                 req,
-                this.createRequestRouteData(actionName, rule)
+                this.createRequestRouteData(actionName, rule, identity)
             );
             if (this.routeIsRunnable(modRoute, actionName)) {
                 return this.executeRoute(modRoute, actionName, {

package/test/fakes.js

@@ -10,6 +10,27 @@ module.exports = {
             }
         };
     },
+    fakeAuthData: ({
+        root = false,
+        admin = false,
+        auth = false,
+        role = [DEFAULT_USER_ROLE_FOR_GUEST],
+        primaryRole = DEFAULT_USER_ROLE_FOR_GUEST,
+        uid = undefined,
+        sid = undefined,
+        ip = undefined,
+    }) => {
+        return {
+            root,
+            admin,
+            auth,
+            role,
+            primaryRole,
+            uid,
+            sid,
+            ip,
+        };
+    },
     fakeIdentity: (
         id = {
             root: false,

package/test/notManifest.js

@@ -230,6 +230,7 @@ describe("Manifest", function () {
                     actions: {
                         list: {
                             method: "get",
+                            return: ["_id", "postID"],
                         },
                     },
                 },
@@ -239,6 +240,7 @@ describe("Manifest", function () {
                     actions: {
                         profile: {
                             method: "get",
+                            return: ["_id", "userID"],
                         },
                     },
                 },

package/test/notManifestFilter.js

@@ -164,6 +164,7 @@ describe("notManifestFilter", function () {
             expect(result).to.deep.equal({
                 modelName: "jelly",
                 fields: ["name", "email"], //if fields ommited, it replaced by ["@safe"], __version is not safe to everyone but system invoked operations
+                return: ["_id", "jellyID", "name", "email"],
             });
         });
 
@@ -177,6 +178,7 @@ describe("notManifestFilter", function () {
             const result = notManifestFilter.clearActionFromRules(input);
             expect(result).to.deep.equal({
                 modelName: "jelly",
+                return: ["_id", "ID"],
             });
         });
     });
@@ -224,6 +226,7 @@ describe("notManifestFilter", function () {
                 actions: {
                     list: {
                         postFix: ":actionName",
+                        return: ["_id", "ID"],
                     },
                 },
             });
@@ -240,9 +243,11 @@ describe("notManifestFilter", function () {
                 actions: {
                     list: {
                         postFix: ":actionName",
+                        return: ["_id", "ID"],
                     },
                     get: {
                         formData: true,
+                        return: ["_id", "ID"],
                     },
                 },
             });
@@ -259,6 +264,7 @@ describe("notManifestFilter", function () {
                 actions: {
                     list: {
                         postFix: ":actionName",
+                        return: ["_id", "ID"],
                     },
                 },
             });
@@ -275,9 +281,11 @@ describe("notManifestFilter", function () {
                 actions: {
                     list: {
                         postFix: ":actionName",
+                        return: ["_id", "ID"],
                     },
                     update: {
                         formData: false,
+                        return: ["_id", "ID"],
                     },
                 },
             });
@@ -293,9 +301,11 @@ describe("notManifestFilter", function () {
                     actions: {
                         list: {
                             method: "get",
+                            return: ["_id", "userID"],
                         },
                         profile: {
                             method: "get",
+                            return: ["_id", "userID"],
                         },
                     },
                 },
@@ -305,9 +315,11 @@ describe("notManifestFilter", function () {
                     actions: {
                         list: {
                             method: "get",
+                            return: ["_id", "postID"],
                         },
                         listAll: {
                             method: "get",
+                            return: ["_id", "postID"],
                         },
                     },
                 },
@@ -317,6 +329,7 @@ describe("notManifestFilter", function () {
                     actions: {
                         reboot: {
                             method: "post",
+                            return: ["_id", "adminID"],
                         },
                     },
                 },
@@ -328,6 +341,7 @@ describe("notManifestFilter", function () {
                     actions: {
                         profile: {
                             method: "get",
+                            return: ["_id", "userID"],
                         },
                     },
                 },
@@ -337,6 +351,7 @@ describe("notManifestFilter", function () {
                     actions: {
                         list: {
                             method: "get",
+                            return: ["_id", "postID"],
                         },
                     },
                 },
@@ -348,6 +363,7 @@ describe("notManifestFilter", function () {
                     actions: {
                         list: {
                             method: "get",
+                            return: ["_id", "postID"],
                         },
                     },
                 },
@@ -359,6 +375,7 @@ describe("notManifestFilter", function () {
                     actions: {
                         activate: {
                             method: "get",
+                            return: ["_id", "userID"],
                         },
                     },
                 },
@@ -368,6 +385,7 @@ describe("notManifestFilter", function () {
                     actions: {
                         list: {
                             method: "get",
+                            return: ["_id", "postID"],
                         },
                     },
                 },
@@ -379,6 +397,7 @@ describe("notManifestFilter", function () {
                     actions: {
                         profile: {
                             method: "get",
+                            return: ["_id", "userID"],
                         },
                     },
                 },
@@ -388,9 +407,11 @@ describe("notManifestFilter", function () {
                     actions: {
                         list: {
                             method: "get",
+                            return: ["_id", "postID"],
                         },
                         listAll: {
                             method: "get",
+                            return: ["_id", "postID"],
                         },
                     },
                 },
@@ -555,6 +576,7 @@ describe("notManifestFilter", function () {
             const targetResult = {
                 method: "get",
                 fields: ["name", "username", "country"],
+                return: ["_id", "userID", "name", "username", "country"],
             };
             const result = notManifestFilter.filterRouteAction(
                 actionData,
@@ -596,6 +618,7 @@ describe("notManifestFilter", function () {
                     "country",
                     "email",
                 ],
+                return: ["_id", "userID", "name", "username", "country"],
             };
             const result = notManifestFilter.filterRouteAction(
                 actionData,
@@ -635,6 +658,7 @@ describe("notManifestFilter", function () {
                     "code",
                     "email",
                 ],
+                return: ["_id", "userID", "name", "username", "country"],
             };
             const result = notManifestFilter.filterRouteAction(
                 actionData,
@@ -715,6 +739,7 @@ describe("notManifestFilter", function () {
             const targetResult = {
                 method: "get",
                 fields: ["userID", "name", "username", "country"],
+                return: ["_id", "userID", "name", "username", "country"],
             };
             const result = notManifestFilter.filterRouteAction(
                 actionData,

package/test/notRoute.js

@@ -27,21 +27,23 @@ describe("notRoute", function () {
 
     describe("selectRule", function () {
         it("User(auth) request, post.list action", function () {
-            notAppIdentity.identity = require("./fakes").fakeIdentity({
+            const authData = require("./fakes").fakeAuthData({
                 auth: true,
+                role: ["user"],
+                primaryRole: "user",
             });
             let req = {},
                 actionData = {
                     method: "get",
                     rules: [
                         {
-                            auth: false,
+                            root: true,
                         },
                         {
                             auth: true,
                         },
                         {
-                            root: true,
+                            auth: false,
                         },
                     ],
                 },
@@ -52,12 +54,12 @@ describe("notRoute", function () {
                     "list",
                     actionData
                 );
-            expect(routerAction.selectRule(req)).to.deep.equal({
+            expect(routerAction.selectRule(authData)).to.deep.equal({
                 auth: true,
             });
         });
         it("User(!auth) request, post.list action", function () {
-            notAppIdentity.identity = require("./fakes").fakeIdentity({
+            const authData = require("./fakes").fakeAuthData({
                 auth: false,
             });
             let req = {},
@@ -82,7 +84,7 @@ describe("notRoute", function () {
                     "list",
                     actionData
                 );
-            expect(routerAction.selectRule(req)).to.deep.equal({
+            expect(routerAction.selectRule(authData)).to.deep.equal({
                 auth: false,
             });
         });
@@ -112,9 +114,10 @@ describe("notRoute", function () {
         });
 
         it("User(auth, manager) request, post.listAll action", function () {
-            notAppIdentity.identity = require("./fakes").fakeIdentity({
+            const authData = require("./fakes").fakeAuthData({
                 auth: true,
                 role: ["manager"],
+                primaryRole: "admin",
             });
             let req = {},
                 actionData = {
@@ -136,14 +139,14 @@ describe("notRoute", function () {
                     "listAll",
                     actionData
                 );
-            expect(routerAction.selectRule(req)).to.deep.equal({
+            expect(routerAction.selectRule(authData)).to.deep.equal({
                 auth: true,
                 role: ["manager"],
             });
         });
 
         it("Admin request, post.listAll action", function () {
-            notAppIdentity.identity = require("./fakes").fakeIdentity({
+            const authData = require("./fakes").fakeAuthData({
                 auth: true,
                 root: true,
                 primaryRole: DEFAULT_USER_ROLE_FOR_ROOT,
@@ -169,7 +172,7 @@ describe("notRoute", function () {
                     "listAll",
                     actionData
                 );
-            expect(routerAction.selectRule(req)).to.deep.equal({
+            expect(routerAction.selectRule(authData)).to.deep.equal({
                 root: true,
             });
         });