@r2d2bzh/moleculer-authz-helpers 0.0.2 → 0.0.3

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "@r2d2bzh/moleculer-authz-helpers",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Moleculer mixin to implement preflight runner",
   "main": "index.js",
   "type": "module",
   "scripts": {
-    "test": "c8 ava -v"
+    "pretest": "npm run lint",
+    "test": "c8 ava -v",
+    "lint": "eslint ."
   },
   "keywords": [],
   "author": "",
@@ -17,6 +19,7 @@
     "@r2d2bzh/js-rules": "^0.7.1",
     "ava": "^3.15.0",
     "c8": "^7.10.0",
+    "eslint": "^7.32.0",
     "moleculer": "^0.14.18",
     "uuid": "^8.3.2"
   },
@@ -33,7 +36,7 @@
     ]
   },
   "engines": {
-    "node": ">=10.0.0"
+    "node": ">=12.0.0"
   },
   "peerDependencies": {
     "lodash": "^4.17.21",

package/src/add-preflight-mixin.js

@@ -1,7 +1,7 @@
 import cloneDeep from 'lodash/cloneDeep.js';
 import moleculer from 'moleculer';
+
 const {
-  Service,
   Errors: { MoleculerError },
 } = moleculer;
 
@@ -10,14 +10,13 @@ export const unsafeAddPreflightMixin = (serviceSchema) => {
     ([, actionSpecification]) => actionSpecification?.preflight
   );
 
-  const preflightActions = actionsWithPreflight.map(([actionName, { params, preflight } = {}]) => ([
-      `${actionName}-preflight`,
-      {
-        handler: preflight instanceof Function ? preflight : preflight.handler,
-        ...(params ? { params } : {}),
-      },
-    ])
-  );
+  const preflightActions = actionsWithPreflight.map(([actionName, { params, preflight } = {}]) => [
+    `${actionName}-preflight`,
+    {
+      handler: preflight instanceof Function ? preflight : preflight.handler,
+      ...(params ? { params } : {}),
+    },
+  ]);
 
   const schema = cloneDeep(serviceSchema);
 
@@ -28,20 +27,20 @@ export const unsafeAddPreflightMixin = (serviceSchema) => {
     ...(serviceSchema.mixins || []),
     {
       actions: Object.fromEntries(preflightActions),
-    }
+    },
   ];
 
   return schema;
 };
 
 export default (serviceSchema) => {
-  Object.entries(serviceSchema.actions || {}).filter(
-    ([, actionSpecification]) => (actionSpecification?.rest?.authorization !== false)
-  ).forEach(([actionName, actionSpecification]) => {
-    if (!((actionSpecification?.preflight instanceof Function) || actionSpecification?.preflight?.handler)) {
-      throw new MoleculerError('missing preflight handler', 500, 'MISSING_PREFLIGHT', { actionName }); 
-    }
-  });
+  Object.entries(serviceSchema.actions || {})
+    .filter(([, actionSpecification]) => actionSpecification?.rest?.authorization !== false)
+    .forEach(([actionName, actionSpecification]) => {
+      if (!(actionSpecification?.preflight instanceof Function || actionSpecification?.preflight?.handler)) {
+        throw new MoleculerError('missing preflight handler', 500, 'MISSING_PREFLIGHT', { actionName });
+      }
+    });
 
   return unsafeAddPreflightMixin(serviceSchema);
-};
+};

package/src/is-authorized.js

@@ -1,6 +1,19 @@
-const ensureBoolArray = (something) =>
-  (Array.isArray(something) ? something : [something]).flat(Infinity).filter((response) => response !== undefined);
+const removeUnanswered = (authzAnswers) => authzAnswers.filter((answer) => answer !== undefined);
 
-const someRequestsFailed = (booleanArray) => !booleanArray.length || booleanArray.includes(false);
+const doAnswersAuthorize = (authzAnswers) =>
+  authzAnswers.length
+    ? authzAnswers.reduce((isAuthorized, authzAnswer) => isAuthorized && doesAnswerAuthorize(authzAnswer), true)
+    : false;
 
-export default (something) => !someRequestsFailed(ensureBoolArray(something));
+const doesAnswerAuthorize = function (something) {
+  switch (Object.prototype.toString.call(something)) {
+    case '[object Boolean]':
+      return something;
+    case '[object Array]':
+      return doAnswersAuthorize(removeUnanswered(something));
+    default:
+      return false;
+  }
+};
+
+export default doesAnswerAuthorize;