@r2d2bzh/moleculer-authz-helpers 2.0.5 → 3.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@r2d2bzh/moleculer-authz-helpers",
-  "version": "2.0.5",
+  "version": "3.0.1",
   "description": "Moleculer mixin to implement preflight runner",
   "main": "index.js",
   "type": "module",
@@ -9,6 +9,10 @@
     "test": "c8 ava -v",
     "lint": "eslint ."
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/r2d2bzh/moleculer-authz-helpers.git"
+  },
   "keywords": [],
   "author": "",
   "license": "ISC",
@@ -16,12 +20,13 @@
     "access": "public"
   },
   "devDependencies": {
-    "@r2d2bzh/js-rules": "^1.0.3",
-    "ava": "^5.2.0",
-    "c8": "^7.12.0",
-    "eslint": "^8.34.0",
-    "moleculer": "^0.14.28",
-    "uuid": "^9.0.0"
+    "@r2d2bzh/eslint-config": "^3.0.1",
+    "@r2d2bzh/js-rules": "^2.0.2",
+    "ava": "^8.0.1",
+    "c8": "^11.0.0",
+    "eslint": "^10.5.0",
+    "moleculer": "^0.14.35",
+    "uuid": "^14.0.1"
   },
   "c8": {
     "check-coverage": true,
@@ -33,16 +38,21 @@
     "reporter": [
       "lcov",
       "text"
+    ],
+    "exclude": [
+      "eslint.config.js",
+      "test/",
+      "coverage/"
     ]
   },
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=20.0.0"
   },
   "peerDependencies": {
-    "moleculer": "^0.14.28"
+    "moleculer": "^0.14.35"
   },
   "dependencies": {
-    "@r2d2bzh/moleculer-event-callback": "^1.0.0",
-    "lodash": "^4.17.21"
+    "@r2d2bzh/moleculer-event-callback": "^2.0.0",
+    "lodash": "^4.18.1"
   }
 }

package/src/add-preflight-mixin.js

@@ -8,14 +8,14 @@ const {
 
 export const unsafeAddPreflightMixin = (serviceSchema, { timeout }) => {
   const actionsWithPreflight = Object.entries(serviceSchema.actions || {}).filter(
-    ([, actionSpecification]) => actionSpecification?.preflight
+    ([, actionSpecification]) => actionSpecification?.preflight,
   );
 
   const preflightActions = actionsWithPreflight.map(([actionName, { params, preflight } = {}]) => [
     `${actionName}-preflight`,
     {
-      handler: preflight instanceof Function ? preflight : preflight.handler,
-      ...(params ? { params } : {}),
+      handler: typeof preflight === 'function' ? preflight : preflight.handler,
+      ...(params && { params }),
     },
   ]);
 
@@ -37,10 +37,10 @@ export const unsafeAddPreflightMixin = (serviceSchema, { timeout }) => {
 
 export default (serviceSchema, { timeout = 200 } = {}) => {
   const authorizedActions = Object.entries(serviceSchema.actions || {}).filter(
-    ([, actionSpecification]) => actionSpecification?.rest && actionSpecification.rest?.authorization !== false
+    ([, actionSpecification]) => actionSpecification?.rest && actionSpecification.rest?.authorization !== false,
   );
   for (const [actionName, actionSpecification] of authorizedActions) {
-    if (!(actionSpecification?.preflight instanceof Function || actionSpecification?.preflight?.handler)) {
+    if (!(typeof actionSpecification?.preflight === 'function' || actionSpecification?.preflight?.handler)) {
       throw new MoleculerError('missing preflight handler', 500, 'MISSING_PREFLIGHT', { actionName });
     }
   }

package/src/is-authorized.js

@@ -27,11 +27,11 @@ const onMultipleAuthorizations =
 
 const processAndCountManyAnswers = (warn) => {
   const warnOnMultipleAuthorizations = onMultipleAuthorizations((authorizationsCount) =>
-    warn(`multiple answers to the same authorization request`, { authorizationsCount })
+    warn(`multiple answers to the same authorization request`, { authorizationsCount }),
   );
   return (answers, authorizationStatus) => {
     const newRequestIsAuthorized = warnOnMultipleAuthorizations(
-      reduceAnswers(removeUnanswered(answers), processAndCountAnswer(warn))
+      reduceAnswers(removeUnanswered(answers), processAndCountAnswer(warn)),
     );
     return authorizationStatus && newRequestIsAuthorized;
   };
@@ -39,15 +39,15 @@ const processAndCountManyAnswers = (warn) => {
 
 const processAndCountAnswer = (warn) => {
   const doAnswersAuthorize = processAndCountManyAnswers(warn);
-  return function (answer, authorizationStatus = true, authorizationsCount = 0) {
+  return function (answer, isAuthorized = true, authorizationsCount = 0) {
     switch (Object.prototype.toString.call(answer)) {
       case '[object Boolean]': {
-        return [authorizationStatus && answer, authorizationsCount + 1];
+        return [isAuthorized && answer, authorizationsCount + 1];
       }
       case '[object Array]': {
         // A new array means a new authorization request with its own
         // answers count that does not reflect on the current one
-        return [doAnswersAuthorize(answer, authorizationStatus), authorizationsCount];
+        return [doAnswersAuthorize(answer, isAuthorized), authorizationsCount];
       }
       case '[object Undefined]': {
         return [false, authorizationsCount];

package/src/request-authorizations.js

@@ -1,6 +1,6 @@
 export default (context) => (requests) =>
   Promise.all(
     requests.map(({ eventName, parameters, options }) =>
-      context.service.$$callEvent(context, { eventName, payload: parameters, options })
-    )
+      context.service.$$callEvent(context, { eventName, payload: parameters, options }),
+    ),
   );