@rufous/aem 1.1.21 → 1.1.23

package/build/errors/permission-denied-error.d.ts

@@ -0,0 +1,8 @@
+import { CustomError } from './custom-error';
+export declare class PermissionDeniedError extends CustomError {
+    statusCode: number;
+    constructor();
+    serializeErrors(): {
+        message: string;
+    }[];
+}

package/build/errors/permission-denied-error.js

@@ -0,0 +1,31 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PermissionDeniedError = void 0;
+var custom_error_1 = require("./custom-error");
+var PermissionDeniedError = /** @class */ (function (_super) {
+    __extends(PermissionDeniedError, _super);
+    function PermissionDeniedError() {
+        var _this = _super.call(this, "Sorry, you don't have access.") || this;
+        _this.statusCode = 403;
+        Object.setPrototypeOf(_this, PermissionDeniedError.prototype);
+        return _this;
+    }
+    PermissionDeniedError.prototype.serializeErrors = function () {
+        return [{ message: "Sorry, you don't have access." }];
+    };
+    return PermissionDeniedError;
+}(custom_error_1.CustomError));
+exports.PermissionDeniedError = PermissionDeniedError;

package/build/index.d.ts

@@ -5,6 +5,7 @@ export * from './errors/internal-server-error';
 export * from './errors/not-authorized-error';
 export * from './errors/not-found-error';
 export * from './errors/not-verified-error';
+export * from './errors/permission-denied-error';
 export * from './errors/request-validation-error';
 export * from './errors/security-error';
 export * from './middlewares/current-user';

package/build/index.js

@@ -18,6 +18,7 @@ __exportStar(require("./errors/internal-server-error"), exports);
 __exportStar(require("./errors/not-authorized-error"), exports);
 __exportStar(require("./errors/not-found-error"), exports);
 __exportStar(require("./errors/not-verified-error"), exports);
+__exportStar(require("./errors/permission-denied-error"), exports);
 __exportStar(require("./errors/request-validation-error"), exports);
 __exportStar(require("./errors/security-error"), exports);
 __exportStar(require("./middlewares/current-user"), exports);

package/build/middlewares/required-permissions.d.ts

@@ -1,2 +1,2 @@
 import { Request, Response, NextFunction } from "express";
-export declare const requirePermissions: (accessType: string | undefined, permissionType: string[] | undefined, userModel: any, permissionsModel: any, req: Request, res: Response, next: NextFunction) => Response<any> | undefined;
+export declare const requirePermissions: (accessType: "read", permissionType: string[], userModel: any, permissionsModel: any) => (req: Request, res: Response, next: NextFunction) => void;

package/build/middlewares/required-permissions.js

@@ -7,38 +7,37 @@ exports.requirePermissions = void 0;
 var not_authorized_error_1 = require("../errors/not-authorized-error");
 var user_status_1 = require("../types/user-status");
 var mongoose_1 = __importDefault(require("mongoose"));
-exports.requirePermissions = function (accessType, permissionType, userModel, permissionsModel, req, res, next) {
-    if (accessType === void 0) { accessType = "read"; }
-    if (permissionType === void 0) { permissionType = []; }
-    if (!req.currentUser) {
-        throw new not_authorized_error_1.NotAuthorizedError();
-    }
-    if (req.currentUser.ust === user_status_1.UserStatus.Suspended) {
-        throw new not_authorized_error_1.NotAuthorizedError();
-    }
-    var user = req.currentUser;
-    var userDetails = mongoose_1.default.model(userModel).findById(user.id);
-    var ispermExist = false;
-    if (!userDetails) {
-        throw new not_authorized_error_1.NotAuthorizedError();
-    }
-    else if (userDetails.roles) {
-        var permissions = mongoose_1.default
-            .model(permissionsModel)
-            .find({ roles: { $in: userDetails.roles } });
-        var permissionsArr = permissions
-            .filter(function (perm) { return perm[accessType]; })
-            .map(function (perm) { return perm.name; });
-        ispermExist = permissionsArr.some(function (perm) {
-            return permissionType.includes(perm);
-        });
-    }
-    if (!ispermExist) {
-        return res.status(403).json({
-            error: "Sorry, you don't have access.",
-        });
-    }
-    else {
+var permission_denied_error_1 = require("../errors/permission-denied-error");
+exports.requirePermissions = function (accessType, permissionType, userModel, permissionsModel) {
+    return function (req, res, next) {
+        if (!req.currentUser) {
+            throw new not_authorized_error_1.NotAuthorizedError();
+        }
+        if (req.currentUser.ust === user_status_1.UserStatus.Suspended) {
+            throw new not_authorized_error_1.NotAuthorizedError();
+        }
+        var user = req.currentUser;
+        var userDetails = mongoose_1.default.model(userModel).findById(user.id);
+        var ispermExist = false;
+        console.log("userDetails ", userDetails);
+        if (!userDetails) {
+            throw new not_authorized_error_1.NotAuthorizedError();
+        }
+        else if (userDetails.roles || userDetails.userRoles) {
+            var roles = userDetails.roles ? userDetails.roles : userDetails.userRoles;
+            var permissions = mongoose_1.default
+                .model(permissionsModel)
+                .find({ entityId: { $in: roles } });
+            var permissionsArr = permissions
+                .filter(function (perm) { return perm[accessType]; })
+                .map(function (perm) { return perm.name; });
+            ispermExist = permissionsArr.some(function (perm) {
+                return permissionType.includes(perm);
+            });
+        }
+        if (!ispermExist) {
+            throw new permission_denied_error_1.PermissionDeniedError();
+        }
         next();
-    }
+    };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rufous/aem",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [