@optimiser/common 1.0.226 → 1.0.230

package/dist/lib/utility.d.ts

@@ -185,4 +185,5 @@ declare function GetUserProfile(msp_d: AnyObjectInterface, db: Db, mdb: Db, next
      */
 declare function ErrorHandlerForServices(Error: OPT_ERROR, ServiceOrigin: string, EmailConfig: any, Module?: string, db?: Db): Promise<any>;
 declare function CheckCaptcha(token: string, captcha: string, redisClient: Redis): Promise<unknown>;
-export { CheckForWhiteListedDomain, ReturnJsonResponse, ConvertFileByteSize, GetObjectByKeyValueFromList, IsEqualArrays, IsEqualValue, CheckUserProfileField, GetPageFieldData, GetPageObjectSchema, GetFieldDetail, UpdateRecentViewObject, SyncChildObjectData, SyncParentObjectData, DeleteFieldInOtherCollection, SyncFieldInSameCollection, SyncFieldInSameCollectionByObjectID, SyncFieldInSameCollectionByObjectIDWithPromise, SyncFieldInOtherCollection, SyncUserInOtherCollection, BuildLookupDataField, CheckDataBeforeAdd, CheckDataBeforeUpdate, BuildGridFieldProjection, BuildFieldProjection, BuildLookupFieldProjection, FilterConditions, GirdHeaderFilters, 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, GetUserProfile, ErrorHandlerForServices, CheckCaptcha };
+declare function ValidateSanitizeUserInput(inputFields: AnyObjectInterface, pageData: AnyObjectInterface): Promise<AnyObjectInterface[] | undefined>;
+export { CheckForWhiteListedDomain, ReturnJsonResponse, ConvertFileByteSize, GetObjectByKeyValueFromList, IsEqualArrays, IsEqualValue, CheckUserProfileField, GetPageFieldData, GetPageObjectSchema, GetFieldDetail, UpdateRecentViewObject, SyncChildObjectData, SyncParentObjectData, DeleteFieldInOtherCollection, SyncFieldInSameCollection, SyncFieldInSameCollectionByObjectID, SyncFieldInSameCollectionByObjectIDWithPromise, SyncFieldInOtherCollection, SyncUserInOtherCollection, BuildLookupDataField, CheckDataBeforeAdd, CheckDataBeforeUpdate, BuildGridFieldProjection, BuildFieldProjection, BuildLookupFieldProjection, FilterConditions, GirdHeaderFilters, 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, GetUserProfile, ErrorHandlerForServices, CheckCaptcha, ValidateSanitizeUserInput };

package/dist/lib/utility.js

@@ -80,7 +80,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CheckCaptcha = exports.ErrorHandlerForServices = exports.GetUserProfile = 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 = 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.GirdHeaderFilters = exports.FilterConditions = exports.BuildLookupFieldProjection = exports.BuildFieldProjection = exports.BuildGridFieldProjection = exports.CheckDataBeforeUpdate = exports.CheckDataBeforeAdd = exports.BuildLookupDataField = exports.SyncUserInOtherCollection = exports.SyncFieldInOtherCollection = exports.SyncFieldInSameCollectionByObjectIDWithPromise = exports.SyncFieldInSameCollectionByObjectID = exports.SyncFieldInSameCollection = exports.DeleteFieldInOtherCollection = exports.SyncParentObjectData = exports.SyncChildObjectData = 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.ValidateSanitizeUserInput = exports.CheckCaptcha = exports.ErrorHandlerForServices = exports.GetUserProfile = 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 = 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.GirdHeaderFilters = exports.FilterConditions = exports.BuildLookupFieldProjection = exports.BuildFieldProjection = exports.BuildGridFieldProjection = exports.CheckDataBeforeUpdate = exports.CheckDataBeforeAdd = exports.BuildLookupDataField = exports.SyncUserInOtherCollection = exports.SyncFieldInOtherCollection = exports.SyncFieldInSameCollectionByObjectIDWithPromise = exports.SyncFieldInSameCollectionByObjectID = exports.SyncFieldInSameCollection = exports.DeleteFieldInOtherCollection = exports.SyncParentObjectData = exports.SyncChildObjectData = exports.UpdateRecentViewObject = exports.GetFieldDetail = exports.GetPageObjectSchema = exports.GetPageFieldData = exports.CheckUserProfileField = exports.IsEqualValue = exports.IsEqualArrays = exports.GetObjectByKeyValueFromList = exports.ConvertFileByteSize = exports.ReturnJsonResponse = exports.CheckForWhiteListedDomain = void 0;
 var moment_1 = __importDefault(require("moment"));
 var nodemailer_1 = __importDefault(require("nodemailer"));
 var mongodb_1 = require("mongodb");
@@ -88,14 +88,15 @@ var bson_1 = require("bson");
 var Excel = __importStar(require("exceljs"));
 var path_1 = __importDefault(require("path"));
 var fs_1 = __importDefault(require("fs"));
-var axios_1 = __importDefault(require("axios"));
+var geoip = __importStar(require("geoip-lite"));
 var crypto_1 = __importDefault(require("crypto"));
 var constants_1 = __importDefault(require("../constants"));
 var mail_1 = require("../utility/mail");
 var errorHandlerForServices_1 = __importDefault(require("../utility/errorHandlerForServices"));
 var cryptoService = __importStar(require("../utility/crypto"));
-var https_1 = __importDefault(require("https"));
+var countrycode_1 = require("./countrycode");
 require("moment-timezone");
+var sanitize = require('mongo-sanitize');
 function GetObjectByKeyValueFromList(list, key, val) {
     if (list && list.length > 0) {
         for (var i = 0; i < list.length; i++) {
@@ -2972,40 +2973,39 @@ function ConvertFileByteSize(bytes) {
 exports.ConvertFileByteSize = ConvertFileByteSize;
 function GetIPDetailsFromReq(req) {
     return __awaiter(this, void 0, void 0, function () {
-        var ip, domainName, ipDetails;
+        var ip, ipDetails;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (req.headers['x-original-forwarded-for']) {
-                        console.log("In req.headers['x-original-forwarded-for']"); /* Temp for brijesh */
-                        ip = req.headers['x-original-forwarded-for'];
-                    }
-                    else if (req.headers['x-forwarded-for']) {
-                        console.log("In req.headers['x-forwarded-for']"); /* Temp for brijesh */
-                        ip = req.headers['x-forwarded-for'].split(",")[0];
-                    }
-                    else if (req.connection && req.connection.remoteAddress) {
-                        ip = req.connection.remoteAddress;
-                    }
-                    else {
-                        ip = req.ip;
-                    }
-                    domainName = req.headers.host ? req.headers.host : req.headers.origin;
-                    return [4 /*yield*/, axios_1.default.post("https://" + domainName + "/user/noauth/getlocationfromip", { ip: ip }, {
-                            httpsAgent: new https_1.default.Agent({
-                                rejectUnauthorized: false
-                            })
-                        })];
-                case 1:
-                    ipDetails = (_a.sent()).data;
-                    ipDetails = ipDetails.data;
-                    /* if (ipDetails) {
-                        ipDetails.countryName = countryCode(ipDetails.country)
-                        ipDetails.ip = ip
-                    } */
-                    console.log('>>IP DE ', ipDetails);
-                    return [2 /*return*/, ipDetails];
+            if (req.headers['x-original-forwarded-for']) {
+                //console.log("In req.headers['x-original-forwarded-for']");
+                ip = req.headers['x-original-forwarded-for'];
+            }
+            else if (req.headers['x-forwarded-for']) {
+                //console.log("In req.headers['x-forwarded-for']");
+                ip = req.headers['x-forwarded-for'].split(",")[0];
+            }
+            else if (req.connection && req.connection.remoteAddress) {
+                ip = req.connection.remoteAddress;
+            }
+            else {
+                ip = req.ip;
+            }
+            ipDetails = geoip.lookup(ip);
+            if (ipDetails) {
+                ipDetails.countryName = countrycode_1.getCountryFromCode(ipDetails.country);
+                ipDetails.ip = ip;
+                // }
+                //return connection.ReturnJsonResponse(req, res, { Status: 200, Message: 'success', Data: ipDetails, Type: 'POST', LogData: false });
             }
+            else {
+                ipDetails = '';
+            }
+            //ipDetails = ipDetails.data;
+            /* if (ipDetails) {
+                ipDetails.countryName = countryCode(ipDetails.country)
+                ipDetails.ip = ip
+            } */
+            console.log('>>IP DE ', ipDetails);
+            return [2 /*return*/, ipDetails];
         });
     });
 }
@@ -3806,6 +3806,14 @@ function ErrorHandlerForServices(Error, ServiceOrigin, EmailConfig, Module, db)
     });
 }
 exports.ErrorHandlerForServices = ErrorHandlerForServices;
+/*
+* Created by:  Brijesh and edited by Shazaib as on 15-11-21
+* Desc: This function is used for verifying captcha
+* @param1: token  (from user form)
+* @param2: captcha code (from user form)
+* @param3: redisClient , object of the redis client.
+* return value: message string
+*/
 function CheckCaptcha(token, captcha, redisClient) {
     return new Promise(function (resolve, reject) {
         redisClient.hgetall(token, function (err, data) {
@@ -3829,3 +3837,94 @@ function CheckCaptcha(token, captcha, redisClient) {
     });
 }
 exports.CheckCaptcha = CheckCaptcha;
+/*
+  * this function isused tp capitalized first latter of a string.
+  * @param1: string   ex: 'lazy boy'
+  * return value: Lazy boy else false if value is not a string
+  */
+function CapitalizeFirstLetter(str) {
+    if (typeof str !== 'string' || !str) {
+        return false;
+    }
+    return str.charAt(0).toUpperCase() + str.slice(1);
+}
+function EmailValidation(elmValue) {
+    var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+    if (filter.test(elmValue)) {
+        return true;
+    }
+    return false;
+}
+/*
+* Created by:  Mohan as on 09-11-21
+* This is a common function and used to validate and sanitise user input.
+* @param1: inputFields  (from user form)
+* {
+    OwnerID: { '$oid': '6123438f6693ea0012919e9a' },
+    Salutation: '1',
+    FirstName: 'Santa',
+    LastName: 'Singh',
+    VIPStatus: null,
+    OperaProfileId: null
+  }
+
+* @param2: pageData   objectdata from ObjectSchema collection
+* Desc: This fuinction maps all fields from user form with objectdata from ObjectSchema collection.
+* return value:  array.
+* example: [{"msg":'Invalid email'}, {all validated and sanitized fields with key:value}]
+*/
+function ValidateSanitizeUserInput(inputFields, pageData) {
+    return __awaiter(this, void 0, void 0, function () {
+        var objElement, inputItem, key, val, sanitizeInput, msg, _i, _a, item, elm, elmValue;
+        return __generator(this, function (_b) {
+            try {
+                objElement = {};
+                inputItem = {};
+                for (key in inputFields) {
+                    if (inputFields.hasOwnProperty(key)) {
+                        val = inputFields[key];
+                        //if (val !== null && (typeof val === 'object' || mongodb.ObjectID.isValid(val))) {
+                        if (val !== null && (typeof val === 'object' || mongodb_1.ObjectID.isValid(val))) {
+                            inputItem[key] = val;
+                        }
+                        else {
+                            inputItem[key] = (typeof val === 'string') ? sanitize(val.toString().trim()) : sanitize(val); // sanitize input values  
+                        }
+                        objElement[key] = inputItem[key];
+                    }
+                }
+                sanitizeInput = [];
+                msg = '';
+                for (_i = 0, _a = pageData.Fields; _i < _a.length; _i++) {
+                    item = _a[_i];
+                    elm = item.Name.toString();
+                    elmValue = inputItem[elm];
+                    if (item.IsRequired == true && item.IsRequired !== undefined) {
+                        // check for required input fileds       
+                        if (elmValue && item.UIDataType == 'email' && elmValue != '' && elmValue != null && elmValue !== undefined) {
+                            if (!EmailValidation(elmValue.toString())) {
+                                msg = 'Invalid email format!';
+                            }
+                        }
+                        else {
+                            // other required field
+                            if (elmValue == '' || elmValue == 'null' || elmValue === null) {
+                                msg = CapitalizeFirstLetter(item.DisplayName) + ' is required!';
+                            }
+                        }
+                    }
+                    //  }       
+                }
+                sanitizeInput.push({ "msg": msg });
+                sanitizeInput.push(objElement);
+                //console.log("=============>",sanitizeInput);   
+                return [2 /*return*/, sanitizeInput];
+            }
+            catch (err) {
+                console.log("Error in validateSanitizeUserInput() in utility.js: ", err);
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+exports.ValidateSanitizeUserInput = ValidateSanitizeUserInput;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimiser/common",
-  "version": "1.0.226",
+  "version": "1.0.230",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -30,6 +30,7 @@
     "libphonenumber-js": "^1.9.23",
     "moment": "^2.25.3",
     "moment-timezone": "^0.5.27",
+    "mongo-sanitize": "^1.1.0",
     "mongodb": "^3.6.2",
     "nodemailer": "^6.4.11",
     "promise.allsettled": "^1.0.2",