@optimiser/common 1.0.412 → 1.0.414

package/dist/aws/awsservices.js

@@ -144,7 +144,7 @@ var AwsServices = /** @class */ (function () {
                             encodedurl = "".concat(CDN, "/").concat(FilePath);
                         }
                         else {
-                            FileName = this.EncodeFileName(FileName);
+                            FileName = this.EncodeFileName(FileName).replace(/[^a-zA-Z0-9-_\.]/g, "-");
                             encodedurl = "".concat(CDN, "/").concat(FilePath, "?response-content-disposition=").concat(encodeURIComponent("attachment;filename=" + FileName));
                         }
                         signingParams = {

package/dist/lib/utility.d.ts

@@ -306,10 +306,11 @@ declare function GetFileFolderDetailsInFolderForDriveSharing(parentFolderID: any
  */
 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 CheckProfilePermissions(permissionType: string, objectName: string, pageName: string, msp_d: AnyObjectInterface, db: Db, mdb: Db, next: NextFunction): Promise<boolean | undefined>;
 /**
  * TODO: To Set the delay
  *
  * @param ms - delay in milisecond
  */
 declare function Delay(ms: integer): Promise<unknown>;
-export { CheckForWhiteListedDomain, ReturnJsonResponse, ConvertFileByteSize, GetObjectByKeyValueFromList, IsEqualArrays, IsEqualValue, CheckUserProfileField, GetPageFieldData, GetPageObjectSchema, GetFieldDetail, UpdateRecentViewObject, UpdateRecentViewFields, SyncChildObjectData, SyncParentObjectData, DeleteFieldInOtherCollection, SyncFieldInSameCollection, SyncFieldInSameCollectionByObjectID, SyncFieldInSameCollectionByObjectIDWithPromise, SyncFieldInOtherCollection, SyncUserInOtherCollection, GetObjectByString, BuildLookupDataField, CheckDataBeforeAdd, CheckDataBeforeUpdate, BuildGridFieldProjection, BuildFieldProjection, BuildLookupFieldProjection, FilterConditions, GirdHeaderFilters, FieldsGridHeaderFilters, AddLog, CheckFilterFieldsProjection, VerifyEmailPassword, GetMyTeamUsers, ExtractChildUsersTree, GetMaxKeyValueListSchema, VerifyAWSEmailConfig, GenerateId, SyncUserDetailsWithMasterDB, SignoutUserFromAllDevices, SignoutUsersWithPromise, SignoutMultipleUsersFromAllDevices, UserLicenseConsumeCalculate, sendMailWithUserAccount, GetEmailClientConfigs, GetCompanyEncryptionKey, ExecuteDynamicDMLQuery, ExecuteDynamicDQLQuery, GetUserProfilePermissions, MakeUserPasswordInvalid, ConvertJsonToXLXS, SendResetPasswordMail, SendMailToSupport, MailTemplateStructure, SendMailToCustomer, parseMSPCookie, GetIPDetailsFromReq, isEmptyObj, SyncListSchemaFieldInOtherCollection, UpdateTagCountAfterDelete, SyncTagCountAfterUpdate, ReactivateFieldInOtherCollection, SyncUserLicenceConsumedCount, BroadCastEventToAllCompanyUsers, CheckDataPermission, SyncCompanyLicenceInMasterCompanyAfterAdd, NextServiceDateForDashboard, CheckDateNotInPast, GetWeekDayByDayAndOccurance, GetInterValFromOccurance, GetWeekDayInfoInMonth, GetDayIndex, RemoveFieldsFromFilters, GetUserProfile, CheckPageAuthentication, ErrorHandlerForServices, CheckCaptcha, IsStringValue, ValidateSanitizeUserInput, ValidateUserInput, CheckConditionalField, CheckExpressionOnDateField, AddDaysToDate, CreateBanquetingVATSettingsData, CheckReportFolderAccess, GetMailFromString, InvitationMailReplyContent, HasFiscalOperator, GetEncryptedURL, GenerateBase64QRCodeData, GetFileFolderDetailsInFolderForDriveSharing, SyncTotalSlotRemaining, CheckAccessPermissions, Delay };
+export { CheckForWhiteListedDomain, ReturnJsonResponse, ConvertFileByteSize, GetObjectByKeyValueFromList, IsEqualArrays, IsEqualValue, CheckUserProfileField, GetPageFieldData, GetPageObjectSchema, GetFieldDetail, UpdateRecentViewObject, UpdateRecentViewFields, SyncChildObjectData, SyncParentObjectData, DeleteFieldInOtherCollection, SyncFieldInSameCollection, SyncFieldInSameCollectionByObjectID, SyncFieldInSameCollectionByObjectIDWithPromise, SyncFieldInOtherCollection, SyncUserInOtherCollection, GetObjectByString, BuildLookupDataField, CheckDataBeforeAdd, CheckDataBeforeUpdate, BuildGridFieldProjection, BuildFieldProjection, BuildLookupFieldProjection, FilterConditions, GirdHeaderFilters, FieldsGridHeaderFilters, AddLog, CheckFilterFieldsProjection, VerifyEmailPassword, GetMyTeamUsers, ExtractChildUsersTree, GetMaxKeyValueListSchema, VerifyAWSEmailConfig, GenerateId, SyncUserDetailsWithMasterDB, SignoutUserFromAllDevices, SignoutUsersWithPromise, SignoutMultipleUsersFromAllDevices, UserLicenseConsumeCalculate, sendMailWithUserAccount, GetEmailClientConfigs, GetCompanyEncryptionKey, ExecuteDynamicDMLQuery, ExecuteDynamicDQLQuery, GetUserProfilePermissions, MakeUserPasswordInvalid, ConvertJsonToXLXS, SendResetPasswordMail, SendMailToSupport, MailTemplateStructure, SendMailToCustomer, parseMSPCookie, GetIPDetailsFromReq, isEmptyObj, SyncListSchemaFieldInOtherCollection, UpdateTagCountAfterDelete, SyncTagCountAfterUpdate, ReactivateFieldInOtherCollection, SyncUserLicenceConsumedCount, BroadCastEventToAllCompanyUsers, CheckDataPermission, SyncCompanyLicenceInMasterCompanyAfterAdd, NextServiceDateForDashboard, CheckDateNotInPast, GetWeekDayByDayAndOccurance, GetInterValFromOccurance, GetWeekDayInfoInMonth, GetDayIndex, RemoveFieldsFromFilters, GetUserProfile, CheckPageAuthentication, ErrorHandlerForServices, CheckCaptcha, IsStringValue, ValidateSanitizeUserInput, ValidateUserInput, CheckConditionalField, CheckExpressionOnDateField, AddDaysToDate, CreateBanquetingVATSettingsData, CheckReportFolderAccess, GetMailFromString, InvitationMailReplyContent, HasFiscalOperator, GetEncryptedURL, GenerateBase64QRCodeData, GetFileFolderDetailsInFolderForDriveSharing, SyncTotalSlotRemaining, CheckAccessPermissions, CheckProfilePermissions, Delay };

package/dist/lib/utility.js

@@ -85,7 +85,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MakeUserPasswordInvalid = exports.GetUserProfilePermissions = exports.ExecuteDynamicDQLQuery = exports.ExecuteDynamicDMLQuery = exports.GetCompanyEncryptionKey = exports.GetEmailClientConfigs = exports.sendMailWithUserAccount = exports.UserLicenseConsumeCalculate = exports.SignoutMultipleUsersFromAllDevices = exports.SignoutUsersWithPromise = exports.SignoutUserFromAllDevices = exports.SyncUserDetailsWithMasterDB = exports.GenerateId = exports.VerifyAWSEmailConfig = exports.GetMaxKeyValueListSchema = exports.ExtractChildUsersTree = exports.GetMyTeamUsers = exports.VerifyEmailPassword = exports.CheckFilterFieldsProjection = exports.AddLog = exports.FieldsGridHeaderFilters = exports.GirdHeaderFilters = exports.FilterConditions = exports.BuildLookupFieldProjection = exports.BuildFieldProjection = exports.BuildGridFieldProjection = exports.CheckDataBeforeUpdate = exports.CheckDataBeforeAdd = exports.BuildLookupDataField = exports.GetObjectByString = exports.SyncUserInOtherCollection = exports.SyncFieldInOtherCollection = exports.SyncFieldInSameCollectionByObjectIDWithPromise = exports.SyncFieldInSameCollectionByObjectID = exports.SyncFieldInSameCollection = exports.DeleteFieldInOtherCollection = exports.SyncParentObjectData = exports.SyncChildObjectData = exports.UpdateRecentViewFields = exports.UpdateRecentViewObject = exports.GetFieldDetail = exports.GetPageObjectSchema = exports.GetPageFieldData = exports.CheckUserProfileField = exports.IsEqualValue = exports.IsEqualArrays = exports.GetObjectByKeyValueFromList = exports.ConvertFileByteSize = exports.ReturnJsonResponse = exports.CheckForWhiteListedDomain = void 0;
-exports.Delay = exports.CheckAccessPermissions = exports.SyncTotalSlotRemaining = exports.GetFileFolderDetailsInFolderForDriveSharing = exports.GenerateBase64QRCodeData = exports.GetEncryptedURL = exports.HasFiscalOperator = exports.InvitationMailReplyContent = exports.GetMailFromString = exports.CheckReportFolderAccess = exports.CreateBanquetingVATSettingsData = exports.AddDaysToDate = exports.CheckExpressionOnDateField = exports.CheckConditionalField = exports.ValidateUserInput = exports.ValidateSanitizeUserInput = exports.IsStringValue = exports.CheckCaptcha = exports.ErrorHandlerForServices = exports.CheckPageAuthentication = exports.GetUserProfile = exports.RemoveFieldsFromFilters = exports.GetDayIndex = exports.GetWeekDayInfoInMonth = exports.GetInterValFromOccurance = exports.GetWeekDayByDayAndOccurance = exports.CheckDateNotInPast = exports.NextServiceDateForDashboard = exports.SyncCompanyLicenceInMasterCompanyAfterAdd = exports.CheckDataPermission = exports.BroadCastEventToAllCompanyUsers = exports.SyncUserLicenceConsumedCount = exports.ReactivateFieldInOtherCollection = exports.SyncTagCountAfterUpdate = exports.UpdateTagCountAfterDelete = exports.SyncListSchemaFieldInOtherCollection = exports.isEmptyObj = exports.GetIPDetailsFromReq = exports.parseMSPCookie = exports.SendMailToCustomer = exports.MailTemplateStructure = exports.SendMailToSupport = exports.SendResetPasswordMail = exports.ConvertJsonToXLXS = void 0;
+exports.Delay = exports.CheckProfilePermissions = exports.CheckAccessPermissions = exports.SyncTotalSlotRemaining = exports.GetFileFolderDetailsInFolderForDriveSharing = exports.GenerateBase64QRCodeData = exports.GetEncryptedURL = exports.HasFiscalOperator = exports.InvitationMailReplyContent = exports.GetMailFromString = exports.CheckReportFolderAccess = exports.CreateBanquetingVATSettingsData = exports.AddDaysToDate = exports.CheckExpressionOnDateField = exports.CheckConditionalField = exports.ValidateUserInput = exports.ValidateSanitizeUserInput = exports.IsStringValue = exports.CheckCaptcha = exports.ErrorHandlerForServices = exports.CheckPageAuthentication = exports.GetUserProfile = exports.RemoveFieldsFromFilters = exports.GetDayIndex = exports.GetWeekDayInfoInMonth = exports.GetInterValFromOccurance = exports.GetWeekDayByDayAndOccurance = exports.CheckDateNotInPast = exports.NextServiceDateForDashboard = exports.SyncCompanyLicenceInMasterCompanyAfterAdd = exports.CheckDataPermission = exports.BroadCastEventToAllCompanyUsers = exports.SyncUserLicenceConsumedCount = exports.ReactivateFieldInOtherCollection = exports.SyncTagCountAfterUpdate = exports.UpdateTagCountAfterDelete = exports.SyncListSchemaFieldInOtherCollection = exports.isEmptyObj = exports.GetIPDetailsFromReq = exports.parseMSPCookie = exports.SendMailToCustomer = exports.MailTemplateStructure = exports.SendMailToSupport = exports.SendResetPasswordMail = exports.ConvertJsonToXLXS = void 0;
 var moment_1 = __importDefault(require("moment"));
 var nodemailer_1 = __importDefault(require("nodemailer"));
 var mongodb_1 = require("mongodb");
@@ -5786,7 +5786,7 @@ function ValidateStateCountryField(_a) {
     });
 }
 /*
-* This function is used to check user permission
+* Please not use this function, it will remove after go live of CheckProfilePermissions function
 * @param1: permissionType, like Create/Modify/Delete/Import. permission type user has.
 * @param2: objectName, like Contact, Account etc
 * @param3:
@@ -5797,55 +5797,99 @@ function ValidateStateCountryField(_a) {
 * Return: true/false
 */
 function CheckAccessPermissions(permissionType, objectName, msp_d, db, mdb, next) {
-    var _a, _b, _c;
     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, _a, item, error_9;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    _e.trys.push([0, 2, , 3]);
+                    _b.trys.push([0, 2, , 3]);
                     return [4 /*yield*/, GetUserProfile(msp_d, db, mdb, next)];
                 case 1:
-                    response = _e.sent();
+                    response = _b.sent();
+                    isAllowed = true;
+                    data = response === null || response === void 0 ? void 0 : response.data;
+                    if (data && data.Permissions.length > 0) {
+                        for (_i = 0, _a = data.Permissions; _i < _a.length; _i++) {
+                            item = _a[_i];
+                            if (item.ModuleID.toLowerCase() == objectName.toLowerCase()) {
+                                if (!item.Operations.includes(permissionType)) {
+                                    isAllowed = false;
+                                    if (item.Operations.includes('Create-Edit'))
+                                        isAllowed = true;
+                                }
+                            }
+                        }
+                    }
+                    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 = _b.sent();
+                    console.error("Internal Error in CheckAccessPermissions function : ".concat(error_9));
+                    return [3 /*break*/, 3];
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+exports.CheckAccessPermissions = CheckAccessPermissions;
+/*
+* This function is used to check user profile permission
+* @param1: permissionType, like Create/Modify/Delete/Import. permission type user has.
+* @param2: objectName, like Contact, Account etc
+* @param3: pageName
+* @param4: msp_d, it contains userid, companyid, etc
+* @param5: db (database)
+* @param6: mdb (master DB)
+* Desc: allow user to procced, if he has access permission
+* Example: If user has Create/Modify/Delete/Import permission let him procceed else stop access.
+* Return: true/false
+*/
+function CheckProfilePermissions(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, _f, item, error_10;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
+                case 0:
+                    _g.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, GetUserProfile(msp_d, db, mdb, next)];
+                case 1:
+                    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))) {
+                        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 (item.Operations.includes(permissionType)) {
                                     isAllowed = true;
-                                    break;
                                 }
-                                else if (((_c = item.ModuleData) === null || _c === void 0 ? void 0 : _c.CheckOnlyControlPanel) && item.Operations.includes('Control Panel')) {
+                                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();
-                    console.error("Internal Error in CheckAccessPermissions function : ".concat(error_9));
+                    error_10 = _g.sent();
+                    console.error("Internal Error in CheckProfilePermissions function : ".concat(error_10));
                     return [3 /*break*/, 3];
                 case 3: return [2 /*return*/];
             }
         });
     });
 }
-exports.CheckAccessPermissions = CheckAccessPermissions;
+exports.CheckProfilePermissions = CheckProfilePermissions;
 /**
  * TODO: To Set the delay
  *

package/package.json

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