@tiledesk/tiledesk-server 2.2.39 → 2.3.1-8.1

package/routes/request.js

@@ -162,6 +162,20 @@ router.patch('/:requestid', function (req, res) {
     update.priority = req.body.priority;
   }
 
+  if (req.body.smartAssignment!=undefined) {
+    update.smartAssignment = req.body.smartAssignment;
+  }
+  
+  if (req.body.workingStatus!=undefined) {
+    update.workingStatus = req.body.workingStatus;
+  }
+  
+
+  if (req.body.channelName) {
+    update["channel.name"] = req.body.channelName;
+  }
+
+
   
   winston.verbose("Request patch update",update);
 
@@ -196,8 +210,9 @@ router.patch('/:requestid', function (req, res) {
 router.put('/:requestid/close', function (req, res) {
   winston.debug(req.body);
   
-  // closeRequestByRequestId(request_id, id_project)
-  return requestService.closeRequestByRequestId(req.params.requestid, req.projectid).then(function(closedRequest) {
+  // closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by)
+  const closed_by = req.user.id;
+  return requestService.closeRequestByRequestId(req.params.requestid, req.projectid, false, true, closed_by).then(function(closedRequest) {
 
       winston.verbose("request closed", closedRequest);
 
@@ -518,6 +533,72 @@ router.delete('/:requestid/notes/:noteid',  function (req, res) {
 
 });
 
+
+
+
+
+
+router.post('/:requestid/followers', 
+[
+  check('member').notEmpty(),  
+],
+function (req, res) {
+  winston.info("followers add", req.body);
+  
+  const errors = validationResult(req);
+  if (!errors.isEmpty()) {
+    return res.status(422).json({ errors: errors.array() });
+  }
+  
+  //addParticipantByRequestId(request_id, id_project, member)
+  return requestService.addFollowerByRequestId(req.params.requestid, req.projectid, req.body.member ).then(function(updatedRequest) {
+
+      winston.verbose("participant added", updatedRequest);
+
+      return res.json(updatedRequest);
+  });
+  
+});
+
+
+router.put('/:requestid/followers', function (req, res) {
+  winston.debug("req.body", req.body);
+
+  var followers = [];
+  req.body.forEach(function(follower,index) {
+    followers.push(follower);
+  });
+  winston.debug("var followers", followers);
+  
+  // setFollowersByRequestId(request_id, id_project, newfollowers)
+  return requestService.setFollowersByRequestId(req.params.requestid, req.projectid, followers ).then(function(updatedRequest) {
+
+      winston.debug("followers set", updatedRequest);
+
+      return res.json(updatedRequest);
+  });
+  
+});
+
+router.delete('/:requestid/followers/:followerid', function (req, res) {
+  winston.debug(req.body);
+  
+   //removeFollowerByRequestId(request_id, id_project, member)
+  return requestService.removeFollowerByRequestId(req.params.requestid, req.projectid, req.params.followerid ).then(function(updatedRequest) {
+
+      winston.verbose("follower removed", updatedRequest);
+
+      return res.json(updatedRequest);
+  });
+  
+  
+});
+
+
+
+
+
+
 // TODO make a synchronous chat21 version (with query parameter?) with request.support_group.created
 router.delete('/:requestid',  function (req, res) {
   
@@ -589,6 +670,8 @@ router.delete('/id/:id',  function (req, res) {
 
 router.get('/', function (req, res, next) {
 
+  const startExecTime = new Date();
+
   winston.debug("req projectid", req.projectid);
   winston.debug("req.query.sort", req.query.sort);
   winston.debug('REQUEST ROUTE - QUERY ', req.query)
@@ -641,6 +724,10 @@ router.get('/', function (req, res, next) {
     winston.debug('REQUEST ROUTE - QUERY DEPT ID', query.department);
   }
 
+  if (req.query.requester_email) {
+    query["snapshot.lead.email"] = req.query.requester_email;
+  }
+
   if (req.query.full_text) {
     winston.debug('req.query.fulltext', req.query.full_text);
     query.$text = { "$search": req.query.full_text };
@@ -709,7 +796,8 @@ router.get('/', function (req, res, next) {
    *  THE SEARCH FOR DATE INTERVAL OF THE HISTORY OF REQUESTS ARE DISABLED AND 
    *  ARE DISPLAYED ONLY THE REQUESTS OF THE LAST 14 DAYS
    */
-  if ( history_search === true && req.project && req.project.profile && (req.project.profile.type === 'free' && req.project.trialExpired === true) || (req.project.profile.type === 'payment' && req.project.isActiveSubscription === false)) {
+                                                                        //fixato. secondo me qui manca un parentesi tonda per gli or
+  if ( history_search === true && req.project && req.project.profile && ((req.project.profile.type === 'free' && req.project.trialExpired === true) || (req.project.profile.type === 'payment' && req.project.isActiveSubscription === false))) {
 
 
     var startdate = moment().subtract(14, "days").format("YYYY-MM-DD");
@@ -813,7 +901,14 @@ router.get('/', function (req, res, next) {
   }
 
   if (req.query.channel) {
-    query["channel.name"] =  req.query.channel
+    if (req.query.channel === "offline") {
+      query["channel.name"] =  {"$in" : ["email", "form"]}
+    } else  if (req.query.channel === "online") {
+      query["channel.name"] =  {"$nin" : ["email", "form"]}
+    } else {
+      query["channel.name"] =  req.query.channel
+    }
+    
     winston.debug('REQUEST ROUTE - QUERY channel', query.channel);
   }
 
@@ -835,14 +930,17 @@ router.get('/', function (req, res, next) {
 
   winston.debug("sort query", sortQuery);
 
-  winston.verbose('REQUEST ROUTE - REQUEST FIND ', query);
+  winston.debug('REQUEST ROUTE - REQUEST FIND ', query);
 
   var projection = undefined;
 
   if (req.query.full_text) {  
-    winston.debug('fulltext projection'); 
 
-    projection = {score: { $meta: "textScore" } };
+    if (req.query.no_textscore!= "true" && req.query.no_textscore!= true) {
+      winston.info('fulltext projection on'); 
+      projection = {score: { $meta: "textScore" } };
+    } 
+    
   }
   // requestcachefarequi populaterequired
   var q1 = Request.find(query, projection).
@@ -874,7 +972,9 @@ router.get('/', function (req, res, next) {
 
     if (req.query.full_text) {     
       winston.debug('fulltext sort'); 
-      q1.sort( { score: { $meta: "textScore" } } ) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
+      if (req.query.no_textscore!= "true" && req.query.no_textscore!= true) {
+        q1.sort( { score: { $meta: "textScore" } } ) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
+      }
     } else {
       q1.sort(sortQuery);
     }
@@ -890,6 +990,11 @@ router.get('/', function (req, res, next) {
 
   var q2 =  Request.countDocuments(query).exec();
 
+  if (req.query.no_count && req.query.no_count =="true") {
+    winston.info('REQUEST ROUTE - no_count ');
+    q2 = 0;
+  }
+
   var promises = [
     q1,
     q2
@@ -901,7 +1006,12 @@ router.get('/', function (req, res, next) {
       count: results[1],
       requests: results[0]
     };
+    winston.debug('REQUEST ROUTE - objectToReturn ');
     winston.debug('REQUEST ROUTE - objectToReturn ', objectToReturn);
+
+    const endExecTime = new Date();
+    winston.verbose('REQUEST ROUTE - exec time:  ' + (endExecTime-startExecTime));
+
     return res.json(objectToReturn);
 
   }).catch(function(err){
@@ -1025,7 +1135,11 @@ router.get('/csv', function (req, res, next) {
   winston.debug("sort query", sortQuery);
 
 
+  // TODO ORDER BY SCORE
+  // return Faq.find(query,  {score: { $meta: "textScore" } }) 
+  // .sort( { score: { $meta: "textScore" } } ) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
 
+  // aggiungi filtro per data marco
 
   winston.debug('REQUEST ROUTE - REQUEST FIND ', query)
     return Request.find(query, '-transcript -status -__v').
@@ -1126,14 +1240,6 @@ router.get('/csv', function (req, res, next) {
 
           winston.debug('REQUEST ROUTE - REQUEST AS CSV', requests);
 
-        // return Request.count(query, function(err, totalRowCount) {
-
-          // var objectToReturn = {
-          //   perPage: limit,
-          //   count: totalRowCount,
-          //   requests : requests
-          // };
-          // console.log('REQUEST ROUTE - objectToReturn ', objectToReturn);
           return res.csv(requests, true);
         });
        

package/routes/subscription.js

@@ -0,0 +1,140 @@
+var express = require('express');
+var router = express.Router();
+var Subscription = require("../models/subscription");
+var SubscriptionLog = require("../models/subscriptionLog");
+var subscriptionEvent = require("../event/subscriptionEvent");
+var winston = require('../config/winston');
+
+//space
+
+router.post('/', function (req, res) {
+
+  winston.debug(req.body);
+  winston.debug("req.user", req.user);
+
+  var subscription = new Subscription({
+    target: req.body.target,
+    event: req.body.event,
+    id_project: req.projectid,
+    createdBy: req.user.id
+  });
+
+  subscription.save(function (err, subscriptionSaved) {
+    if (err) {
+      if (err.code === 11000) { //error for dupes
+        return Subscription.findOne({id_project:req.projectid, event: req.body.event}).select("+secret")
+                  .exec(function (err, subscriptionSaved) {
+          res.setHeader('x-hook-secret', subscriptionSaved.secret);
+          res.json(subscriptionSaved);
+        });
+      }    
+      winston.error('--- > ERROR ', err)
+      return res.status(500).send({ success: false, msg: 'Error saving object.' });
+    }
+    // http://resthooks.org/docs/security/
+
+    res.setHeader('x-hook-secret', subscriptionSaved.secret);
+
+    subscriptionEvent.emit('subscription.create', subscriptionSaved );
+    res.json(subscriptionSaved);
+  });
+});
+
+
+router.post('/test', function (req, res) {
+
+  winston.debug("test subscription body", req.body);
+  
+  res.json(req);
+});
+
+router.put('/:subscriptionid', function (req, res) {
+
+  winston.debug(req.body);
+
+  Subscription.findByIdAndUpdate(req.params.subscriptionid, req.body, { new: true, upsert: true }, function (err, subscriptionUpd) {
+    if (err) {
+      return res.status(500).send({ success: false, msg: 'Error updating object.' });
+    }
+    subscriptionEvent.emit('subscription.update', subscriptionUpd );
+    res.json(subscriptionUpd);
+  });
+});
+
+
+router.delete('/:subscriptionid', function (req, res) {
+
+  winston.debug(req.body);
+
+  Subscription.remove({ _id: req.params.subscriptionid }, function (err, subscriptionUpd) {
+    if (err) {
+      return res.status(500).send({ success: false, msg: 'Error deleting object.' });
+    }
+    subscriptionEvent.emit('subscription.delete', subscriptionUpd );
+    res.json(subscriptionUpd);
+  });
+});
+
+
+
+
+router.get('/', function (req, res) {
+
+  return Subscription.find({ "id_project": req.projectid }).
+    exec(function (err, subscriptions, next) {
+      if (err) {
+        winston.error('Subscription ROUTE - REQUEST FIND ERR ', err)
+        return next(err);
+      }
+
+        return res.json(subscriptions);
+      });
+  
+});
+
+router.get('/history', function (req, res) {
+
+  var limit = 40; // Number of leads per page
+  var page = 0;
+
+  if (req.query.page) {
+    page = req.query.page;
+  }
+
+  var skip = page * limit;
+  winston.debug('Subscription ROUTE - SKIP PAGE ', skip);
+
+
+  return SubscriptionLog.find({ "id_project": req.projectid }).
+    skip(skip).limit(limit)
+    .sort({createdAt: 'desc'}).
+    exec(function (err, subscriptions, next) {
+      if (err) {
+        winston.error('Subscription ROUTE - REQUEST FIND ERR ', err)
+        return next(err);
+      }
+
+        return res.json(subscriptions);
+      });
+  
+});
+
+
+router.get('/:subscriptionid', function (req, res) {
+
+  winston.debug(req.body);
+
+  Subscription.findById(req.params.subscriptionid, function (err, subscriptionUpd) {
+    if (err) {
+      return res.status(500).send({ success: false, msg: 'Error getting object.' });
+    }
+    if (!subscriptionUpd) {
+      return res.status(404).send({ success: false, msg: 'Object not found.' });
+    }
+    res.json(subscriptionUpd);
+  });
+});
+
+
+
+module.exports = router;

package/routes/tag.js

@@ -0,0 +1,138 @@
+var express = require('express');
+var router = express.Router();
+var TagLibrary = require("../models/tagLibrary");
+var winston = require('../config/winston');
+
+router.post('/', function (req, res) {
+
+  winston.debug(req.body);
+  winston.debug("req.user", req.user);
+
+  var newTag = new TagLibrary({
+    tag: req.body.tag,  
+    color: req.body.color,
+    id_project: req.projectid,
+    createdBy: req.user.id,
+    updatedBy: req.user.id
+  });
+
+  newTag.save(function (err, savedTag) {
+    if (err) {
+      // winston.error('--- > ERROR ', err)    
+      if (err.code === 11000) { //error for dupes
+          return TagLibrary.findOne({id_project:req.projectid, tag: req.body.tag },function (err, savedTag) {
+            res.json(savedTag);
+          });
+      }    
+      winston.error('--- > ERROR ', err)          
+      return res.status(500).send({ success: false, msg: 'Error saving object.' });
+    }
+
+    res.json(savedTag);
+  });
+});
+
+router.put('/:tagid', function (req, res) {
+  winston.debug(req.body);
+  var update = {};
+  
+
+  update.tag = req.body.tag;   
+  update.color = req.body.color;
+  
+  
+  TagLibrary.findByIdAndUpdate(req.params.tagid, update, { new: true, upsert: true }, function (err, updatedTag) {
+    if (err) {
+      winston.error('--- > ERROR ', err);
+      return res.status(500).send({ success: false, msg: 'Error updating object.' });
+    }
+
+  
+
+    // TagEvent.emit('Tag.update', updatedTag);
+    res.json(updatedTag);
+  });
+});
+
+router.delete('/:tagid', function (req, res) {
+  winston.debug(req.body);
+
+  TagLibrary.remove({ _id: req.params.tagid }, function (err, tag) {
+    if (err) {
+      winston.error('--- > ERROR ', err);
+      return res.status(500).send({ success: false, msg: 'Error deleting object.' });
+    }
+
+  
+    // TagEvent.emit('Tag.delete', Tag);
+
+    res.json(tag);
+  });
+});
+
+router.get('/:tagid', function (req, res) {
+  winston.debug(req.body);
+
+  TagLibrary.findById(req.params.tagid, function (err, tag) {
+    if (err) {
+      return res.status(500).send({ success: false, msg: 'Error getting object.' });
+    }
+    if (!tag) {
+      return res.status(404).send({ success: false, msg: 'Object not found.' });
+    }
+    res.json(tag);
+  });
+});
+
+router.get('/', function (req, res) {
+  var limit = 40; // Number of Tags per page
+  var page = 0;
+
+  if (req.query.page) {
+    page = req.query.page;
+  }
+
+  var skip = page * limit;
+  winston.debug('Tag ROUTE - SKIP PAGE ', skip);
+
+
+  var query = { "id_project": req.projectid};
+
+  // if (req.query.full_text) {
+  //   winston.debug('Tag ROUTE req.query.fulltext', req.query.full_text);
+  //   query.$text = { "$search": req.query.full_text };
+  // }
+
+
+  var direction = -1; //-1 descending , 1 ascending
+  if (req.query.direction) {
+    direction = req.query.direction;
+  }
+
+  var sortField = "createdAt";
+  if (req.query.sort) {
+    sortField = req.query.sort;
+  }
+
+  var sortQuery = {};
+  sortQuery[sortField] = direction;
+
+  winston.debug("sort query", sortQuery);
+
+  return TagLibrary.find(query).
+    skip(skip).limit(limit).
+    sort(sortQuery).
+    exec(function (err, tags) {
+      if (err) {
+        winston.error('Tag ROUTE - REQUEST FIND ERR ', err)
+        return (err);
+      }
+    
+        return res.json(tags);
+    });
+});
+
+
+
+
+module.exports = router;

package/routes/user-request.js

@@ -59,8 +59,9 @@ router.patch('/:requestid/rating', function (req, res) {
 router.put('/:requestid/closeg', function (req, res) {
   winston.debug(req.body);
   
-  // closeRequestByRequestId(request_id, id_project)
-  return requestService.closeRequestByRequestId(req.params.requestid, req.projectid).then(function(closedRequest) {
+    // closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by)
+    const closed_by = req.user.id;
+  return requestService.closeRequestByRequestId(req.params.requestid, req.projectid, false, true, closed_by).then(function(closedRequest) {
 
       winston.verbose("request closed", closedRequest);
 

package/routes/users.js

@@ -25,7 +25,7 @@ router.put('/', function (req, res) {
 
   User.findByIdAndUpdate(req.user.id, update, { new: true, upsert: true }, function (err, updatedUser) {
     if (err) {
-      winston.error(err);
+      winston.error("Error putting user",err);
       return res.status(500).send({ success: false, msg: err });
     }
 

package/routes/widget.js

@@ -96,6 +96,7 @@ router.get('/', function(req, res, next) {
       winston.debug("req.project:" + JSON.stringify(req.project));
       
       if (req.project) {
+                                    //secondo me qui manca un parentesi tonda per gli or
         if (req.project.profile && (req.project.profile.type === 'free' && req.project.trialExpired === true) || (req.project.profile.type === 'payment' && req.project.isActiveSubscription === false)) {
           query.default = true;
         }
@@ -129,10 +130,28 @@ router.get('/', function(req, res, next) {
             return reject({err: "Project Not Found"});        
           }
 
-          if (project && project.profile && (project.profile.type === 'free' && project.trialExpired === true) || (project.profile.type === 'payment' && project.isActiveSubscription === false)) {
+
+          winston.debug("project", project);
+
+          // ProjectSetter project not found with id: 62d8cf8b2b10b30013bb9b99
+          // Informazioni
+          // 2022-07-27 14:32:14.772 CESTerror: Error getting widget. {"err":"Project Not Found"}
+          // Informazioni
+          // 2022-07-27 14:32:14.778 CESTerror: uncaughtException: Cannot read property 'profile' of null
+          // Informazioni
+          // 2022-07-27 14:32:14.778 CESTTypeError: Cannot read property 'profile' of null at /usr/src/app/routes/widget.js:132:124 at /usr/src/app/node_modules/mongoose/lib/model.js:5074:18 at processTicksAndRejections (internal/process/task_queues.js:79:11) {"date":"Wed Jul 27 2022 12:32:14 GMT+0000 (Coordinated Universal Time)","error":{},"exception":true,"os":{"loadavg":[0.26,0.51,0.58],"uptime":1028128},"process":{"argv":["/usr/local/bin/node","/usr/src/app/bin/www"],"cwd":"/usr/src/app","execPath":"/usr/local/bin/node","gid":0,"memoryUsage":{"arrayBuffers":128833077,"external":130521753,"heapTotal":110641152,"heapUsed":85605912,"rss":310054912},"pid":26,"uid":0,"version":"v12.22.12"},"stack":"TypeError: Cannot read property 'profile' of null\n at /usr/src/app/routes/widget.js:132:124\n at /usr/src/app/node_modules/mongoose/lib/model.js:5074:18\n at processTicksAndRejections (internal/process/task_queues.js:79:11)","trace":[{"column":124,"file":"/usr/src/app/routes/widget.js","function":null,"line":132,"method":null,"native":false},{"column":18,"file":"/usr/src/app/node_modules/mongoose/lib/model.js","function":null,"line":5074,"method":null,"native":false},{"column":11,"file":"internal/process/task_queues.js","function":"processTicksAndRejections","line":79,"method":null,"native":false}]}
+
+          // console.log("project!=null",project!=null);
+          // console.log("project.profile",project.profile);
+                                              //secondo me qui manca un parentesi tonda per gli or
+          if (project  && project.profile && ((project.profile.type === 'free' && project.trialExpired === true) || (project.profile.type === 'payment' && project.isActiveSubscription === false))) {
             winston.debug('getProject remove poweredBy tag', project);
-            project.widget.poweredBy = undefined;
-            project.widget.baloonImage = undefined;            
+
+            if (project.widget) {
+              project.widget.poweredBy = undefined;
+              project.widget.baloonImage = undefined;            
+            }
+            
           }
 
         return resolve(project);
@@ -175,7 +194,65 @@ router.get('/', function(req, res, next) {
   
 
 
+  router.get('/ip', function(req, res, next) {
   
+     var xforwarded = req.headers['x-forwarded-for'];
+     winston.info('xforwarded'+ xforwarded);
+
+     var connectionRemoteAddress  = req.connection.remoteAddress;
+     winston.info('connectionRemoteAddress'+ connectionRemoteAddress);
+
+     var socketRemoteAddress = req.socket.remoteAddress;
+     winston.info('socketRemoteAddress'+ socketRemoteAddress);
+
+    if (req.connection.socket ) {
+      var connectionSocketRemoteAddress = req.connection.socket.remoteAddress;
+      winston.info('connectionSocketRemoteAddress'+ connectionSocketRemoteAddress);
+
+    }
+    
+
+    var ip = req.headers['x-forwarded-for'] || 
+     req.connection.remoteAddress || 
+     req.socket.remoteAddress ||
+     (req.connection.socket ? req.connection.socket.remoteAddress : null);
+    winston.info("ip:"+ ip);
+
+
+
+
+    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
+
+
+
+    // 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} );
+
+
+  });
 
   
 

package/routes/widgetLoader.js

@@ -12,9 +12,40 @@ router.get('/load', function(req, res) {
   winston.debug(query);
   // TODO chech if query is null
   res.redirect(widgetLocation+'?'+query);
+
 });
   
 
+router.get('/v5/:project_id', function(req, res) {
+
+  var project_id = req.params.project_id;
+  winston.debug("project_id: " + project_id);
+
+  res.type('.js');
+
+  var js = `
+    window.tiledeskSettings= 
+    {
+        projectid: "${project_id}"
+    };
+    (function(d, s, id) { 
+        var w=window; var d=document; var i=function(){i.c(arguments);};
+        i.q=[]; i.c=function(args){i.q.push(args);}; w.Tiledesk=i;                    
+        var js, fjs=d.getElementsByTagName(s)[0];
+        if (d.getElementById(id)) return;
+        js=d.createElement(s); 
+        js.id=id; js.async=true; js.src="${widgetLocation}/launch.js";
+        fjs.parentNode.insertBefore(js, fjs);
+    }(document,'script','tiledesk-jssdk'));
+  `;
+
+  winston.debug("js: " + js);
+
+  res.send(js);
+
+});
+
+
 var widgetTestLocation = process.env.WIDGET_TEST_LOCATION || widgetConfig.testLocation;
 
 router.get('/test/load', function(req, res) {