not-node 6.3.96 → 6.3.99

package/package.json

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

package/src/auth/rules.js

@@ -94,7 +94,7 @@ function compareAuthStatus(rule, auth) {
  *	Check rule against presented credentials
  *	@param	{import('../types').notRouteRule}		        rule	        action rule
  *	@param  {boolean}		                                auth	        user state of auth
- *	@param  {Array<string>}	                        role	        user state of role
+ *	@param  {string|Array<string>}	                                role	        user state of role
  *	@param  {boolean}		                                root            user state of root
  *	@return {boolean}		                                                pass or not
  */
@@ -103,21 +103,30 @@ function checkCredentials(rule, auth, role, root) {
     if (typeof rule === "undefined" || rule === null) {
         return false;
     } else {
+        let directivesUsed = 0;
         //posting message about obsolete options keys if found
         postWarning.obsoleteRuleFields(rule);
-        //start comparing from top tier flags
-        //if we have root/admin(obsolete) field field in rule compare only it
+        //compare all three auth directives types
+        //if any presented not equal - return false
+        //if none of directives presented in rule - return false
+        //root
         if (ruleHasRootDirective(rule)) {
-            return compareWithRoot(rule, root);
-        } else {
-            //if we have roles in rule, then using role based aproach
-            if (objHas(rule, "role")) {
-                return compareRuleRoles(rule, role, auth);
-            } else {
-                //if no then just
-                return compareAuthStatus(rule, auth);
+            directivesUsed++;
+            if (!compareWithRoot(rule, root)) {
+                return false;
             }
         }
+        //role checks auth too, so straight return
+        if (objHas(rule, "role")) {
+            return compareRuleRoles(rule, role, auth);
+        }
+        //auth, last one, so straight return. if got to here and auth presented, it rules everything
+        //have to check this and root to have rules like {root:false, auth: true} - every user but root
+        if (objHas(rule, "auth")) {
+            return compareAuthStatus(rule, auth);
+        }
+        //if no directives in rule - no user authentication
+        return !!directivesUsed;
     }
 }
 

package/src/form/transformers/__CLEAR__.js

@@ -1,3 +1,3 @@
 module.exports = (input) => {
-    return input === "__CLEAR__" ? undefined : input;
+    return input === "__CLEAR__" ? null : input;
 };

package/test/auth.js

@@ -91,27 +91,27 @@ describe("Auth", function () {
             role: "root",
             auth: true,
         };
-        it("rule (admin, root, authentificated),  auth - true, role - root, admin - true ", function () {
+        it("rule (admin, root, authentificated),  auth - true, role - root, root - true ", function () {
             const res = auth.checkCredentials(rule, true, "root", true);
             expect(res).to.deep.equal(true);
         });
 
-        it("rule (admin, root, authentificated),  auth - true, role - root, admin - false ", function () {
+        it("rule (admin, root, authentificated),  auth - true, role - root, root - false ", function () {
             const res = auth.checkCredentials(rule, true, "root", false);
             expect(res).to.deep.equal(false);
         });
 
-        it("rule - empty,  auth - true, role - root, admin - false ", function () {
+        it("rule - empty,  auth - true, role - root, root - false ", function () {
             const res = auth.checkCredentials({}, true, "root", false);
-            expect(res).to.deep.equal(true);
+            expect(res).to.deep.equal(false);
         });
 
-        it("rule - null,  auth - true, role - root, admin - false ", function () {
+        it("rule - null,  auth - true, role - root, root - false ", function () {
             const res = auth.checkCredentials(null, true, "root", false);
             expect(res).to.deep.equal(false);
         });
 
-        it("rule - (auth),  auth - true, role - root, admin - false ", function () {
+        it("rule - (auth),  auth - true, role - root, root - false ", function () {
             const res = auth.checkCredentials(
                 { auth: true },
                 true,
@@ -121,7 +121,7 @@ describe("Auth", function () {
             expect(res).to.deep.equal(true);
         });
 
-        it("rule - (role: 'notActivated'),  auth - true, role - root, admin - false ", function () {
+        it("rule - (role: 'notActivated'),  auth - true, role - root, root - false ", function () {
             const res = auth.checkCredentials(
                 { role: "notActivated" },
                 true,
@@ -131,7 +131,7 @@ describe("Auth", function () {
             expect(res).to.deep.equal(false);
         });
 
-        it("rule - (role: 'user', auth),  auth - true, role - user, admin - false ", function () {
+        it("rule - (role: 'user', auth),  auth - true, role - user, root - false ", function () {
             const res = auth.checkCredentials(
                 { role: "user", auth: true },
                 true,
@@ -141,7 +141,7 @@ describe("Auth", function () {
             expect(res).to.deep.equal(true);
         });
 
-        it("rule - (role: 'user', !auth),  auth - false, role - user, admin - false ", function () {
+        it("rule - (role: 'user', !auth),  auth - false, role - user, root - false ", function () {
             const res = auth.checkCredentials(
                 { role: "user", auth: false },
                 false,
@@ -151,7 +151,7 @@ describe("Auth", function () {
             expect(res).to.deep.equal(true);
         });
 
-        it("rule - (role: 'user'),  auth - false, role - user, admin - false ", function () {
+        it("rule - (role: 'user'),  auth - false, role - user, root - false ", function () {
             const res = auth.checkCredentials(
                 { role: "user" },
                 false,
@@ -161,7 +161,7 @@ describe("Auth", function () {
             expect(res).to.deep.equal(true);
         });
 
-        it("rule - (auth),  auth - true, role - user, admin - false ", function () {
+        it("rule - (auth),  auth - true, role - user, root - false ", function () {
             const res = auth.checkCredentials(
                 { auth: true },
                 true,
@@ -171,7 +171,7 @@ describe("Auth", function () {
             expect(res).to.deep.equal(true);
         });
 
-        it("rule - (!auth),  auth - false, role - user, admin - false ", function () {
+        it("rule - (!auth),  auth - false, role - user, root - false ", function () {
             const res = auth.checkCredentials(
                 { auth: false },
                 false,
@@ -181,7 +181,7 @@ describe("Auth", function () {
             expect(res).to.deep.equal(true);
         });
 
-        it("rule - (auth),  auth - false, role - user, admin - false ", function () {
+        it("rule - (auth),  auth - false, role - user, root - false ", function () {
             const res = auth.checkCredentials(
                 { auth: true },
                 false,
@@ -191,7 +191,7 @@ describe("Auth", function () {
             expect(res).to.deep.equal(false);
         });
 
-        it("rule - (!auth),  auth - false, role - user, admin - true ", function () {
+        it("rule - (!auth),  auth - false, role - user, root - true ", function () {
             const res = auth.checkCredentials(
                 { auth: false },
                 false,
@@ -201,7 +201,7 @@ describe("Auth", function () {
             expect(res).to.deep.equal(true);
         });
 
-        it("rule - (admin),  auth - false, role - user, admin - true ", function () {
+        it("rule - (admin),  auth - false, role - user, root - true ", function () {
             const res = auth.checkCredentials(
                 { admin: true },
                 false,
@@ -211,7 +211,7 @@ describe("Auth", function () {
             expect(res).to.deep.equal(true);
         });
 
-        it("rule - (!auth, 'notActivated', false),  auth - false, role - notActivated, admin - false ", function () {
+        it("rule - (!auth, 'notActivated', false),  auth - false, role - notActivated, root - false ", function () {
             const res = auth.checkCredentials(
                 { auth: false, role: "notActivated" },
                 false,
@@ -221,7 +221,7 @@ describe("Auth", function () {
             expect(res).to.deep.equal(true);
         });
 
-        it("rule - (!auth, 'notActivated', undefined),  auth - false, role - false, admin - false ", function () {
+        it("rule - (!auth, 'notActivated', undefined),  auth - false, role - false, root - false ", function () {
             const res = auth.checkCredentials(
                 { auth: false, role: "notActivated" },
                 false,
@@ -231,7 +231,7 @@ describe("Auth", function () {
             expect(res).to.deep.equal(false);
         });
 
-        it("rule - (admin),  auth - false, role - false, admin - true ", function () {
+        it("rule - (admin),  auth - false, role - false, root - true ", function () {
             const res = auth.checkCredentials(
                 { admin: true },
                 false,

package/test/transformers.js

@@ -18,4 +18,16 @@ describe("Form//Transformers", () => {
             field3: [1, "string", false],
         });
     });
+
+    it("__CLEAR__ presented in input", () => {
+        const input = "__CLEAR__";
+        const result = transformers.__CLEAR__(input);
+        expect(result).to.be.null;
+    });
+
+    it("__CLEAR__ not presented in input", () => {
+        const input = "";
+        const result = transformers.__CLEAR__(input);
+        expect(result).to.be.not.null;
+    });
 });

package/tmpl/files/module.server/layers/routes.manifest.ejs

@@ -32,12 +32,10 @@ module.exports = {
 			description: "not-node:crud_create_action_form_description",
 			rules: [
 				{
-					auth: true,
 					role: "admin",
 					fields: [<%- fieldsShortNames.map((entry) => `"${entry}"`).join(',')  %>,<% if (ownage){ %>"owner",<% } %>],
 				},
 				{
-					auth: true,
 					role: ["client", "confirmed"],
 					fields: [<%- fieldsShortNames.map((entry) => `"${entry}"`).join(',')  %>],
 				},
@@ -54,7 +52,6 @@ module.exports = {
 			description: "not-node:crud_read_action_form_description",
 			rules: [
 				{
-					auth: true,
 					role: "admin",
 					fields: [
 						"_id",
@@ -65,7 +62,6 @@ module.exports = {
 					],
 				},
 				{
-					auth: true,
 					role: ["client", "confirmed"],
 					fields: [
 						"_id",
@@ -86,7 +82,6 @@ module.exports = {
 			description: "not-node:crud_read_action_form_description",
 			rules: [
 				{
-					auth: true,
 					role: "admin",
 					fields: [
 						"_id",
@@ -97,7 +92,6 @@ module.exports = {
 					],
 				},
 				{
-					auth: true,
 					role: ["client", "confirmed"],
 					fields: [
 						<% if (increment){ %>"<%- modelName %>ID",<% } %>
@@ -117,7 +111,6 @@ module.exports = {
 			method: "post",
 			rules: [
 				{
-					auth: true,
 					role: ["admin"],
 					fields: [
 						<%- fieldsShortNames.map((entry) => `"${entry}"`).join(',')  %>,
@@ -125,7 +118,6 @@ module.exports = {
 					],
 				},
 				{
-					auth: true,
 					role: ["client", "confirmed"],
 					fields: [<%- fieldsShortNames.map((entry) => `"${entry}"`).join(',')  %>],
 				},
@@ -142,11 +134,9 @@ module.exports = {
 			method: "delete",
 			rules: [
 				{
-					auth: true,
 					role: ["admin"],
 				},
 				{
-					auth: true,
 					role: ["client", "confirmed"],
 				},
 			],
@@ -163,7 +153,6 @@ module.exports = {
 			data: ["pager", "sorter", "filter", "search"],
 			rules: [
 				{
-					auth: true,
 					role: ["admin"],
 				},
 				{
@@ -187,8 +176,7 @@ module.exports = {
 			postFix: actionNamePath,
 			rules: [
 				{
-					auth: true,
-					role: ["manager"],
+					role: ["admin"],
 				},
 				{
 					auth: true,