@riocrypto/common-server 1.0.1484 → 1.0.1486

package/build/index.d.ts

@@ -4,7 +4,7 @@ export * from "./middlewares/get-order";
 export * from "./middlewares/authorize";
 export * from "./middlewares/not-sandbox";
 export * from "./middlewares/set-trace";
-export * from "./middlewares/require-role";
+export * from "./middlewares/require-min-role";
 export * from "./services/apiKey";
 export * from "./services/password";
 export * from "./services/logger";

package/build/index.js

@@ -20,7 +20,7 @@ __exportStar(require("./middlewares/get-order"), exports);
 __exportStar(require("./middlewares/authorize"), exports);
 __exportStar(require("./middlewares/not-sandbox"), exports);
 __exportStar(require("./middlewares/set-trace"), exports);
-__exportStar(require("./middlewares/require-role"), exports);
+__exportStar(require("./middlewares/require-min-role"), exports);
 __exportStar(require("./services/apiKey"), exports);
 __exportStar(require("./services/password"), exports);
 __exportStar(require("./services/logger"), exports);

package/build/middlewares/require-min-role.d.ts

@@ -0,0 +1,3 @@
+import { AuthRole } from "@riocrypto/common";
+import { NextFunction, Request, Response } from "express";
+export declare const requireMinRole: (req: Request, res: Response, next: NextFunction, minRole: AuthRole) => Promise<void>;

package/build/middlewares/{require-role.js → require-min-role.js}

@@ -9,15 +9,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requireRole = void 0;
+exports.requireMinRole = void 0;
 const common_1 = require("@riocrypto/common");
-const requireRole = (req, res, next, role) => __awaiter(void 0, void 0, void 0, function* () {
+const authRoleOrder = [
+    common_1.AuthRole.Read,
+    common_1.AuthRole.Write,
+    common_1.AuthRole.Owner,
+];
+const requireMinRole = (req, res, next, minRole) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     if (!req.admin) {
-        const auth = req.auth;
-        if ((auth === null || auth === void 0 ? void 0 : auth.role) !== role) {
-            throw new common_1.GenericInputError(`Insufficient permissions. This endpoint requires the ${role}  role. Contact your account owner to change your access role.`);
+        if (authRoleOrder.indexOf((_a = req.auth) === null || _a === void 0 ? void 0 : _a.role) >= authRoleOrder.indexOf(minRole)) {
+            throw new common_1.GenericInputError(`Insufficient permissions. This endpoint requires at least the ${minRole} role. Contact your account owner to change your access role.`);
         }
     }
     next();
 });
-exports.requireRole = requireRole;
+exports.requireMinRole = requireMinRole;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.1484",
+  "version": "1.0.1486",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",

package/build/middlewares/require-role.d.ts

@@ -1,3 +0,0 @@
-import { AuthRole } from "@riocrypto/common";
-import { NextFunction, Request, Response } from "express";
-export declare const requireRole: (req: Request, res: Response, next: NextFunction, role: AuthRole) => Promise<void>;