@optimiser/common 1.0.411 → 1.0.413

package/dist/lib/utility.d.ts

@@ -305,7 +305,7 @@ declare function GetFileFolderDetailsInFolderForDriveSharing(parentFolderID: any
  * @return NA
  */
 declare function SyncTotalSlotRemaining(registrationID: any, db: Db): Promise<void>;
-declare function CheckAccessPermissions(permissionType: string, objectName: string, msp_d: AnyObjectInterface, db: Db, mdb: Db, next: NextFunction): Promise<boolean | undefined>;
+declare function CheckAccessPermissions(permissionType: string, objectName: string, pageName: string, msp_d: AnyObjectInterface, db: Db, mdb: Db, next: NextFunction): Promise<boolean | undefined>;
 /**
  * TODO: To Set the delay
  *

package/dist/lib/utility.js

@@ -5796,44 +5796,42 @@ function ValidateStateCountryField(_a) {
 * Example: If user has Create/Modify/Delete/Import permission let him procceed else stop access.
 * Return: true/false
 */
-function CheckAccessPermissions(permissionType, objectName, msp_d, db, mdb, next) {
-    var _a, _b, _c;
+function CheckAccessPermissions(permissionType, objectName, pageName, msp_d, db, mdb, next) {
+    var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function () {
-        var response, isAllowed, data, _i, _d, item, error_9;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var response, isAllowed, data, _i, _f, item, error_9;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0:
-                    _e.trys.push([0, 2, , 3]);
+                    _g.trys.push([0, 2, , 3]);
                     return [4 /*yield*/, GetUserProfile(msp_d, db, mdb, next)];
                 case 1:
-                    response = _e.sent();
+                    response = _g.sent();
                     isAllowed = false;
                     data = response === null || response === void 0 ? void 0 : response.data;
                     if (data && data.Permissions.length > 0) {
-                        for (_i = 0, _d = data.Permissions; _i < _d.length; _i++) {
-                            item = _d[_i];
-                            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))) {
-                                if (item.Operations.includes(permissionType)) {
+                        for (_i = 0, _f = data.Permissions; _i < _f.length; _i++) {
+                            item = _f[_i];
+                            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)) || (pageName && ((_d = (_c = item.ModuleData) === null || _c === void 0 ? void 0 : _c.Pages) === null || _d === void 0 ? void 0 : _d.includes(pageName)))) {
+                                if (permissionType == "CheckOnlyAccess") {
                                     isAllowed = true;
-                                    break;
                                 }
-                                else if (((_c = item.ModuleData) === null || _c === void 0 ? void 0 : _c.CheckOnlyControlPanel) && item.Operations.includes('Control Panel')) {
+                                else if (item.Operations.includes(permissionType)) {
+                                    isAllowed = true;
+                                }
+                                else if (((_e = item.ModuleData) === null || _e === void 0 ? void 0 : _e.CheckOnlyControlPanel) && item.Operations.includes('Control Panel')) {
                                     isAllowed = true;
-                                    break;
                                 }
                                 else if (item.ModuleID == "report" && item.Operations.includes('Create-Edit')) {
                                     isAllowed = true;
-                                    break;
                                 }
+                                break;
                             }
                         }
                     }
-                    else if ((response === null || response === void 0 ? void 0 : response.message) != 'success') { // Else if was added by Shahzaib not to allow user to perform CRUD operation with inactive licence.
-                        isAllowed = false;
-                    }
                     return [2 /*return*/, isAllowed];
                 case 2:
-                    error_9 = _e.sent();
+                    error_9 = _g.sent();
                     console.error("Internal Error in CheckAccessPermissions function : ".concat(error_9));
                     return [3 /*break*/, 3];
                 case 3: return [2 /*return*/];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimiser/common",
-  "version": "1.0.411",
+  "version": "1.0.413",
   "description": "",
   "main": "dist/index.js",
   "scripts": {