@tiledesk/tiledesk-server 2.3.17 → 2.3.19

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/services/modulesManager.js

@@ -24,6 +24,7 @@ var licenseKey = process.env.LICENSE_KEY;
 if (licenseKey) {
     var maskedLicenseKey = MaskData.maskPhone(licenseKey, maskOptions);
     winston.info("LicenseKey: " + maskedLicenseKey);    
+    // winston.info("LicenseKey: " + licenseKey);    
 }
 
 class ModulesManager {
@@ -38,8 +39,8 @@ class ModulesManager {
         this.dialogflowListener = undefined;
         this.requestHistoryArchiver = undefined;
         this.requestHistoryRoute = undefined;
-        this.routingQueue = undefined;
-        this.queue = undefined;
+        // this.routingQueue = undefined;
+        // this.queue = undefined;
         this.cache = undefined;
         this.visitorCounterRoute = undefined;
         this.visitorCounterMiddleware = undefined;
@@ -216,34 +217,34 @@ class ModulesManager {
         }
 
 
-        try {
-            this.routingQueue = require('@tiledesk-ent/tiledesk-server-routing-queue').listener;
-            // this.routingQueue.listen();
-            winston.debug("this.routingQueue:"+ this.routingQueue);           
+        // try {
+        //     this.routingQueue = require('@tiledesk-ent/tiledesk-server-routing-queue').listener;
+        //     // this.routingQueue.listen();
+        //     winston.debug("this.routingQueue:"+ this.routingQueue);           
 
-            winston.info("ModulesManager routing queue initialized");
-        } catch(err) {
-            if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init routing queue module not found");
-            }else {
-                winston.error("ModulesManager error initializing init routing queue module", err);
-            }
-        }
+        //     winston.info("ModulesManager routing queue initialized");
+        // } catch(err) {
+        //     if (err.code == 'MODULE_NOT_FOUND') {
+        //         winston.info("ModulesManager init routing queue module not found");
+        //     }else {
+        //         winston.error("ModulesManager error initializing init routing queue module", err);
+        //     }
+        // }
 
 
 
-        try {
-            this.queue = require('@tiledesk-ent/tiledesk-server-queue');            
-            winston.debug("this.queue:"+ this.queue);           
+        // try {
+        //     this.queue = require('@tiledesk-ent/tiledesk-server-queue');            
+        //     winston.debug("this.queue:"+ this.queue);           
 
-            winston.info("ModulesManager queue initialized");
-        } catch(err) {
-            if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init queue module not found");
-            }else {
-                winston.error("ModulesManager error initializing init queue module", err);
-            }
-        }
+        //     winston.info("ModulesManager queue initialized");
+        // } catch(err) {
+        //     if (err.code == 'MODULE_NOT_FOUND') {
+        //         winston.info("ModulesManager init queue module not found");
+        //     }else {
+        //         winston.error("ModulesManager error initializing init queue module", err);
+        //     }
+        // }
 
 
         try {            
@@ -329,14 +330,14 @@ class ModulesManager {
                 winston.info("ModulesManager error starting requestHistoryArchiver module", err);            
             }
         }
-        if (this.routingQueue) {
-            try {
-                this.routingQueue.listen();
-                winston.info("ModulesManager routingQueue started");
-            } catch(err) {        
-                winston.info("ModulesManager error starting routingQueue module", err);            
-            }
-        }
+        // if (this.routingQueue) {
+        //     try {
+        //         this.routingQueue.listen();
+        //         winston.info("ModulesManager routingQueue started");
+        //     } catch(err) {        
+        //         winston.info("ModulesManager error starting routingQueue module", err);            
+        //     }
+        // }
         if (this.dialogflowListener) {
             try {
                 this.dialogflowListener.listen();

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);
+})

package/websocket/webSocketServer.js

@@ -169,8 +169,18 @@ class WebSocketServer {
           
             winston.debug(' req.user._id: '+ req.user);
 
+            if (!topic) {
+                winston.error('WebSocket - Error getting  topic. Topic can t be null');  
+                return reject('WebSocket - Error getting  topic. Topic can t be null');
+            }
             var urlSub = topic.split('/');  
 
+            if (!urlSub || (urlSub && urlSub.length==0)) { 
+              winston.error('WebSocket - Error getting  topic. Topic is not properly configured');  
+              return reject('WebSocket - Error getting  topic. Topic is not properly configured');
+          }
+            // Error getting Project Cast to ObjectId failed for value "N7VJlLZ1" (type string) at path "_id" for model "project" {"kind":"ObjectId","path":"_id","reason":{},"stack":"CastError: Cast to ObjectId failed for value \"N7VJlLZ1\" (type string) at path \"_id\" for model \"project\"\n at model.Query.exec (/usr/src/app/node_modules/mongoose/lib/query.js:4498:21)\n at /usr/src/app/websocket/webSocketServer.js:180:14\n at new Promise (<anonymous>)\n at Object.onSubscribeCallback [as onSubscribe] (/usr/src/app/websocket/webSocketServer.js:167:14)\n at PubSub.handleReceivedClientMessage (/usr/src/app/websocket/pubsub.js:358:57)\n at runMicrotasks (<anonymous>)\n at processTicksAndRejections (internal/process/task_queues.js:97:5)","stringValue":"\"N7VJlLZ1\"","value":"N7VJlLZ1","valueType":"string"}
+
             var projectId = urlSub[1];
             winston.debug('projectId: '+projectId);
 
@@ -590,11 +600,12 @@ class WebSocketServer {
     winston.debug('messageCreateKey: ' + messageCreateKey);
 
     messageEvent.on(messageCreateKey, function (message) {
+      setImmediate(async () => {
       winston.debug('messageEvent websocket server: '+messageCreateKey, message);
         if (message.request) {
           pubSubServer.handlePublishMessage ('/'+message.id_project+'/requests/'+message.request.request_id+'/messages', message, undefined, true, "CREATE");
         }
-        
+      });
     });
 
     // var reconnect = require('./reconnect');
@@ -604,7 +615,8 @@ class WebSocketServer {
     }
     winston.debug('requestCreateKey: ' + requestCreateKey);
       requestEvent.on(requestCreateKey, async function (request) {
-        // TODO setImmediate(() => { 
+        setImmediate(async () =>  {
+
         winston.debug('requestEvent websocket server: '+requestCreateKey, request);
         // TODO scarta riquesta se agente (req.user._id) non sta ne in participants ne in agents
 
@@ -643,7 +655,7 @@ class WebSocketServer {
           pubSubServer.handlePublishMessage ('/'+request.id_project+'/requests', request, undefined, true, "CREATE");
           pubSubServer.handlePublishMessage ('/'+request.id_project+'/requests/'+request.request_id, request, undefined, true, "CREATE");
         }
-          
+      });
       });
 
       var requestUpdateKey = 'request.update';
@@ -653,6 +665,8 @@ class WebSocketServer {
 
       winston.debug('requestUpdateKey: ' + requestUpdateKey);
       requestEvent.on(requestUpdateKey, async function(request) {
+        setImmediate(async () => {
+
         // TODO setImmediate(() => {        
         winston.debug('requestEvent websocket server: '+requestUpdateKey, request);  
         if (request.preflight===false && request.status > requestConstants.TEMP) {     
@@ -694,7 +708,7 @@ class WebSocketServer {
           pubSubServer.handlePublishMessage ('/'+request.id_project+'/requests', requestJSON, undefined, true, "UPDATE");   
           pubSubServer.handlePublishMessage ('/'+request.id_project+'/requests/'+request.request_id, requestJSON, undefined, true, "UPDATE");
         }
-     
+      });
       });
 
 
@@ -709,6 +723,8 @@ class WebSocketServer {
       }
       winston.debug('projectuserUpdateKey: ' + projectuserUpdateKey);
       authEvent.on(projectuserUpdateKey,function(data) {
+        setImmediate(async () => {
+
         var pu = data.updatedProject_userPopulated;
         winston.debug('ws pu', pu);
         
@@ -724,7 +740,7 @@ class WebSocketServer {
         }
         winston.debug('userId:'+ userId);
         pubSubServer.handlePublishMessage ('/'+pu.id_project+'/project_users/users/'+userId, pu, undefined, true, "UPDATE");
-
+      });
       });
       
 
@@ -735,6 +751,7 @@ class WebSocketServer {
       }
       winston.debug('eventEmitKey: ' + eventEmitKey);
       eventEvent.on(eventEmitKey,function(event) {
+        setImmediate(async () => {
         winston.debug('event', event);
         if (event.project_user === undefined) {
           //with "faqbot.answer_not_found" project_user is undefined but it's ok 
@@ -743,6 +760,7 @@ class WebSocketServer {
         }
         pubSubServer.handlePublishMessage ('/'+event.id_project+'/events/'+event.project_user._id, event, undefined, true, "CREATE");
       });
+      });
 
 
     // https://github.com/websockets/ws/blob/master/examples/express-session-parse/index.js