@tiledesk/tiledesk-server 2.3.12 → 2.3.13

package/app.js

@@ -175,7 +175,6 @@ if (process.env.CREATE_INITIAL_DATA !== "false") {
 
 
 
-
 var app = express();
 
 
@@ -341,9 +340,19 @@ function customDetection (req)  {
   // const ip = (req.headers['x-forwarded-for'] || '').split(',').pop().trim() ||        //https://stackoverflow.com/questions/8107856/how-to-determine-a-users-ip-address-in-node
   //   req.socket.remoteAddress
 
-    const ip = 
-    req.headers['x-forwarded-for']?.split(',').shift()
-    || req.socket?.remoteAddress
+
+  let ip = req.socket.remoteAddress;
+
+    const xFor =  req.headers['x-forwarded-for'];
+    if (xFor ) {
+      const xForArr = xFor.split(',');
+      if (xForArr && xForArr.length>0) {
+        ip = xForArr.shift();
+      }
+    }
+    // const ip = 
+    // req.headers['x-forwarded-for']?.split(',').shift()
+    // || req.socket?.remoteAddress
 
   winston.info("standard ip: "+ip); // ip address of the user
   return ip;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.12",
+  "version": "2.3.13",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/routes/widget.js

@@ -224,12 +224,27 @@ router.get('/', function(req, res, next) {
 
 
 
-    const parseIp = (req) =>
-    req.headers['x-forwarded-for']?.split(',').shift()
-    || req.socket?.remoteAddress
+    // const parseIp = (req) =>
+    // req.headers['x-forwarded-for']?.split(',').shift()
+    // || req.socket?.remoteAddress
 
+    
+
+    let parseIp = req.socket.remoteAddress;
+
+    const xFor =  req.headers['x-forwarded-for'];
+    winston.info("parseIp xFor: "+xFor);
+
+    if (xFor ) {
+      const xForArr = xFor.split(',');
+      if (xForArr && xForArr.length>0) {
+        parseIp = xForArr.shift();
+        winston.info("parseIp xFor parseIp: "+parseIp);
+      }
+    }
     winston.info("parseIp: "+parseIp); // ip address of the user
 
+
     res.json( {ip:ip, ipStandard:ipStandard, parseIp: parseIp} );