@optimiser/common 1.0.227 → 1.0.231

package/dist/lib/utility.d.ts

@@ -175,6 +175,7 @@ declare function GetUserProfile(msp_d: AnyObjectInterface, db: Db, mdb: Db, next
     message: string;
     data: any;
 } | undefined>;
+declare function CheckPageAuthentication(pageData: AnyObjectInterface, msp_d: AnyObjectInterface, db: Db, mdb: Db, next: NextFunction): Promise<boolean>;
 /**
      * @param Error Error object
      * @param ServiceOrigin - Error Occur in Service (Service Name)
@@ -186,4 +187,4 @@ 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>;
 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 };
+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, CheckPageAuthentication, 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.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;
+exports.ValidateSanitizeUserInput = exports.CheckCaptcha = exports.ErrorHandlerForServices = exports.CheckPageAuthentication = 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,13 +88,13 @@ 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) {
@@ -185,11 +185,10 @@ function CheckUserProfileField(pageData, profileData) {
 exports.CheckUserProfileField = CheckUserProfileField;
 function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
     db.collection("Page").findOne({ 'PageName': pageName }, function (err, pageData) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var hasAccess, response, userProfile, auth, i, moduleData;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var hasAccess;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         if (err) {
                             next(err);
@@ -198,40 +197,16 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
                             callback(pageData);
                             return [2 /*return*/];
                         }
-                        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:
-                        response = _c.sent();
-                        if (response && response.message == 'success') {
-                            userProfile = response.data;
-                            auth = userProfile.Permissions;
-                            for (i = 0; i < auth.length; i++) {
-                                moduleData = auth[i].ModuleData;
-                                if (moduleData) {
-                                    if (((_a = moduleData.Objects) === null || _a === void 0 ? void 0 : _a.indexOf(pageData.ObjectName)) >= 0 || ((_b = moduleData.Pages) === null || _b === void 0 ? void 0 : _b.indexOf(pageData.PageName)) >= 0) {
-                                        hasAccess = true;
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                        else {
-                            console.log(response === null || response === void 0 ? void 0 : response.message);
-                            callback('Unauthorised');
-                        }
-                        _c.label = 3;
-                    case 3:
-                        // ** Ends ** //
+                        return [4 /*yield*/, CheckPageAuthentication(pageData, msp_d, db, mdb, next)];
+                    case 1:
+                        hasAccess = _a.sent();
                         if (!hasAccess) {
                             callback('Unauthorised');
                         }
                         else {
                             db.collection("ObjectSchema").findOne({ 'Name': pageData.ObjectName }, function (err, objectData) {
                                 return __awaiter(this, void 0, void 0, function () {
-                                    var _loop_2, i, g, group, childObjectSchema, _loop_3, i, _loop_4, i;
+                                    var _loop_2, i, g, group, childObjectSchema, _loop_3, i, _loop_4, i, idObject, idObject_1;
                                     return __generator(this, function (_a) {
                                         switch (_a.label) {
                                             case 0:
@@ -294,6 +269,34 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
                                                 g++;
                                                 return [3 /*break*/, 1];
                                             case 5:
+                                                if (pageData.Fields && pageData.Type == "ObjectGrid") {
+                                                    idObject = {
+                                                        Name: "_id",
+                                                        Schema: { Name: "_id", DisplayName: "ID", ApiName: "ID", UIDataType: "objectid" },
+                                                        Sequence: 0,
+                                                        UniqueID: "_id",
+                                                        DisplayName: "ID",
+                                                        Width: 100
+                                                    };
+                                                    pageData.Fields.splice(0, 0, idObject);
+                                                }
+                                                if (pageData.Fields && pageData.Type == "ObjectDetail") {
+                                                    idObject_1 = {
+                                                        Name: "_id",
+                                                        Sequence: 0,
+                                                        UIDataType: "objectid",
+                                                        UniqueID: "_id",
+                                                        DisplayName: "ID"
+                                                    };
+                                                    pageData.Fields == pageData.Fields.map(function (s) {
+                                                        if (s.Schema && s.Schema.UIDataType == "collection") {
+                                                            s.Schema.Fields.splice(0, 0, idObject_1);
+                                                        }
+                                                        else {
+                                                            s;
+                                                        }
+                                                    });
+                                                }
                                                 callback(pageData);
                                                 return [2 /*return*/];
                                         }
@@ -2034,6 +2037,8 @@ function GirdHeaderFilters(filters, fields) {
                 matchValue = { '$eq': parseInt(obj.Value) };
             else if (["decimal", "percent"].includes(field.Schema.UIDataType))
                 matchValue = { '$eq': mongodb_1.Decimal128.fromString(obj.Value) };
+            else if (field.Schema.UIDataType == 'objectid')
+                matchValue = { '$eq': obj.Value };
             else
                 matchValue = { '$regex': obj.Value.trim().replace(/[-[\]{}()*+?.,\\/^$|#\s]/g, "\\$&"), '$options': 'i' };
             var fieldMatch = {};
@@ -2973,40 +2978,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];
         });
     });
 }
@@ -3765,6 +3769,43 @@ function GetUserProfile(msp_d, db, mdb, next) {
     });
 }
 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;
+        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:
+                    response = _c.sent();
+                    if (response && response.message == 'success') {
+                        userProfile = response.data;
+                        auth = userProfile.Permissions;
+                        for (i = 0; i < auth.length; i++) {
+                            moduleData = auth[i].ModuleData;
+                            if (moduleData) {
+                                if (((_a = moduleData.Objects) === null || _a === void 0 ? void 0 : _a.indexOf(pageData.ObjectName)) >= 0 || ((_b = moduleData.Pages) === null || _b === void 0 ? void 0 : _b.indexOf(pageData.PageName)) >= 0) {
+                                    hasAccess = true;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    else {
+                        console.log(response === null || response === void 0 ? void 0 : response.message);
+                    }
+                    _c.label = 3;
+                case 3: return [2 /*return*/, hasAccess];
+            }
+        });
+    });
+}
+exports.CheckPageAuthentication = CheckPageAuthentication;
 /**
      * @param Error Error object
      * @param ServiceOrigin - Error Occur in Service (Service Name)
@@ -3902,7 +3943,7 @@ function ValidateSanitizeUserInput(inputFields, pageData) {
                     elmValue = inputItem[elm];
                     if (item.IsRequired == true && item.IsRequired !== undefined) {
                         // check for required input fileds       
-                        if (item.UIDataType == 'email' && elmValue != '') {
+                        if (elmValue && item.UIDataType == 'email' && elmValue != '' && elmValue != null && elmValue !== undefined) {
                             if (!EmailValidation(elmValue.toString())) {
                                 msg = 'Invalid email format!';
                             }

package/package.json

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