@tiledesk/tiledesk-server 2.1.40 → 2.2.3

package/routes/campaigns.js

@@ -1,9 +1,8 @@
 var express = require('express');
 var router = express.Router();
-var Lead = require("../models/lead");
-var LeadConstants = require("../models/leadConstants");
+var Group = require("../models/group");
+var User = require("../models/user");
 var winston = require('../config/winston');
-var leadService = require("../services/leadService");
 var requestService = require("../services/requestService");
 var messageService = require("../services/messageService");
 var MessageConstants = require("../models/messageConstants");
@@ -12,13 +11,6 @@ const uuidv4 = require('uuid/v4');
 
 
 
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@f21.it:123456 -d '{"text":"ciao"}' http://localhost:3000/5f897142c9e7ad9602a744c9/campaigns/
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@f21.it:123456 -d '{"text":"ciao", "leadid":"213213221"}' http://localhost:3000/5f897142c9e7ad9602a744c9/campaigns/
-
-
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@frontiere21.it:258456 -d '{"text":"ciao", "leadid":"5f8972c82db41c003473cb03"}' https://tiledesk-server-pre.herokuapp.com/5f86c201189063003453a045/campaigns/
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@frontiere21.it:258456 -d '{"text":"ciao", "leadid":"5f8972c82db41c003473cb03", "request_id":"group-123456789112233"}' https://tiledesk-server-pre.herokuapp.com/5f86c201189063003453a045/campaigns/
-
 
 // this endpoint supports support-group- or groups. this create a conversation for the sender (agent console)
 router.post('/', function (req, res) {
@@ -27,43 +19,143 @@ router.post('/', function (req, res) {
 
   winston.debug(req.body);
   winston.debug("req.user", req.user);
-  var request_id = req.body.request_id || 'support-group-'+uuidv4();
-  
+  var request_id = req.body.request_id || 'support-group-' + req.projectid + "-" + uuidv4();
+
+  // TODO cicla su segment
+
+
   // createWithIdAndRequester(request_id, project_user_id, lead_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status, createdBy, attributes, subject, preflight, channel) {
-  return requestService.createWithIdAndRequester(request_id, req.projectuser._id, req.body.leadid, req.projectid, 
-    req.body.text, req.body.departmentid, req.body.sourcePage, 
+
+  //TODO USE NEW requestService.create()
+  return requestService.createWithIdAndRequester(request_id, req.projectuser._id, req.body.leadid, req.projectid,
+    req.body.text, req.body.departmentid, req.body.sourcePage,
     req.body.language, req.body.userAgent, null, req.user._id, req.body.attributes, req.body.subject, true, req.body.channel).then(function (savedRequest) {
 
       winston.info("savedRequest", savedRequest);
 
       // create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language, channel_type) {
       return messageService.create(req.body.sender || req.user._id, req.body.senderFullname || req.user.fullName, savedRequest.request_id, req.body.text,
-        req.projectid, req.user._id, messageStatus, req.body.attributes, req.body.type, req.body.metadata,  req.body.language, MessageConstants.CHANNEL_TYPE.DIRECT, req.body.channel).then(function(savedMessage){                    
+        req.projectid, req.user._id, messageStatus, req.body.attributes, req.body.type, req.body.metadata, req.body.language, MessageConstants.CHANNEL_TYPE.DIRECT, req.body.channel).then(function (savedMessage) {
           res.json(savedMessage);
-       });
+        });
 
-  });
+    });
 });
 
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@frontiere21.it:258456 -d '{"text":"ciao", "recipient":"5f8972c82db41c003473cb03"}' https://tiledesk-server-pre.herokuapp.com/5f86c201189063003453a045/campaigns/direct
-router.post('/direct', function (req, res) {
+router.post('/direct', async function (req, res) {
 
   let messageStatus = req.body.status || MessageConstants.CHAT_MESSAGE_STATUS.SENDING;
 
   winston.debug(req.body);
   winston.debug("req.user", req.user);
+
+  var recipients = [];
+
+  var recipient = req.body.recipient;
+  if (recipient) {
+    recipients.push(recipient);
+  }
+
+  // TODO cicla su segment
+  var segment_id = req.body.segment_id;
+  if (segment_id) {
+
+  }
+
+  var group_id = req.body.group_id;
+  if (group_id) {
+    var group = await Group.findOne({ _id: group_id, id_project: req.projectid }).exec();
+    winston.info("group", group);
+
+    var recipients = group.members;
+    // winston.info("members", members);
+
+
+  }
+
+  winston.info("recipients", recipients);
+  winston.info("recipients.length: " + recipients.length);
+
+  let message = {
+    sender: req.body.sender || req.user._id, 
+    senderFullname: req.body.senderFullname || req.user.fullName, 
+    recipient: req.body.recipient, 
+    recipientFullname: req.body.recipientFullname,
+    text: req.body.text, 
+    id_project: req.projectid, // rendilo opzionale?
+    createdBy: req.user._id, 
+    status:  messageStatus,
+    attributes: req.body.attributes, 
+    type: req.body.type, 
+    metadata: req.body.metadata, 
+    language: req.body.language, 
+    channel_type: MessageConstants.CHANNEL_TYPE.DIRECT, 
+    channel: req.body.channel
+};
   
 
-  // create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language, channel_type) {
-  return messageService.create(req.body.sender || req.user._id, req.body.senderFullname || req.user.fullName, req.body.recipient, req.body.text,
-    req.projectid, req.user._id, messageStatus, req.body.attributes, req.body.type, req.body.metadata,  req.body.language, MessageConstants.CHANNEL_TYPE.DIRECT, req.body.channel).then(function(savedMessage){                    
-      res.json(savedMessage);
-    });
+  if (recipients.length == 0) {
+    // return res  XXX
+  }
+
+  if (recipients.length == 1) {
+    return messageService.save(message).then(function(savedMessage){                        
+        if (req.body.returnobject) {
+          return res.json(savedMessage);
+        } else {
+          return res.json({ success: true });
+        }
+
+      });
+  }
+
+
+  var promises = [];
+  for (const recipient of recipients) {
+  // recipients.forEach( async (recipient) => {
+
+    // create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language, channel_type) {
+    // var promise = messageService.create(req.body.sender || req.user._id, req.body.senderFullname || req.user.fullName, recipient, req.body.text,
+    //   req.projectid, req.user._id, messageStatus, req.body.attributes, req.body.type, req.body.metadata, req.body.language, MessageConstants.CHANNEL_TYPE.DIRECT, req.body.channel);
+
+    winston.info("recipient: " + recipient);
+
+    message.recipient = recipient;
+
+    var user = await User.findOne({_id:recipient}).exec();
+    winston.info("user", user);
+    
+    message.recipientFullname = user.fullName;
+
+    var promise = messageService.save(message);
+    promises.push(promise);
+    // .then(function(savedMessage){                    
+    // result.push(savedMessage);
+    // res.json(savedMessage);
+  }
+  //);
+
+  Promise.all(promises).then(function (data) {
+    if (req.body.returnobject) {
+      return res.json(data);
+    }
+  });
+
+  if (!req.body.returnobject) {
+    return res.json({ success: true });
+  }
+
+
+
 
-  
 });
 
 
 
 
+
+
+
+
+
 module.exports = router;

package/routes/department.js

@@ -230,14 +230,14 @@ router.get('/', function (req, res) {
 
   var query = { "id_project": req.projectid, "status": 1 };
   winston.debug('GET DEPTS FILTERED FOR STATUS === 1 req.projectid ', req.projectid);
-  if (req.project.profile) {
+  if (req.project && req.project.profile) {
     winston.debug('GET DEPTS FILTERED FOR STATUS === 1 req.project.profile.type ', req.project.profile.type);
   }
   winston.debug('GET DEPTS FILTERED FOR STATUS === 1 req.project.profile.type ',  req.project.trialExpired);
   winston.debug('GET DEPTS FILTERED FOR STATUS === 1 req.project.isActiveSubscription ',  req.project.isActiveSubscription);
   
 
-  if (req.project.profile && (req.project.profile.type === 'free' && req.project.trialExpired === true) || (req.project.profile.type === 'payment' && req.project.isActiveSubscription === false)) {
+  if (req.project && req.project.profile && (req.project.profile.type === 'free' && req.project.trialExpired === true) || (req.project.profile.type === 'payment' && req.project.isActiveSubscription === false)) {
 
     query.default = true;
   }

package/routes/faq.js

@@ -250,6 +250,24 @@ router.get('/', function (req, res, next) {
     query.id_faq_kb = req.query.id_faq_kb;
   }
 
+  var limit = 100; // Number of request per page
+
+  if (req.query.limit) {    
+    limit = parseInt(req.query.limit);
+    winston.debug('faq ROUTE - limit: '+limit);
+  }
+
+  var page = 0;
+
+  if (req.query.page) {
+    page = req.query.page;
+  }
+
+  var skip = page * limit;
+  winston.debug('faq ROUTE - SKIP PAGE ', skip);
+
+
+
   if (req.query.text) {
     winston.debug("GET FAQ req.projectid", req.projectid);
 
@@ -263,6 +281,7 @@ router.get('/', function (req, res, next) {
   // query.$text = {"$search": "question"};
 
   return Faq.find(query).
+  skip(skip).limit(limit).
   populate({path:'faq_kb'})//, match: { trashed: { $in: [null, false] } }}).
   .exec(function (err, faq) {
       winston.debug("GET FAQ ", faq);

package/routes/faq_kb.js

@@ -9,7 +9,8 @@ var winston = require('../config/winston');
 
 router.post('/', function (req, res) {
   // create(name, url, projectid, user_id, type, description) {
-  faqService.create(req.body.name, req.body.url, req.projectid, req.user.id, req.body.type, req.body.description).then(function(savedFaq_kb) {
+  faqService.create(req.body.name, req.body.url, req.projectid, req.user.id, req.body.type, req.body.description, undefined, undefined,
+    req.body.language).then(function(savedFaq_kb) {
     res.json(savedFaq_kb);
   });
 
@@ -58,8 +59,15 @@ router.post('/askbot', function (req, res) {
          }else {
           query = { "id_project": req.projectid, "id_faq_kb": req.body.id_faq_kb};
 
-          query.$text = {"$search": req.body.question};
-       
+          var search_obj = {"$search": req.body.question};
+
+          if (faq_kb.language) {
+              search_obj["$language"] = faq_kb.language;
+          }
+          query.$text = search_obj;
+          winston.debug("fulltext search query", query);  
+
+
           winston.debug('internal ft query: '+ query);
     
            Faq.find(query,  {score: { $meta: "textScore" } })  
@@ -67,7 +75,8 @@ router.post('/askbot', function (req, res) {
            .lean().               
             exec(function (err, faqs) {
               if (err) {
-                return res.status(500).send({ success: false, msg: 'Error getting object.' });
+                winston.error('Error getting object.', err);      
+                return res.status(500).send({ success: false, msg: 'Error getting fulltext object.' });
               }
     
                winston.debug("faqs", faqs);              

package/routes/faqpub.js

@@ -33,7 +33,7 @@ router.get('/', function (req, res, next) {
       winston.debug("GET FAQ ", faq);
 
       if (err) {
-        winston.debug('GET FAQ err ', err)
+        winston.error('GET FAQ err ', err)
         return next(err)
       };
       winston.debug('GET FAQ  ', faq)

package/routes/files.js

@@ -4,6 +4,7 @@ var passport = require('passport');
 require('../middleware/passport')(passport);
 var validtoken = require('../middleware/valid-token')
 var winston = require('../config/winston');
+var pathlib = require('path');
 
 
 var router = express.Router();
@@ -29,7 +30,7 @@ curl -u andrea.leo@f21.it:123456 \
   */
 
 router.post('/users', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], upload.single('file'), (req, res, next) => {
- 
+  winston.info("files/users")
       return res.status(201).json({
           message: 'File uploded successfully',
           filename: req.file.filename
@@ -42,10 +43,12 @@ curl \
   -F "file=@/Users/andrealeo/dev/chat21/tiledesk-server-dev-org/README.md" \
   http://localhost:3000/files/public/
 
+
+
   */
 
 router.post('/public', upload.single('file'), (req, res, next) => {
-  
+  winston.debug("files/public")
       return res.status(201).json({
           message: 'File uploded successfully',
           filename: req.file.filename
@@ -74,4 +77,16 @@ router.get("/", (req, res) => {
 });
 
 
+router.get("/download", (req, res) => {
+  winston.debug('path', req.query.path);
+  // if (path.indexOf("/users/"))
+  let filename = pathlib.basename(req.query.path);
+  winston.info("filename:"+filename);
+
+  res.attachment(filename);
+  fileService.getFileDataAsStream(req.query.path).pipe(res);
+});
+
+
+
 module.exports = router;

package/routes/images.js

@@ -23,7 +23,7 @@ const fileService = new FileGridFsService("images");
 
 
 const fileFilter = (req, file, cb) => {
-  if (file.mimetype == 'image/jpeg' || file.mimetype == 'image/png') {
+  if (file.mimetype == 'image/jpeg' || file.mimetype == 'image/png' || file.mimetype == 'image/vnd.microsoft.icon') {
       cb(null, true);
   } else {
       cb(null, false);

package/routes/jwt.js

@@ -7,7 +7,6 @@ var router = express.Router();
 var config = require('../config/database'); 
 var jwt = require('jsonwebtoken');
 var validtoken = require('../middleware/valid-token');
-// var secret = process.env.SECRET || config.secret;
 var requestUtil = require('../utils/requestUtil');
 var Project = require('../models/project');
 var winston = require('../config/winston');

package/routes/logs.js

@@ -0,0 +1,26 @@
+var express = require('express');
+var router = express.Router();
+var winston = require('../config/winston');
+
+
+
+router.get('/', function(req, res, next) {
+    winston.info("logs", req.body);
+    return res.status(200).send({ success: true});
+});
+
+
+router.post('/', function(req, res, next) {
+    winston.info("logs", req.body);
+    return res.status(200).send({ success: true});
+});
+
+  
+
+
+  
+
+  
+
+
+module.exports = router;

package/routes/message.js

@@ -130,6 +130,8 @@ async (req, res)  => {
               return leadService.createIfNotExistsWithLeadId(sender || req.user._id, fullname, email, req.projectid, null, req.body.attributes || req.user.attributes)
               .then(function(createdLead) {
 
+
+
               
                 var new_request = {                                     // problema
                   request_id: req.params.request_id, project_user_id: project_user._id, lead_id: createdLead._id, id_project:req.projectid,
@@ -137,7 +139,8 @@ async (req, res)  => {
                   language: req.body.language, userAgent:req.body.userAgent, status:null, createdBy: req.user._id,
                   attributes: req.body.attributes, subject: req.body.subject, preflight:undefined, channel: req.body.channel, location: req.body.location,
                   participants: req.body.participants,
-                  lead: createdLead, requester: project_user
+                  lead: createdLead, requester: project_user,
+                  priority: req.body.priority
                 };
   
                 return requestService.create(new_request).then(function (savedRequest) {
@@ -176,6 +179,7 @@ async (req, res)  => {
 
                             message.request = savedRequestPopulated;
 
+
                             return res.json(message);
                           });
                         });
@@ -205,6 +209,8 @@ async (req, res)  => {
                       return requestService.updateWaitingTimeByRequestId(request.request_id, request.id_project).then(function(upRequest) {
                           let message = savedMessage.toJSON();
                           message.request = upRequest;
+
+
                           return res.json(message);
                       });
                     }else {
@@ -279,7 +285,6 @@ async (req, res)  => {
 //     });
 //   });
 
-
   router.get('/:messageid', function(req, res) {
   
     console.log(req.body);

package/routes/messagesRoot.js

@@ -1,41 +1,98 @@
 var express = require('express');
 
 // https://stackoverflow.com/questions/28977253/express-router-undefined-params-with-router-use-when-split-across-files
-var router = express.Router();
+var router = express.Router({mergeParams: true});
 
 var MessageConstants = require("../models/messageConstants");
+var Message = require("../models/message");
 var messageService = require("../services/messageService");
 var winston = require('../config/winston');
+var fastCsv = require("fast-csv");
+var roleChecker = require('../middleware/has-role');
+const { check, validationResult } = require('express-validator');
 
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@frontiere21.it:258456td -d '{"senderFullname":"Bot","recipient":"USERID", "text":"ciao"}' https://tiledesk-server-pre.herokuapp.com/5f86c201189063003453a045/messages/
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@f21.it:123456 -d '{"senderFullname":"Bot","recipient":"USERID", "text":"ciao"}' http://localhost:3000/609e3fd8e049553972114b88/messages/
 
 router.post('/', 
+[
+  check('recipient').notEmpty(),  
+  check('recipientFullname').notEmpty(),
+  check('text').custom((value, { req }) => {
+    winston.debug('validation: '+ value + ' req.body.type ' + req.body.type);
+    if (!value && (!req.body.type || req.body.type === "text") ) {
+      winston.debug('validation1 ');
+      return Promise.reject('Text field is required for messages with type "text"');
+    }   
+    winston.debug('validation2 ');
+    return Promise.resolve('validation ok');
+  })
+],
   async (req, res)  => {
 
   winston.debug('req.body post message', req.body);
   winston.debug('req.params: ', req.params);
   winston.debug('req.params.request_id: ' + req.params.request_id);
 
-  let messageStatus = req.body.status || MessageConstants.CHAT_MESSAGE_STATUS.SENDING;
 
-  return messageService.create(req.body.sender || req.user._id, req.body.senderFullname || req.user.fullName, req.body.recipient, req.body.text,
-    req.projectid, req.user._id, messageStatus, req.body.attributes, req.body.type, req.body.metadata,  req.body.language, MessageConstants.CHANNEL_TYPE.DIRECT, req.body.channel).then(function(savedMessage){                    
+   const errors = validationResult(req);
+  if (!errors.isEmpty()) {
+    winston.error("Signup validation error", errors);
+    return res.status(422).json({ errors: errors.array() });
+  }
+  let message = {
+    sender: req.body.sender || req.user._id, 
+    senderFullname: req.body.senderFullname || req.user.fullName, 
+    recipient: req.body.recipient, 
+    recipientFullname: req.body.recipientFullname,
+    text: req.body.text, 
+    id_project: req.projectid, // rendilo opzionale?
+    createdBy: req.user._id, 
+    status:  MessageConstants.CHAT_MESSAGE_STATUS.SENDING, 
+    attributes: req.body.attributes, 
+    type: req.body.type, 
+    metadata: req.body.metadata, 
+    language: req.body.language, 
+    channel_type: req.body.channel_type || MessageConstants.CHANNEL_TYPE.DIRECT, 
+    channel: req.body.channel
+};
+  return messageService.save(message).then(function(savedMessage){                    
       res.json(savedMessage);
-    });
+    }).catch(function(err){                    
+      winston.error('Error saving message.', err);
+      return res.status(500).send({ success: false, msg: 'Error saving message.', err: err });
+    })
 
 });
 
 
-//TODO reenable it with role owner
-/*
-router.get('/csv', function(req, res) {
 
-  return Message.find({id_project: req.projectid}).sort({createdAt: 'asc'}).exec(function(err, messages) { 
-      if (err) return next(err);
-      res.csv(messages, true);
-    });
+router.get('/csv', roleChecker.hasRoleOrTypes('owner'), function(req, res) {
+
+
+  const cursor = Message.find({id_project: req.projectid}).select("-channel -attributes -metadata");
+
+  const transformer = (doc)=> {
+    return {
+        Id: doc._id,
+        Name: doc.fullname,
+        Email: doc.email,
+        Type: doc.registration_type,
+        RegisterOn: doc.registered_on
+    };
+  }
+
+  const filename = 'export.csv';
+
+  res.setHeader('Content-disposition', `attachment; filename=${filename}`);
+  res.writeHead(200, { 'Content-Type': 'text/csv' });
+
+  res.flushHeaders();
+
+  console.log("fastCsv",fastCsv)
+  var csvStream = fastCsv.format({headers: true})//.transform(transformer)
+  // var csvStream = fastCsv.createWriteStream({headers: true}).transform(transformer)
+  cursor.stream().pipe(csvStream).pipe(res);
+
 });
-*/
 
-module.exports = router;
+
+module.exports = router;

package/routes/project_user.js

@@ -112,7 +112,7 @@ router.post('/invite', [passport.authenticate(['basic', 'jwt'], { session: false
                   // if ('5ae6c62c61c7d54bf119ac73' == '5ae6c62c61c7d54bf119ac73') {
 
                     winston.debug('»»»» THE PRJCT-USER ID ', p_user.id_user, ' MATCHES THE FOUND USER-ID', user._id)
-                    winston.debug('»»»» USER IS ALREADY A MEMBER OF THE PROJECT ')
+                    winston.warn("User " + projectUserId+ " is already a member of the project: " + req.projectid)
 
                   // cannot use continue or break inside a JavaScript Array.prototype.forEach loop. However, there are other options:
                   throw new Error('User is already a member'); // break
@@ -359,6 +359,37 @@ router.get('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
 });
 
 
+router.get('/users/search', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], async (req, res, next) => {
+  winston.info("--> users search  ");
+
+  if (!req.project) {
+    return res.status(404).send({ success: false, msg: 'Project not found.' });
+  }
+
+
+  let query =  {email: req.query.email};
+  
+  winston.info('query: ', query);
+  
+  let user = await User.findOne(query).exec();
+  winston.info('user: ', user);
+  
+  if (!user) {
+    return res.status(404).send({ success: false, msg: 'Object not found.' });
+  }
+ 
+
+  let project_user = await Project_user.findOne({id_user: user._id, id_project: req.projectid}).exec();
+  winston.info('project_user: ', project_user);
+  
+  if (!project_user) {
+    return res.status(403).json({msg: "Unauthorized. This is not a your teammate." });
+  }
+  
+
+  return res.json({_id: user._id});
+
+});
 
 /**
  * GET PROJECT-USER BY PROJECT ID AND CURRENT USER ID 
@@ -368,6 +399,10 @@ router.get('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
 router.get('/users/:user_id', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], function (req, res, next) {
   winston.debug("--> users USER ID ", req.params.user_id);
 
+  if (!req.project) {
+    return res.status(404).send({ success: false, msg: 'Project not found.' });
+  }
+
   var isObjectId = mongoose.Types.ObjectId.isValid(req.params.user_id);
   winston.debug("isObjectId:"+ isObjectId);