@optimiser/common 1.0.229 → 1.0.230

package/dist/lib/utility.js

@@ -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) {
@@ -2973,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];
         });
     });
 }

package/package.json

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