@optimiser/common 1.0.317 → 1.0.318

package/dist/lib/utility.js

@@ -194,7 +194,7 @@ exports.CheckUserProfileField = CheckUserProfileField;
 function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
     db.collection("Page").findOne({ 'PageName': pageName }, function (err, pageData) {
         return __awaiter(this, void 0, void 0, function () {
-            var hasAccess;
+            var response, hasAccess;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -205,8 +205,14 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
                             callback(pageData);
                             return [2 /*return*/];
                         }
-                        return [4 /*yield*/, CheckPageAuthentication(pageData, msp_d, db, mdb, next)];
+                        return [4 /*yield*/, GetUserProfile(msp_d, db, mdb, next)];
                     case 1:
+                        response = _a.sent();
+                        if (response && response.message == 'success') {
+                            pageData['UserProfile'] = response.data;
+                        }
+                        return [4 /*yield*/, CheckPageAuthentication(pageData, msp_d, db, mdb, next)];
+                    case 2:
                         hasAccess = _a.sent();
                         if (!hasAccess) {
                             callback('Unauthorised');
@@ -4291,19 +4297,26 @@ exports.GetUserProfile = GetUserProfile;
 function CheckPageAuthentication(pageData, msp_d, db, mdb, next) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var hasAccess, response, userProfile, auth, i, moduleData;
+        var hasAccess, userProfile, response, auth, i, moduleData;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
                     hasAccess = false;
                     if (!(pageData.IsPermissionRequired == false)) return [3 /*break*/, 1];
                     hasAccess = true;
-                    return [3 /*break*/, 3];
-                case 1: return [4 /*yield*/, GetUserProfile(msp_d, db, mdb, next)];
-                case 2:
+                    return [3 /*break*/, 5];
+                case 1:
+                    userProfile = void 0;
+                    if (!pageData.UserProfile) return [3 /*break*/, 2];
+                    userProfile = pageData.UserProfile;
+                    return [3 /*break*/, 4];
+                case 2: return [4 /*yield*/, GetUserProfile(msp_d, db, mdb, next)];
+                case 3:
                     response = _c.sent();
-                    if (response && response.message == 'success') {
-                        userProfile = response.data;
+                    userProfile = response === null || response === void 0 ? void 0 : response.data;
+                    _c.label = 4;
+                case 4:
+                    if (userProfile) {
                         auth = userProfile.Permissions;
                         for (i = 0; i < auth.length; i++) {
                             moduleData = auth[i].ModuleData;
@@ -4316,10 +4329,11 @@ function CheckPageAuthentication(pageData, msp_d, db, mdb, next) {
                         }
                     }
                     else {
-                        console.log(response === null || response === void 0 ? void 0 : response.message);
+                        console.log('User Profile data is not found while checking Page authentication.');
+                        hasAccess = false;
                     }
-                    _c.label = 3;
-                case 3: return [2 /*return*/, hasAccess];
+                    _c.label = 5;
+                case 5: return [2 /*return*/, hasAccess];
             }
         });
     });

package/package.json

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