@tiledesk/tiledesk-server 2.3.17 → 2.3.18

package/channels/chat21/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-chat21-app",
   "description": "The Tiledesk Chat21 module",
-  "version": "1.1.4",
+  "version": "1.1.7",
   "private": false,
   "author": "Andrea Leo - Frontiere21 SRL",
   "license": "AGPL-3.0",
@@ -11,7 +11,7 @@
     "url": "https://github.com/Tiledesk/tiledesk-server"
   },
   "dependencies": {
-    "@chat21/chat21-node-sdk": "^1.1.4",
+    "@chat21/chat21-node-sdk": "^1.1.7",
     "winston": "^3.3.3",
     "firebase-admin": "^9.5.0"
   },

package/models/project_user.js

@@ -37,6 +37,9 @@ var TagSchema = require("../models/tag");
       index: true
       // required: true
     },
+    profileStatus: {
+      type: String,
+    },
     presence: PresenceSchema,
     attributes: {
       type: Object,
@@ -108,5 +111,6 @@ Project_userSchema.virtual('isAuthenticated').get(function () {
   // Project_user.find({ id_project: projectid, id_user: { $in : group[0].members}, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.AGENT]} })
   Project_userSchema.index({ id_project: 1, id_user:1, role: 1 }); 
 
+ 
   module.exports = mongoose.model('project_user', Project_userSchema);;
 

package/models/request.js

@@ -273,7 +273,16 @@ var RequestSchema = new Schema({
     required: true,
     index: true
   },
-
+  smartAssignment: {
+    type: Boolean,
+    default: true,
+    index: true
+  },
+  workingStatus: { //new, pending
+    type: String,
+    required: false,
+    index: true
+  },
   createdBy: {
     type: String,
     required: true
@@ -465,6 +474,8 @@ RequestSchema.index({ id_project: 1, createdAt: 1, preflight: 1});
 RequestSchema.index({ hasBot: 1, status: 1, createdAt: 1});
 
 
+
+
 //   cannot index parallel arrays [agents] [participants] {"driv
 // RequestSchema.index({ id_project: 1, status: 1, preflight:1, participants:1, "agents.id_user":1, updatedAt: -1 }); //NN LO APPLICA
  

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -40,11 +40,11 @@
     "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"
   },
   "dependencies": {
-    "@tiledesk/tiledesk-chat21-app": "^1.1.4",
+    "@tiledesk/tiledesk-chat21-app": "^1.1.7",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.4",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.20.0",

package/pubmodules/activities/activityArchiver.js

@@ -275,7 +275,7 @@ class ActivityArchiver {
           setImmediate(() => {           
        
               try {
-                winston.error('ActivityArchiver close');
+                winston.debug('ActivityArchiver close');
                
                 var activity = new Activity({actor: {type:"user", id: request.closed_by}, 
                 verb: "REQUEST_CLOSE", actionObj: request, 

package/pubmodules/activities/routes/activity.js

@@ -154,7 +154,7 @@ router.get('/', function (req, res) {
         return (err);
       }
 
-      return Activity.count(query, function (err, totalRowCount) {
+      return Activity.countDocuments(query, function (err, totalRowCount) {
         if (err) {
           winston.error('Activity ROUTE - REQUEST FIND ERR ', err)
           return (err);

package/pubmodules/canned/cannedResponse.js

@@ -14,6 +14,10 @@ var CannedResponseSchema = new Schema({
     type: String,
     required: true,
   },
+  shared: {
+    type: Boolean,
+    required: true
+  },
   attributes: {
     type: Object,
   },

package/pubmodules/canned/cannedResponseRoute.js

@@ -12,12 +12,18 @@ router.post('/', function (req, res) {
 
   var newCannedResponse = new CannedResponse({
     title: req.body.title,  
-    text: req.body.text,  
+    text: req.body.text,
     id_project: req.projectid,
     createdBy: req.user.id,
     updatedBy: req.user.id
   });
 
+  if (req.projectuser.role == 'owner' || req.projectuser.role == 'admin') {
+    newCannedResponse.shared = true;
+  } else {
+    newCannedResponse.shared = false;
+  }
+
   newCannedResponse.save(function (err, savedCannedResponse) {
     if (err) {
       winston.error('--- > ERROR ', err)
@@ -104,7 +110,7 @@ router.get('/:cannedResponseid', function (req, res) {
 });
 
 router.get('/', function (req, res) {
-  var limit = 40; // Number of CannedResponses per page
+  var limit = 1000; // Number of CannedResponses per page
   var page = 0;
 
   if (req.query.page) {
@@ -114,15 +120,15 @@ router.get('/', function (req, res) {
   var skip = page * limit;
   winston.debug('CannedResponse ROUTE - SKIP PAGE ', skip);
 
-
-  var query = { "id_project": req.projectid, "status": {$lt:1000}};
+  // var query = { "id_project": req.projectid, "status": {$lt:1000}};
+  console.log("canned_req.user: ", req.user);
+  var query = {"id_project": req.projectid, "status": { $lt:1000 }, $or:[ { shared: true }, { createdBy: req.user._id } ] }
 
   if (req.query.full_text) {
     winston.debug('CannedResponse 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;

package/pubmodules/emailNotification/requestNotification.js

@@ -31,11 +31,25 @@ winston.debug('********* RequestNotification apiUrl: ' + apiUrl);
 
 class RequestNotification {
 
+  constructor() {
+    this.enabled = true;
+    if (process.env.EMAIL_NOTIFICATION_ENABLED=="false" || process.env.EMAIL_NOTIFICATION_ENABLED==false) {
+        this.enabled = false;
+    }
+    winston.debug("RequestNotification this.enabled: "+ this.enabled);
+}
 
 listen() {
-    var that = this;
+    var that = this; 
     
 
+      
+    if (this.enabled==true) {
+      winston.info("RequestNotification listener started");
+    } else {
+        return winston.info("RequestNotification listener disabled");
+    }
+
 
     var messageCreateKey = 'message.create';
     if (messageEvent.queueEnabled) {
@@ -813,7 +827,12 @@ sendAgentEmail(projectid, savedRequest) {
     // send email
     try {
    
-   
+  //  console.log("sendAgentEmail")
+    if (savedRequest.preflight === true) {   //only for channel email and form preflight is false otherwise request.participants.update is used i think?
+      winston.debug("preflight request sendAgentEmail disabled")
+      return 0;
+    }
+
     Project.findOne({_id: projectid, status: 100}).select("+settings").exec( async function(err, project){
        if (err) {
          return winston.error(err);
@@ -834,6 +853,8 @@ sendAgentEmail(projectid, savedRequest) {
               // TODO fare il controllo anche sul dipartimento con modalità assigned o pooled
                  if (savedRequest.status==RequestConstants.UNASSIGNED) { //POOLED
 
+                  winston.debug("savedRequest.status==RequestConstants.UNASSIGNED");        
+
                   if (project.settings && project.settings.email && project.settings.email.notification && project.settings.email.notification.conversation && project.settings.email.notification.conversation.pooled == false ) {
                     return winston.info("RequestNotification email notification for the project with id : " + projectid + " for the pooled conversation is disabled");
                   }
@@ -906,6 +927,8 @@ sendAgentEmail(projectid, savedRequest) {
                    // TODO fare il controllo anche sul dipartimento con modalità assigned o pooled
                    else if (savedRequest.status==RequestConstants.ASSIGNED) { //ASSIGNED
 
+                    winston.debug("savedRequest.status==RequestConstants.ASSIGNED");        
+
                     if (project.settings && project.settings.email && project.settings.email.notification && project.settings.email.notification.conversation && project.settings.email.notification.conversation.assigned == false ) {
                       return winston.verbose("RequestNotification email notification for the project with id : " + projectid + " for the assigned conversation is disabled");
                     }

package/pubmodules/events/eventRoute.js

@@ -2,7 +2,6 @@ var express = require('express');
 var router = express.Router({mergeParams: true});
 var Event = require("./event");
 var winston = require('../../config/winston');
-const eventEvent = require('./eventEvent');
 var validtoken = require('../../middleware/valid-token');
 const eventService = require('./eventService');
 const { check, validationResult } = require('express-validator');
@@ -10,6 +9,9 @@ var passport = require('passport');
 require('../../middleware/passport')(passport);
 var roleChecker = require('../../middleware/has-role');
 
+const messageEvent = require('../../event/messageEvent');
+
+
 router.post('/', [
   passport.authenticate(['basic', 'jwt'], 
   { session: false }), 
@@ -37,13 +39,41 @@ router.post('/', [
       pu = req.projectuser.id
     }   
     
+    console.log("************* emit event"+new Date().toISOString());
+
+    // // message.senderFullname,     message.recipient, 
+    //             // message.recipient_fullname, message.text, message.sender, attributes, message.type, message.metadata, timestamp, message.group
+    // var recipient = req.body.attributes.request_id;
+    // console.log("recipient",recipient);
+    // var sender = req.user.id;
+    // console.log("sender",sender);
+
+    // messageEvent.emit("message.test", 
+    // {
+    //   recipient: recipient,
+    //   recipient_fullname: "pluto",
+    //   // sender:"bb0d809b-b093-419b-8b48-11a192cc3619",
+    //   sender: sender,
+    //   senderFullname: "Tiledesk",
+    //   text:"welcome",
+    //   group: {
+    //     members: {
+    //       // "bb0d809b-b093-419b-8b48-11a192cc3619": 1,
+    //       sender: 1
+          
+    //     }
+    //   }
+    // }
+    // );
+
     // emit(name, attributes, id_project, project_user, createdBy, status, user) {
     eventService.emit(req.body.name, req.body.attributes, req.projectid, pu, req.user.id, undefined, req.user).then(function(event) {
-    res.json(event);
-  }).catch(function(err) {
-    winston.error('Error saving the event '+ JSON.stringify(event), err)
-    return res.status(500).send({success: false, msg: 'Error saving the event '+ JSON.stringify(event)});
-  });
+
+      res.json(event);
+    }).catch(function(err) {
+      winston.error('Error saving the event '+ JSON.stringify(event), err)
+      return res.status(500).send({success: false, msg: 'Error saving the event '+ JSON.stringify(event)});
+    });
 
   // var newEvent = new Event({
   //   name: req.body.name,
@@ -137,7 +167,7 @@ router.get('/',   [passport.authenticate(['basic', 'jwt'],
       }
 
       //  collection.count is deprecated, and will be removed in a future version. Use Collection.countDocuments or Collection.estimatedDocumentCount instead
-      return Event.count(query, function (err, totalRowCount) {
+      return Event.countDocuments(query, function (err, totalRowCount) {
 
         var objectToReturn = {
           perPage: limit,

package/pubmodules/trigger/start.js

@@ -102,9 +102,13 @@ projectEvent.on('project.create', async (project) => {
 */
 
         
-        winston.info("triggers created for new project");
+        winston.debug("triggers created for new project");
 
 
+
+
+        // cc
+
     });
 });
 

package/routes/auth.js

@@ -112,13 +112,18 @@ function (req, res) {
     winston.error("SigninAnonymously validation error", {errors: errors, reqBody: req.body, reqUrl: req.url });
     return res.status(422).json({ errors: errors.array() });
   }
-  var firstname = req.body.firstname || "Guest";
+
+  let uid = uuidv4();
+  let shortuid = uid.substring(0,4); 
+  var firstname = req.body.firstname || "guest#"+shortuid; // guest_here
+  // var firstname = req.body.firstname || "Guest"; // guest_here
+  
   
 
   //TODO togli trattini da uuidv4()
   
 // TODO remove email.sec?
-  let userAnonym = {_id: uuidv4(), firstname:firstname, lastname: req.body.lastname, email: req.body.email, attributes: req.body.attributes};
+  let userAnonym = {_id: uid, firstname:firstname, lastname: req.body.lastname, email: req.body.email, attributes: req.body.attributes};
 
   req.user = UserUtil.decorateUser(userAnonym);
 

package/routes/project_user.js

@@ -220,6 +220,10 @@ router.put('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
   if (req.body.user_available!=undefined) {
     update.user_available = req.body.user_available;
   }
+
+  if (req.body.profileStatus!=undefined) {
+    update.profileStatus = req.body.profileStatus;
+  }
   
   if (req.body.max_assigned_chat!=undefined) {
     update.max_assigned_chat = req.body.max_assigned_chat;
@@ -241,6 +245,7 @@ router.put('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
 
 
 
+
   Project_user.findByIdAndUpdate(req.projectuser.id, update,  { new: true, upsert: true }, function (err, updatedProject_user) {
     if (err) {
       winston.error("Error gettting project_user for update", err);
@@ -274,6 +279,10 @@ router.put('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
     update.user_available = req.body.user_available;
   }
 
+  if (req.body.profileStatus!=undefined) {
+    update.profileStatus = req.body.profileStatus;
+  }
+  
   if (req.body.max_assigned_chat!=undefined) {
     update.max_assigned_chat = req.body.max_assigned_chat;
   }

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);
 
@@ -710,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 };

package/services/geoService.js

@@ -8,6 +8,13 @@ var geoip = require('geoip-lite');
 
 class GeoService {
 
+    constructor() {
+        this.enabled = true;
+        if (process.env.GEO_SERVICE_ENABLED=="false" || process.env.GEO_SERVICE_ENABLED==false) {
+            this.enabled = false;
+        }
+        winston.debug("GeoService this.enabled: "+ this.enabled);
+    }
 
 
   // https://medium.com/@rossbulat/node-js-client-ip-location-with-geoip-lite-fallback-c25833c94a76
@@ -16,7 +23,12 @@ class GeoService {
 
   listen() {
     
-    winston.info("GeoService listener started");
+    if (this.enabled==true) {
+        winston.info("GeoService listener started");
+    } else {
+        return winston.info("GeoService listener disabled");
+    }
+    
 
 
  
@@ -36,9 +48,19 @@ class GeoService {
   //     area: 200 }
 
 
-  requestEvent.on('request.create', function(request) {
 
-    winston.debug("request", request.toObject());
+  var requestCreateKey = 'request.create';
+//   if (requestEvent.queueEnabled) {
+//     requestCreateKey = 'request.create.queue';
+//   }
+//   winston.debug('GeoService requestCreateKey: ' + requestCreateKey);
+
+
+  requestEvent.on(requestCreateKey, function(request) {
+
+    setImmediate(() => { 
+
+    winston.debug("request", request);
 
     var ip = (request.location && request.location.ipAddress) || (request.attributes && request.attributes.ipAddress);
     winston.debug("ip" + ip);
@@ -114,11 +136,15 @@ class GeoService {
                 }
                 return winston.verbose("Saved location metadata for request with id " + request._id);
             }); 
+
+            //TODO AGGIORNA ANCHE LEAD e req.snapshot.lead?
+            // leggi ip da request e nn da attributes
                
         }
     }
     });
-  }
+    });
+}
 
 
 }

package/template/email/pooledRequest.html

@@ -82,7 +82,7 @@
 
             <div style="text-align:center">
               <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:10%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd">
+                <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
               </a>
             </div>
             </tr>

package/test/cannedRoute.js

@@ -0,0 +1,166 @@
+//During the test the env variable is set to test
+process.env.NODE_ENV = 'test';
+
+//Require the dev-dependencies
+let chai = require('chai');
+let expect = require('chai').expect;
+
+let chaiHttp = require('chai-http');
+let server = require('../app');
+const projectService = require('../services/projectService');
+const userService = require('../services/userService');
+var RoleConstants = require("../models/roleConstants");
+const Project_user = require('../models/project_user');
+let should = chai.should();
+
+
+
+chai.use(chaiHttp);
+
+describe('CannedRoute', () => {
+
+    it('new canned by owner/admin', (done) => {
+        var email = "test-signup-" + Date.now() + "@email.com";
+        var pwd = "pwd";
+
+        userService.signup(email, pwd, "Test Firstname", "Test Lastname").then(savedUser => {
+            projectService.create("test1", savedUser._id).then(savedProject => {
+
+                chai.request(server)
+                    .post('/' + savedProject._id + '/canned/')
+                    .auth(email, pwd)
+                    .set('content-type', 'application/json')
+                    .send({ "title": "Test Title", "text": "Test Text" })
+                    .end((err, res) => {
+                        console.log("res.body", res.body);
+                        res.should.have.status(200);
+                        res.body.should.be.a('object');
+                        res.body.should.have.property('title').eql("Test Title");
+                        res.body.should.have.property('text').eql("Test Text");
+                        res.body.should.have.property('createdBy').eql(savedUser._id.toString());
+                        res.body.should.have.property('shared').eql(true);
+
+                        done();
+                    })
+            })
+        })
+    })
+
+    it('new canned by agent', (done) => {
+        var email = "test-signup-" + Date.now() + "@email.com";
+        var pwd = "pwd";
+
+        userService.signup(email, pwd, "Test Firstname", "Test Lastname").then(savedUser => {
+            projectService.create("test1", savedUser._id).then(savedProject => {
+
+                console.log("RoleConstants.AGENT: ", RoleConstants.AGENT);
+                Project_user.findOneAndUpdate({id_project: savedProject._id, id_user: savedUser._id }, { role: RoleConstants.AGENT }, function(err, savedProject_user){
+                    chai.request(server)
+                    .post('/' + savedProject._id + '/canned/')
+                    .auth(email, pwd)
+                    .set('content-type', 'application/json')
+                    .send({ title: "Test Title", text: "Test Text" })
+                    .end((err, res) => {
+                        console.log("res.body", res.body);
+                        res.body.should.be.a('object');
+                        res.body.should.have.property('title').eql("Test Title");
+                        res.body.should.have.property('text').eql("Test Text");
+                        res.body.should.have.property('createdBy').eql(savedUser._id.toString());
+                        res.body.should.have.property('shared').eql(false);
+
+                        done();
+                    })  
+                })
+            })
+        })
+    })
+
+    it('get canned', (done) => {
+
+        var email_owner = "owner-signup-" + Date.now() + "@email.com";
+        var email_agent = "agent-signup-" + Date.now() + "@email.com";
+        var pwd = "pwd";
+
+        userService.signup(email_owner, pwd, "Owner Firstname", "Owner Lastname").then(savedOwner => {
+            userService.signup(email_agent, pwd, "Agent Firstname", "Agent Lastname").then(savedAgent => {
+                projectService.create("test1", savedOwner._id).then(savedProject => {
+                    
+                    // invite Agent on savedProject (?)
+                    chai.request(server)
+                        .post('/' + savedProject._id + "/project_users/invite")
+                        .auth(email_owner, pwd)
+                        .set('content-type', 'application/json')
+                        .send({ email: email_agent, role: "agent", userAvailable: false })
+                        .end((err, res) => {
+                            console.log("res.boy", res.body)
+                            res.should.have.status(200);
+
+
+                            chai.request(server)
+                                .post('/' + savedProject._id + "/canned/")
+                                .auth(email_owner, pwd)
+                                .set('content-type', 'application/json')
+                                .send({ title: "Test1 Title", text: "Test1 Text" })
+                                .end((err, res) => {
+
+                                    console.log("res.body", res.body);
+                                    res.should.have.status(200);
+                                    res.body.should.be.a('object');
+
+                                    chai.request(server)
+                                        .post('/' + savedProject._id + "/canned/")
+                                        .auth(email_agent, pwd)
+                                        .set('content-type', 'application/json')
+                                        .send({ title: "Test2 Title", text: "Test2 Text" })
+                                        .end((err, res) => {
+                                            
+                                            console.log("res.body",  res.body);
+                                            res.should.have.status(200);
+                                            res.body.should.be.a('object');
+
+                                            chai.request(server)
+                                                .get('/' + savedProject._id + "/canned/")
+                                                .auth(email_owner, pwd)
+                                                .set('content-type', 'application-json')
+                                                .send()
+                                                .end((err, res) => {
+
+                                                    console.log("res.body",  res.body);
+                                                    res.should.have.status(200);
+                                                    //res.body.should.be.a('array');
+                                                    
+                                                    expect(res.body).to.be.an('array')
+                                                    expect(res.body.length).to.equal(1);
+
+                                                    chai.request(server)
+                                                        .get('/' + savedProject._id + "/canned/")
+                                                        .auth(email_agent, pwd)
+                                                        .set('content-type', 'application-json')
+                                                        .send()
+                                                        .end((err, res) => {
+
+                                                        console.log("res.body",  res.body);
+                                                        console.log("\n --> body.length", res.body.length);
+                                                        res.should.have.status(200);
+                                                        //res.body.should.be.a('array');
+                                                        
+                                                        expect(res.body).to.be.an('array')
+                                                        expect(res.body.length).to.equal(2);
+
+                                                        done();
+                                                    
+                                                        })
+
+
+                                                })
+
+                                                
+                                        })
+
+                                })
+                        })
+                })
+            })
+        })
+    }).timeout(5000);
+})