@rufous/aem 1.1.23 → 1.1.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,2 +1,2 @@
1
1
  import { Request, Response, NextFunction } from "express";
2
- export declare const requirePermissions: (accessType: "read", permissionType: string[], userModel: any, permissionsModel: any) => (req: Request, res: Response, next: NextFunction) => void;
2
+ export declare const requirePermissions: (accessType: "read", permissionType: string[], userModel: any, permissionsModel: any) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -1,4 +1,40 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ var __generator = (this && this.__generator) || function (thisArg, body) {
12
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
+ function verb(n) { return function (v) { return step([n, v]); }; }
15
+ function step(op) {
16
+ if (f) throw new TypeError("Generator is already executing.");
17
+ while (_) try {
18
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
19
+ if (y = 0, t) op = [op[0] & 2, t.value];
20
+ switch (op[0]) {
21
+ case 0: case 1: t = op; break;
22
+ case 4: _.label++; return { value: op[1], done: false };
23
+ case 5: _.label++; y = op[1]; op = [0]; continue;
24
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
25
+ default:
26
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
27
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
28
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
29
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
30
+ if (t[2]) _.ops.pop();
31
+ _.trys.pop(); continue;
32
+ }
33
+ op = body.call(thisArg, _);
34
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
35
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
+ }
37
+ };
2
38
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
39
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
40
  };
@@ -9,35 +45,49 @@ var user_status_1 = require("../types/user-status");
9
45
  var mongoose_1 = __importDefault(require("mongoose"));
10
46
  var permission_denied_error_1 = require("../errors/permission-denied-error");
11
47
  exports.requirePermissions = function (accessType, permissionType, userModel, permissionsModel) {
12
- return function (req, res, next) {
13
- if (!req.currentUser) {
14
- throw new not_authorized_error_1.NotAuthorizedError();
15
- }
16
- if (req.currentUser.ust === user_status_1.UserStatus.Suspended) {
17
- throw new not_authorized_error_1.NotAuthorizedError();
18
- }
19
- var user = req.currentUser;
20
- var userDetails = mongoose_1.default.model(userModel).findById(user.id);
21
- var ispermExist = false;
22
- console.log("userDetails ", userDetails);
23
- if (!userDetails) {
24
- throw new not_authorized_error_1.NotAuthorizedError();
25
- }
26
- else if (userDetails.roles || userDetails.userRoles) {
27
- var roles = userDetails.roles ? userDetails.roles : userDetails.userRoles;
28
- var permissions = mongoose_1.default
29
- .model(permissionsModel)
30
- .find({ entityId: { $in: roles } });
31
- var permissionsArr = permissions
32
- .filter(function (perm) { return perm[accessType]; })
33
- .map(function (perm) { return perm.name; });
34
- ispermExist = permissionsArr.some(function (perm) {
35
- return permissionType.includes(perm);
36
- });
37
- }
38
- if (!ispermExist) {
39
- throw new permission_denied_error_1.PermissionDeniedError();
40
- }
41
- next();
42
- };
48
+ return function (req, res, next) { return __awaiter(void 0, void 0, void 0, function () {
49
+ var user, userDetails, ispermExist, roles, permissions, permissionsArr;
50
+ return __generator(this, function (_a) {
51
+ switch (_a.label) {
52
+ case 0:
53
+ if (!req.currentUser) {
54
+ throw new not_authorized_error_1.NotAuthorizedError();
55
+ }
56
+ if (req.currentUser.ust === user_status_1.UserStatus.Suspended) {
57
+ throw new not_authorized_error_1.NotAuthorizedError();
58
+ }
59
+ console.log("userModel ", userModel);
60
+ console.log("permissionsModel ", permissionsModel);
61
+ user = req.currentUser;
62
+ return [4 /*yield*/, mongoose_1.default.model(userModel).findById(user.id)];
63
+ case 1:
64
+ userDetails = _a.sent();
65
+ ispermExist = false;
66
+ console.log("userDetails ", userDetails);
67
+ if (!!userDetails) return [3 /*break*/, 2];
68
+ throw new not_authorized_error_1.NotAuthorizedError();
69
+ case 2:
70
+ if (!(userDetails.roles || userDetails.userRoles)) return [3 /*break*/, 4];
71
+ roles = userDetails.roles ? userDetails.roles : userDetails.userRoles;
72
+ return [4 /*yield*/, mongoose_1.default
73
+ .model(permissionsModel)
74
+ .find({ entityId: { $in: roles } })];
75
+ case 3:
76
+ permissions = _a.sent();
77
+ permissionsArr = permissions
78
+ .filter(function (perm) { return perm[accessType]; })
79
+ .map(function (perm) { return perm.name; });
80
+ ispermExist = permissionsArr.some(function (perm) {
81
+ return permissionType.includes(perm);
82
+ });
83
+ _a.label = 4;
84
+ case 4:
85
+ if (!ispermExist) {
86
+ throw new permission_denied_error_1.PermissionDeniedError();
87
+ }
88
+ next();
89
+ return [2 /*return*/];
90
+ }
91
+ });
92
+ }); };
43
93
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rufous/aem",
3
- "version": "1.1.23",
3
+ "version": "1.1.24",
4
4
  "main": "./build/index.js",
5
5
  "types": "./build/index.d.ts",
6
6
  "files": [