@optimiser/common 1.0.409 → 1.0.411

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.
Files changed (2) hide show
  1. package/dist/lib/utility.js +14 -10
  2. package/package.json +59 -59
@@ -4417,7 +4417,7 @@ function GetUserProfile(msp_d, db, mdb, next) {
4417
4417
  let: { permissions: "$Permissions.ModuleID" },
4418
4418
  pipeline: [
4419
4419
  { $match: { "$expr": { "$in": ["$_id", "$$permissions"] } } },
4420
- { $project: { "_id": 1, "Objects": 1, "Pages": 1, "IsBeta": 1 } }
4420
+ { $project: { "_id": 1, "Objects": 1, "Pages": 1, "IsBeta": 1, "CheckOnlyControlPanel": 1 } }
4421
4421
  ],
4422
4422
  as: "ModuleList"
4423
4423
  }
@@ -5797,26 +5797,30 @@ function ValidateStateCountryField(_a) {
5797
5797
  * Return: true/false
5798
5798
  */
5799
5799
  function CheckAccessPermissions(permissionType, objectName, msp_d, db, mdb, next) {
5800
- var _a, _b;
5800
+ var _a, _b, _c;
5801
5801
  return __awaiter(this, void 0, void 0, function () {
5802
- var response, isAllowed, data, _i, _c, item, error_9;
5803
- return __generator(this, function (_d) {
5804
- switch (_d.label) {
5802
+ var response, isAllowed, data, _i, _d, item, error_9;
5803
+ return __generator(this, function (_e) {
5804
+ switch (_e.label) {
5805
5805
  case 0:
5806
- _d.trys.push([0, 2, , 3]);
5806
+ _e.trys.push([0, 2, , 3]);
5807
5807
  return [4 /*yield*/, GetUserProfile(msp_d, db, mdb, next)];
5808
5808
  case 1:
5809
- response = _d.sent();
5809
+ response = _e.sent();
5810
5810
  isAllowed = false;
5811
5811
  data = response === null || response === void 0 ? void 0 : response.data;
5812
5812
  if (data && data.Permissions.length > 0) {
5813
- for (_i = 0, _c = data.Permissions; _i < _c.length; _i++) {
5814
- item = _c[_i];
5813
+ for (_i = 0, _d = data.Permissions; _i < _d.length; _i++) {
5814
+ item = _d[_i];
5815
5815
  if (item.ModuleID.toLowerCase() == objectName.toLowerCase() || ((_b = (_a = item.ModuleData) === null || _a === void 0 ? void 0 : _a.Objects) === null || _b === void 0 ? void 0 : _b.includes(objectName))) {
5816
5816
  if (item.Operations.includes(permissionType)) {
5817
5817
  isAllowed = true;
5818
5818
  break;
5819
5819
  }
5820
+ else if (((_c = item.ModuleData) === null || _c === void 0 ? void 0 : _c.CheckOnlyControlPanel) && item.Operations.includes('Control Panel')) {
5821
+ isAllowed = true;
5822
+ break;
5823
+ }
5820
5824
  else if (item.ModuleID == "report" && item.Operations.includes('Create-Edit')) {
5821
5825
  isAllowed = true;
5822
5826
  break;
@@ -5829,7 +5833,7 @@ function CheckAccessPermissions(permissionType, objectName, msp_d, db, mdb, next
5829
5833
  }
5830
5834
  return [2 /*return*/, isAllowed];
5831
5835
  case 2:
5832
- error_9 = _d.sent();
5836
+ error_9 = _e.sent();
5833
5837
  console.error("Internal Error in CheckAccessPermissions function : ".concat(error_9));
5834
5838
  return [3 /*break*/, 3];
5835
5839
  case 3: return [2 /*return*/];
package/package.json CHANGED
@@ -1,59 +1,59 @@
1
- {
2
- "name": "@optimiser/common",
3
- "version": "1.0.409",
4
- "description": "",
5
- "main": "dist/index.js",
6
- "scripts": {
7
- "compile": "tsc",
8
- "push": "tsc && npm version patch -git-tag-version false && npm publish"
9
- },
10
- "files": [
11
- "dist/*"
12
- ],
13
- "author": "",
14
- "license": "ISC",
15
- "dependencies": {
16
- "@types/geoip-lite": "^1.4.0",
17
- "@types/promise.allsettled": "^1.0.3",
18
- "@types/request": "^2.48.5",
19
- "@types/sanitize-html": "^2.11.0",
20
- "@types/sequelize": "^4.28.9",
21
- "@types/unzipper": "^0.10.3",
22
- "@types/uuid": "^8.3.0",
23
- "aws-sdk": "^2.786.0",
24
- "axios": "^0.21.4",
25
- "bson": "^4.2.0",
26
- "exceljs": "^4.3.0",
27
- "express": "^4.17.1",
28
- "express-validator": "^6.9.2",
29
- "firebase-admin": "^12.0.0",
30
- "geoip-lite": "^1.4.2",
31
- "google-libphonenumber": "^3.2.30",
32
- "ioredis": "^4.17.3",
33
- "libphonenumber-js": "^1.9.51",
34
- "moment": "^2.25.3",
35
- "moment-timezone": "^0.5.27",
36
- "mongo-sanitize": "^1.1.0",
37
- "mongodb": "^3.6.2",
38
- "nodemailer": "^6.4.11",
39
- "promise.allsettled": "^1.0.2",
40
- "qrcode": "^1.5.3",
41
- "request": "^2.88.2",
42
- "sanitize-html": "^2.13.0",
43
- "sequelize": "^6.3.5",
44
- "typescript": "^5.3.3",
45
- "unzipper": "^0.10.11",
46
- "uuid": "^8.3.1"
47
- },
48
- "devDependencies": {
49
- "@types/aws-sdk": "^2.7.0",
50
- "@types/bson": "^4.0.2",
51
- "@types/exceljs": "^1.3.0",
52
- "@types/express": "^4.17.8",
53
- "@types/ioredis": "^4.17.4",
54
- "@types/moment": "^2.13.0",
55
- "@types/moment-timezone": "^0.5.30",
56
- "@types/mongodb": "^3.5.27",
57
- "@types/nodemailer": "^6.4.0"
58
- }
59
- }
1
+ {
2
+ "name": "@optimiser/common",
3
+ "version": "1.0.411",
4
+ "description": "",
5
+ "main": "dist/index.js",
6
+ "scripts": {
7
+ "compile": "tsc",
8
+ "push": "tsc && npm version patch -git-tag-version false && npm publish"
9
+ },
10
+ "files": [
11
+ "dist/*"
12
+ ],
13
+ "author": "",
14
+ "license": "ISC",
15
+ "dependencies": {
16
+ "@types/geoip-lite": "^1.4.0",
17
+ "@types/promise.allsettled": "^1.0.3",
18
+ "@types/request": "^2.48.5",
19
+ "@types/sanitize-html": "^2.11.0",
20
+ "@types/sequelize": "^4.28.9",
21
+ "@types/unzipper": "^0.10.3",
22
+ "@types/uuid": "^8.3.0",
23
+ "aws-sdk": "^2.786.0",
24
+ "axios": "^0.21.4",
25
+ "bson": "^4.2.0",
26
+ "exceljs": "^4.3.0",
27
+ "express": "^4.17.1",
28
+ "express-validator": "^6.9.2",
29
+ "firebase-admin": "^12.0.0",
30
+ "geoip-lite": "^1.4.2",
31
+ "google-libphonenumber": "^3.2.30",
32
+ "ioredis": "^4.17.3",
33
+ "libphonenumber-js": "^1.9.51",
34
+ "moment": "^2.25.3",
35
+ "moment-timezone": "^0.5.27",
36
+ "mongo-sanitize": "^1.1.0",
37
+ "mongodb": "^3.6.2",
38
+ "nodemailer": "^6.4.11",
39
+ "promise.allsettled": "^1.0.2",
40
+ "qrcode": "^1.5.3",
41
+ "request": "^2.88.2",
42
+ "sanitize-html": "^2.13.0",
43
+ "sequelize": "^6.3.5",
44
+ "typescript": "^5.3.3",
45
+ "unzipper": "^0.10.11",
46
+ "uuid": "^8.3.1"
47
+ },
48
+ "devDependencies": {
49
+ "@types/aws-sdk": "^2.7.0",
50
+ "@types/bson": "^4.0.2",
51
+ "@types/exceljs": "^1.3.0",
52
+ "@types/express": "^4.17.8",
53
+ "@types/ioredis": "^4.17.4",
54
+ "@types/moment": "^2.13.0",
55
+ "@types/moment-timezone": "^0.5.30",
56
+ "@types/mongodb": "^3.5.27",
57
+ "@types/nodemailer": "^6.4.0"
58
+ }
59
+ }