@optimiser/common 1.0.393 → 1.0.395

package/dist/aws/awsservices.d.ts

@@ -22,6 +22,7 @@ export default class AwsServices {
     DeleteFile(Bucket: string, Key: string, id: string, db: mongo.Db): Promise<Error | AnyObjectInterface>;
     GetFile(BucketName: string, Region: string, FilePath: string): Promise<S3.GetObjectOutput>;
     getDownloadUrl(CDN: string, FilePath: string, FileName: string, action: string, expiry?: number): Promise<any>;
+    EncodeFileName(fileName: string): string;
     GetFileStream(CDN: string, Key: string, FileName: string): Promise<request.Request>;
     ChangesACL(BucketName: string, FilePath: string): Promise<S3.PutObjectAclOutput | aws.AWSError>;
     GetSignedUrl(BucketName: string, Region: string, FilePath: string): string;

package/dist/aws/awsservices.js

@@ -144,7 +144,7 @@ var AwsServices = /** @class */ (function () {
                             encodedurl = "".concat(CDN, "/").concat(FilePath);
                         }
                         else {
-                            FileName = FileName.replace(/[;]/g, "%3b").replace(/[,]/g, "%2c").replace(/[']/g, "%27"); //converting special character to UTF-8
+                            FileName = this.EncodeFileName(FileName);
                             encodedurl = "".concat(CDN, "/").concat(FilePath, "?response-content-disposition=").concat(encodeURIComponent("attachment;filename=" + FileName));
                         }
                         signingParams = {
@@ -164,6 +164,11 @@ var AwsServices = /** @class */ (function () {
             });
         });
     };
+    AwsServices.prototype.EncodeFileName = function (fileName) {
+        return fileName.split('').map(function (char) {
+            return /[A-Za-z0-9_\-\.]/.test(char) ? char : encodeURIComponent(char);
+        }).join('');
+    };
     AwsServices.prototype.GetFileStream = function (CDN, Key, FileName) {
         var _this = this;
         return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {

package/dist/lib/utility.js

@@ -4082,17 +4082,7 @@ function BroadCastEventToAllCompanyUsers(params) {
                                     data: eventItem.EventData,
                                     userId: usersData[i]._id.toString()
                                 };
-                                //socketUtility.TriggerSockerEvent(req, usersData[i]._id.toString(), eventName, data);
-                                params.event.CreateEvent(null, null, { SocketObj: socketObjectData }).then(function (socketResult) {
-                                    if (socketResult) {
-                                        console.log("Success");
-                                    }
-                                    else {
-                                        console.log('Notification failed to send.');
-                                    }
-                                }).catch(function (socketErr) {
-                                    console.log('Notification failed to send due to error ==>', socketErr);
-                                });
+                                params.socket.emit('sendNotification', { SocketObj: socketObjectData });
                             }
                         }
                     }
@@ -5769,6 +5759,54 @@ function ValidateStateCountryField(_a) {
         });
     });
 }
+/*
+* This function is used to check user permission
+* @param1: permissionType, like Create/Modify/Delete/Import. permission type user has.
+* @param2: objectName, like Contact, Account etc
+* @param3:
+* @param4: db (database)
+* @param5: 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 checkAccessPermissions(permissionType, objectName, msp_d, db, mdb, next) {
+    return __awaiter(this, void 0, void 0, function () {
+        var response, isAllowed, data, _i, _a, item, error_9;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _b.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, GetUserProfile(msp_d, db, mdb, next)];
+                case 1:
+                    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*/];
+            }
+        });
+    });
+}
 /**
  * Activity Mail Template Structure
  * @param {string} content It is html body content sent over mail

package/package.json

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