@tiledesk/tiledesk-server 2.3.10 → 2.3.13

package/CHANGELOG.md

@@ -1,19 +1,8 @@
-curl --location --request POST 'https://console.native.tiledesk.com/api/62ea3c58cd9923001a6ccdf3/requests/support-group-62ea3c58cd9923001a6ccdf3-088a9b9d28d3427ea99ab928a7aeb9d4/messages' \
---header 'Authorization: JWT eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3ZWJob29rX2VuYWJsZWQiOmZhbHNlLCJ0eXBlIjoiZXh0ZXJuYWwiLCJsYW5ndWFnZSI6ImVuIiwiX2lkIjoiNjJlYTNkOGFjZDk5MjMwMDFhNmNjZjQ1IiwibmFtZSI6IkhlbGxvQm90IiwidXJsIjoiaHR0cHM6Ly9Cb3RUaW1lc3RhbXAuZ2FicmllbGVwYW5pY28ucmVwbC5jby9ib3QiLCJpZF9wcm9qZWN0IjoiNjJlYTNjNThjZDk5MjMwMDFhNmNjZGYzIiwidHJhc2hlZCI6ZmFsc2UsImNyZWF0ZWRCeSI6IjYxYmRkMGM0ZDBhMmE3MDAxYTI4YjliNCIsImNyZWF0ZWRBdCI6IjIwMjItMDgtMDNUMDk6MTk6MDYuNDMyWiIsInVwZGF0ZWRBdCI6IjIwMjItMDgtMDNUMDk6MTk6MDYuNDMyWiIsIl9fdiI6MCwiaWF0IjoxNjU5NTE4NzI1LCJhdWQiOiJodHRwczovL3RpbGVkZXNrLmNvbS9ib3RzLzYyZWEzZDhhY2Q5OTIzMDAxYTZjY2Y0NSIsImlzcyI6Imh0dHBzOi8vdGlsZWRlc2suY29tIiwic3ViIjoiYm90IiwianRpIjoiMzY3ZWI4YzAtNjczZi00NzUwLThhNmEtNzUyMzA4YmNhMGIyIn0.B4cq9b9V__S0uR9xYkuxykBKfQ4vU0DyO278KAJG4Us' \
---header 'Content-Type: application/json' \
---data-raw '{"text":"Cheers! You said:"}'
 
-curl --location --request POST 'https://console.native.tiledesk.com/api/62ea3c58cd9923001a6ccdf3/requests/support-group-62ea3c58cd9923001a6ccdf3-088a9b9d28d3427ea99ab928a7aeb9d3/messages' \
---header 'Authorization: JWT eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3ZWJob29rX2VuYWJsZWQiOmZhbHNlLCJ0eXBlIjoiZXh0ZXJuYWwiLCJsYW5ndWFnZSI6ImVuIiwiX2lkIjoiNjJlYTNkOGFjZDk5MjMwMDFhNmNjZjQ1IiwibmFtZSI6IkhlbGxvQm90IiwidXJsIjoiaHR0cHM6Ly9Cb3RUaW1lc3RhbXAuZ2FicmllbGVwYW5pY28ucmVwbC5jby9ib3QiLCJpZF9wcm9qZWN0IjoiNjJlYTNjNThjZDk5MjMwMDFhNmNjZGYzIiwidHJhc2hlZCI6ZmFsc2UsImNyZWF0ZWRCeSI6IjYxYmRkMGM0ZDBhMmE3MDAxYTI4YjliNCIsImNyZWF0ZWRBdCI6IjIwMjItMDgtMDNUMDk6MTk6MDYuNDMyWiIsInVwZGF0ZWRBdCI6IjIwMjItMDgtMDNUMDk6MTk6MDYuNDMyWiIsIl9fdiI6MCwiaWF0IjoxNjU5NTE4NzI1LCJhdWQiOiJodHRwczovL3RpbGVkZXNrLmNvbS9ib3RzLzYyZWEzZDhhY2Q5OTIzMDAxYTZjY2Y0NSIsImlzcyI6Imh0dHBzOi8vdGlsZWRlc2suY29tIiwic3ViIjoiYm90IiwianRpIjoiMzY3ZWI4YzAtNjczZi00NzUwLThhNmEtNzUyMzA4YmNhMGIyIn0.B4cq9b9V__S0uR9xYkuxykBKfQ4vU0DyO278KAJG4Us' \
---header 'Content-Type: application/json' \
---data-raw '{"text":"Cheers! You said:"}'
+# 2.3.11 -> PROD
+- Getting ip fix
 
-- ABILITA REOPEN CHAT IN PROD IN PRE C?é GIA ????? VALUTARE VEDI INTERCOM
-https://www.intercom.com/help/en/articles/3449698-prevent-replies-after-you-close-a-conversation
-
-visitor counter fa uscire errore mongo
-
-# # 2.3.10 -> PROD
+# 2.3.10
 - Added tilebot submodule
 - Askbot endpoint fix for tilebot and auto create faqs for tilebot
 - Added /widgets/ip endpoint   

package/app.js

@@ -175,8 +175,6 @@ if (process.env.CREATE_INITIAL_DATA !== "false") {
 
 
 
-
-
 var app = express();
 
 
@@ -339,8 +337,22 @@ var projectSetter = function (req, res, next) {
 
 function customDetection (req)  {
   // const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;  
-  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(',').pop().trim() ||        //https://stackoverflow.com/questions/8107856/how-to-determine-a-users-ip-address-in-node
+  //   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.10",
+  "version": "2.3.13",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/routes/widget.js

@@ -217,12 +217,35 @@ router.get('/', function(req, res, next) {
 
 
 
-    const ipStandard = (req.headers['x-forwarded-for'] || '').split(',').pop().trim() ||        //https://stackoverflow.com/questions/8107856/how-to-determine-a-users-ip-address-in-node
+    const ipStandard = (req.headers['x-forwarded-for'] || '').split(',').shift().trim() ||        //https://stackoverflow.com/questions/8107856/how-to-determine-a-users-ip-address-in-node
     req.socket.remoteAddress
 
     winston.info("standard ip: "+ipStandard); // ip address of the user
 
-    res.json( {ip:ip, ipStandard:ipStandard} );
+
+
+    // 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} );
 
 
   });