@riocrypto/common-server 1.0.2380 → 1.0.2382

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

@@ -1,3 +1,4 @@
 import { AuthRole } from "@riocrypto/common";
+import { AuthPermission } from "@riocrypto/common/build/types/auth-permission";
 import { NextFunction, Request, Response } from "express";
-export declare const requireMinRole: (req: Request, res: Response, next: NextFunction, minRole: AuthRole) => Promise<void>;
+export declare const requireMinRoleOrPermissions: (req: Request, res: Response, next: NextFunction, minRole: AuthRole, requiredPermissions: AuthPermission[]) => Promise<void>;

package/build/middlewares/require-min-role.js

@@ -9,20 +9,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requireMinRole = void 0;
+exports.requireMinRoleOrPermissions = void 0;
 const common_1 = require("@riocrypto/common");
 const authRoleOrder = [
     common_1.AuthRole.ViewOnly,
     common_1.AuthRole.CreateAndModify,
     common_1.AuthRole.Owner,
 ];
-const requireMinRole = (req, res, next, minRole) => __awaiter(void 0, void 0, void 0, function* () {
+const requireMinRoleOrPermissions = (req, res, next, minRole, requiredPermissions) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     if (!req.adminAuth && !req.validClusterApiKey) {
-        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.`);
+        const auth = req.auth;
+        if (!auth) {
+            throw new common_1.NotAuthorizedError();
+        }
+        if (auth.permissions) {
+            // Permission based requirements
+            if (!auth.permissions.some((permission) => requiredPermissions.includes(permission))) {
+                throw new common_1.GenericInputError(`Insufficient permissions. Contact your account owner to change your access permissions.`);
+            }
+        }
+        else {
+            // Role based requirements
+            if (authRoleOrder.indexOf((_a = req.auth) === null || _a === void 0 ? void 0 : _a.role) < authRoleOrder.indexOf(minRole)) {
+                throw new common_1.GenericInputError(`Incompatible role. Contact your account owner to change your access role.`);
+            }
         }
     }
     next();
 });
-exports.requireMinRole = requireMinRole;
+exports.requireMinRoleOrPermissions = requireMinRoleOrPermissions;

package/build/models/auth.d.ts

@@ -1,5 +1,6 @@
 import { APIKey, AuthRole, SecurityQuestion } from "@riocrypto/common";
 import { Mongoose, Model, Document } from "mongoose";
+import { AuthPermission } from "@riocrypto/common/build/types/auth-permission";
 interface AuthAttrs {
     phoneNumber: string;
     password?: string;
@@ -22,7 +23,8 @@ interface AuthAttrs {
     middleName?: string;
     lastName?: string;
     secondLastName?: string;
-    role: AuthRole;
+    role?: AuthRole;
+    permissions?: AuthPermission[];
 }
 interface AuthDoc extends Document {
     phoneNumber: string;
@@ -46,7 +48,8 @@ interface AuthDoc extends Document {
     middleName?: string;
     lastName?: string;
     secondLastName?: string;
-    role: AuthRole;
+    role?: AuthRole;
+    permissions?: AuthPermission[];
 }
 interface AuthModel extends Model<AuthDoc> {
     build(attrs: AuthAttrs): AuthDoc;

package/build/models/auth.js

@@ -76,6 +76,11 @@ const buildAuth = (mongoose) => {
         role: {
             type: String,
         },
+        permissions: [
+            {
+                type: String,
+            },
+        ],
         apiKeys: [
             {
                 value: {

package/build/services/logger.js

@@ -58,7 +58,7 @@ class LoggerService {
                     "routingNumber",
                 ];
                 requestBodyFieldsToMaskWithLastFour.forEach((field) => {
-                    if (requestBody.hasOwnProperty(field) &&
+                    if (Object.prototype.hasOwnProperty.call(requestBody, field) &&
                         typeof requestBody[field] === "string") {
                         requestBody[field] = this.maskValue(requestBody[field], true);
                     }
@@ -71,7 +71,7 @@ class LoggerService {
                     "authenticatorCode",
                 ];
                 requestBodyFieldsToMaskWithoutLastFour.forEach((field) => {
-                    if (requestBody.hasOwnProperty(field) &&
+                    if (Object.prototype.hasOwnProperty.call(requestBody, field) &&
                         typeof requestBody[field] === "string") {
                         requestBody[field] = this.maskValue(requestBody[field]);
                     }
@@ -85,7 +85,7 @@ class LoggerService {
                 const responseBody = resAsAny.body; // Keep this assertion for object access
                 const responseBodyFieldsToMask = ["secret", "value"];
                 responseBodyFieldsToMask.forEach((field) => {
-                    if (responseBody.hasOwnProperty(field) &&
+                    if (Object.prototype.hasOwnProperty.call(responseBody, field) &&
                         typeof responseBody[field] === "string") {
                         responseBody[field] = this.maskValue(responseBody[field]);
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.2380",
+  "version": "1.0.2382",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -28,7 +28,7 @@
     "@google-cloud/secret-manager": "^5.3.0",
     "@google-cloud/storage": "^6.9.5",
     "@hyperdx/node-opentelemetry": "^0.7.0",
-    "@riocrypto/common": "^1.0.2106",
+    "@riocrypto/common": "^1.0.2107",
     "@types/express": "^4.17.13",
     "axios": "^1.7.4",
     "crypto-js": "^4.2.0",