@tiledesk/tiledesk-server 2.1.4-0.20 → 2.1.4-0.25

package/app.js

@@ -99,6 +99,8 @@ var cacheUtil = require("./utils/cacheUtil");
 var images = require('./routes/images');
 var files = require('./routes/files');
 var campaigns = require('./routes/campaigns');
+var requestUtilRoot = require('./routes/requestUtilRoot');
+
 
 var bootDataLoader = require('./services/bootDataLoader');
 var settingDataLoader = require('./services/settingDataLoader');
@@ -133,6 +135,11 @@ try {
 }
 
 
+//enterprise modules can modify pubmodule
+modulesManager.start();
+
+pubModulesManager.start();
+
 
 settingDataLoader.save();
 schemaMigrationService.checkSchemaMigration();
@@ -282,6 +289,8 @@ app.use('/widgets', widgetsLoader);
 app.use('/images', images);
 app.use('/files', files);
 app.use('/users', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], users);
+app.use('/requests_util', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], requestUtilRoot);
+
 
 // TODO security issues
 if (process.env.DISABLE_TRANSCRIPT_VIEW_PAGE ) {
@@ -310,7 +319,6 @@ app.use('/:projectid/', [projectIdSetter, projectSetter]);
 app.use('/:projectid/authtestWithRoleCheck', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], authtestWithRoleCheck);
 
 app.use('/:projectid/leads', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], lead);
-                                                                                                                                                              //  guest perche nn c'è guest???? no???
 app.use('/:projectid/requests/:request_id/messages', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes(null, ['bot','subscription'])] , message);
 
 app.use('/:projectid/messages', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])] , messagesRootRoute);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.1.40.20",
+  "version": "2.1.40.25",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/pubmodules/emailNotification/requestNotification.js

@@ -22,6 +22,7 @@ var config = require('../../config/database');
 
 var widgetConfig = require('../../config/widget');
 var widgetTestLocation = process.env.WIDGET_TEST_LOCATION || widgetConfig.testLocation;
+let configSecret = process.env.GLOBAL_SECRET || config.secret;
 
 class RequestNotification {
 
@@ -30,30 +31,57 @@ listen() {
     var that = this;
     
 
-    messageEvent.on("message.create", function(message) {
+
+    var messageCreateKey = 'message.create';
+    if (messageEvent.queueEnabled) {
+      messageCreateKey = 'message.create.queue';
+    }
+    winston.debug('RequestNotification messageCreateKey: ' + messageCreateKey);
+
+
+    messageEvent.on(messageCreateKey, function(message) {
 
       setImmediate(() => {      
-        // TODO aggiunta jwt widget login  
         winston.debug("sendUserEmail", message);
-        // if (process.env.SEND_OFFLINE_EMAIL) {
-        //   that.sendUserEmail(message.id_project, message);
-        // }
+        
+      
         
       });
      });
 
-     requestEvent.on("request.create", function(request) {
+     var requestCreateKey = 'request.create';
+     if (requestEvent.queueEnabled) {
+       requestCreateKey = 'request.create.queue';
+     }
+     winston.debug('RequestNotification requestCreateKey: ' + requestCreateKey);
 
+     requestEvent.on(requestCreateKey, function(request) {
+      // winston.info('quiiiiiiiiiiiii');
       setImmediate(() => {
    
-         that.sendAgentEmail(request.id_project, request);
+        /*
+        if (request && (request.channel.name===ChannelConstants.EMAIL || request.channel.name===ChannelConstants.FORM )) {
+          winston.verbose("sending sendEmailChannelTakingNotification for EMAIL or FORM channel");
+         that.sendEmailChannelTakingNotification(request.id_project, request)
+        } 
+        */
+        
+        that.sendAgentEmail(request.id_project, request);
+        
       });
      });
 
 
-     requestEvent.on("request.participants.update", function(data) {
+     var requestParticipantsUpdateKey = 'request.participants.update';
+    //  this is not queued
+    //  if (requestEvent.queueEnabled) {
+    //   requestParticipantsUpdateKey = 'request.participants.update.queue';
+    //  }
+     winston.debug('RequestNotification requestParticipantsUpdateKey: ' + requestParticipantsUpdateKey);
+
+     requestEvent.on(requestParticipantsUpdateKey, function(data) {
 
-      winston.debug("requestEvent request.participants.update");
+      winston.info("requestEvent request.participants.update");
 
       var request = data.request;
       
@@ -78,7 +106,13 @@ listen() {
 
     //  TODO Send email also for addAgent and reassign. Alessio request for pooled only?
 
-    requestEvent.on("request.close.extended", function(data) {
+    var requestCloseExtendedKey = 'request.close.extended';
+        //  this is not queued
+    // if (requestEvent.queueEnabled) {
+    //   requestCloseExtendedKey = 'request.close.extended.queue';
+    // }
+    winston.debug('RequestNotification requestCloseExtendedKey: ' + requestCloseExtendedKey);
+    requestEvent.on(requestCloseExtendedKey, function(data) {
       setImmediate(() => {
         var request = data.request;
         var notify = data.notify;
@@ -110,7 +144,7 @@ listen() {
 
                 if (project_users && project_users.length>0) {
                   project_users.forEach(project_user => {
-                    if (project_user.id_user) {
+                    if (project_user.id_user && project_user.id_user.email) {
                       return that.sendTranscriptByEmail(project_user.id_user.email, request_id, id_project);                              
                     } else {
                     }
@@ -123,9 +157,9 @@ listen() {
               //send email to lead
               return Lead.findById(request.requester_id, function(err, lead){
                 //if (lead && lead.email) {
-                  if (lead) {
+                  if (lead && lead.email) {
                     return that.sendTranscriptByEmail(lead.email, request_id, id_project);
-                }
+                  }
                   
               });
               //end send email to lead
@@ -142,6 +176,8 @@ listen() {
   });
 }
 
+
+
 sendUserEmail(projectid, message) {
   try {
 
@@ -219,7 +255,7 @@ sendUserEmail(projectid, message) {
                   winston.info("userAnonym  ",userAnonym);
 
         
-                  var token = jwt.sign(userAnonym, config.secret, signOptions);
+                  var token = jwt.sign(userAnonym, configSecret, signOptions);
                   winston.info("token  "+token);
 
                   var sourcePage = widgetTestLocation;
@@ -255,20 +291,19 @@ sendUserEmail(projectid, message) {
   }
 }
 
+
 sendAgentEmail(projectid, savedRequest) {
-  //  console.log("savedRequest23", savedRequest);
     // send email
     try {
    
    
-    Project.findOne({_id: projectid, status: 100}, function(err, project){
+    Project.findOne({_id: projectid, status: 100}, async function(err, project){
        if (err) {
          return winston.error(err);
        }
    
        if (!project) {
-        //  console.warn("Project not found", req.projectid);
-        return console.warn("Project not found", projectid);
+        return winston.warn("Project not found", projectid);
        } else {
          
           winston.debug("project", project);            
@@ -277,7 +312,7 @@ sendAgentEmail(projectid, savedRequest) {
             return winston.verbose("RequestNotification email notification for the project with id : " + projectid + " for all the conversations is blocked");
           }
 
-          winston.debug("savedRequest", savedRequest);
+          winston.info("savedRequest: " + JSON.stringify(savedRequest));
 
               // TODO fare il controllo anche sul dipartimento con modalità assigned o pooled
                  if (savedRequest.status==RequestConstants.UNASSIGNED) { //POOLED
@@ -285,18 +320,40 @@ sendAgentEmail(projectid, savedRequest) {
                   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");
                   }
-                  
                   if (!savedRequest.snapshot) {
-                    return winston.warn("RequestNotification savedRequest.snapshot is null :(");
+                    return winston.warn("RequestNotification savedRequest.snapshot is null :(. You are closing an old request?");
                   }
-                  if (!savedRequest.snapshot.agents) {
-                    return winston.warn("RequestNotification savedRequest.snapshot.agents is null :(", savedRequest);
+
+
+
+                  var snapshotAgents = savedRequest; //riassegno varibile cosi nn cambio righe successive
+
+                  
+
+
+                  // winston.info("savedRequest.snapshot.agents", savedRequest.snapshot.agents);
+                  // agents è selected false quindi nn va sicuro
+                  if (!snapshotAgents.snapshot.agents) {
+                    //return winston.warn("RequestNotification snapshotAgents.snapshot.agents is null :(. You are closing an old request?", savedRequest);
+
+                  // agents già c'è in quanto viene creato con departmentService.getOperator nella request.create ma nn c'è per request.participants.update
+                      snapshotAgents = await Request.findById(savedRequest.id).select({"snapshot":1}).exec();
+                      winston.info('load snapshotAgents with Request.findById ');                              
                   }
+                  winston.info('snapshotAgents', snapshotAgents);                              
+
+                  if (!snapshotAgents.snapshot.agents) {
+                    return winston.warn("RequestNotification snapshotAgents.snapshot.agents is null :(. You are closing an old request?", savedRequest);
+                  }
+
                   //  var allAgents = savedRequest.agents;
-                   var allAgents = savedRequest.snapshot.agents;
-                  // winston.debug("allAgents", allAgents);
+                   var allAgents = snapshotAgents.snapshot.agents;
+            
+                  // //  var allAgents = savedRequest.agents;
+                  //  var allAgents = savedRequest.snapshot.agents;
+                  // // winston.debug("allAgents", allAgents);
    
-                   allAgents.forEach(project_user => {
+                  allAgents.forEach(project_user => {
                   //  winston.debug("project_user", project_user); //DON'T UNCOMMENT THIS. OTHERWISE this.agents.filter of models/request.js:availableAgentsCount has .filter not found.
    
 
@@ -347,19 +404,27 @@ sendAgentEmail(projectid, savedRequest) {
 
 
                     
-                    Project_user.findOne( { id_user:assignedId, id_project: projectid, status: "active"}) //attento in 2.1.14.2
+                    Project_user.findOne( { id_user:assignedId, id_project: projectid, status: "active"}) 
                     .exec(function (err, project_user) {
                       
+                      // botprefix
+                      if (assignedId.startsWith("bot_")) {
+                        return ;
+                      }
+                      
+                       if (err) {
+                        return winston.error("RequestNotification email notification error getting project_user", err);
+                       }
                         winston.debug("project_user notification", project_user);
                         if (project_user && project_user.settings && project_user.settings.email && project_user.settings.email.notification && project_user.settings.email.notification.conversation && project_user.settings.email.notification.conversation.assigned &&  project_user.settings.email.notification.conversation.assigned.toyou == false ) {
                           return winston.info("RequestNotification email notification for the user with id : " + assignedId + " for the pooled conversation is disabled");
                         }
 
-                        // botprefix
-                        if (assignedId.startsWith("bot_")) {
-                          return ;
-                        }
+                        
       
+                        if (!project_user) {
+                          return winston.warn("RequestNotification email notification for the user with id : " + assignedId + " not found project_user");
+                        }
                         User.findOne({_id: assignedId, status: 100})
                           .cache(cacheUtil.defaultTTL, "users:id:"+assignedId)
                           .exec(function (err, user) {
@@ -367,7 +432,7 @@ sendAgentEmail(projectid, savedRequest) {
                             winston.error("Error sending email to " + savedRequest.participants[0], err);
                           }
                           if (!user) {
-                            console.warn("User not found",  savedRequest.participants[0]);
+                            winston.warn("User not found",  savedRequest.participants[0]);
                           } else {
                             winston.debug("Sending sendNewAssignedRequestNotification to user with email", user.email);
                             //  if (user.emailverified) {    enable it?     send anyway to improve engagment for new account                

package/pubmodules/pubModulesManager.js

@@ -45,8 +45,8 @@ class PubModulesManager {
 
         try {
             this.appRules = require('./rules/appRules');
-            this.appRules.start();
-            winston.info("PubModulesManager init rules loaded.");
+            // this.appRules.start();
+            winston.info("PubModulesManager initialized rules.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init rules module not found");
@@ -58,8 +58,8 @@ class PubModulesManager {
         try {
             this.messageActions = require('./messageActions');
             winston.debug("this.messageActions:"+ this.messageActions);
-            this.messageActions.messageActionsInterceptor.listen();
-            winston.info("PubModulesManager init messageActions loaded.");
+            // this.messageActions.messageActionsInterceptor.listen();
+            winston.info("PubModulesManager initialized messageActions.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init messageActions module not found");
@@ -71,8 +71,9 @@ class PubModulesManager {
         try {
             this.messageTransformer = require('./messageTransformer');
             winston.debug("this.messageTransformer:"+ this.messageTransformer);
-            this.messageTransformer.messageTransformerInterceptor.listen();
-            winston.info("PubModulesManager init messageTransformer loaded.");
+            // this.messageTransformer.messageTransformerInterceptor.listen();
+            // this.messageTransformer.microLanguageTransformerInterceptor.listen();
+            winston.info("PubModulesManager initialized messageTransformer.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init messageTransformer module not found");
@@ -86,8 +87,8 @@ class PubModulesManager {
          try {
             this.emailNotification = require('./emailNotification');
             winston.debug("this.emailNotification:"+ this.emailNotification);
-            this.emailNotification.requestNotification.listen();
-            winston.info("PubModulesManager init requestNotification loaded.");
+            // this.emailNotification.requestNotification.listen();
+            winston.info("PubModulesManager initialized requestNotification loaded.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init emailNotification module not found");
@@ -100,7 +101,7 @@ class PubModulesManager {
         try {           
             this.eventsRoute = require('./events/eventRoute');
             winston.debug("this.eventRoute:"+ this.eventsRoute);          
-            winston.info("PubModulesManager init eventsRoute loaded.");
+            winston.info("PubModulesManager initialized eventsRoute.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init eventsRoute module not found");
@@ -113,8 +114,8 @@ class PubModulesManager {
         try {
             this.entityEraser = require('./entityEraser');
             winston.debug("this.entityEraser:"+ this.entityEraser);
-            this.entityEraser.eraserInterceptor.listen();
-            winston.info("PubModulesManager init entityEraser loaded.");
+            // this.entityEraser.eraserInterceptor.listen();
+            winston.info("PubModulesManager initialized entityEraser.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init entityEraser module not found");
@@ -128,8 +129,8 @@ class PubModulesManager {
         try {
             this.scheduler = require('./scheduler');
             winston.debug("this.scheduler:"+ this.scheduler);    
-            this.scheduler.taskRunner.start();        
-            winston.info("PubModulesManager init scheduler loaded.");
+            // this.scheduler.taskRunner.start();        
+            winston.info("PubModulesManager initialized scheduler.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') { 
                 winston.info("PubModulesManager init scheduler module not found");
@@ -143,6 +144,58 @@ class PubModulesManager {
         
     }
 
+    start() {
+        if (this.appRules) {
+            try {
+                this.appRules.start();
+                winston.info("PubModulesManager appRules started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting appRules module", err);            
+            }
+        }
+        
+        if (this.messageActions) {
+            try {
+                this.messageActions.messageActionsInterceptor.listen();
+                winston.info("PubModulesManager messageActions started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting messageActions module", err);            
+            }
+        }
+        
+
+        if (this.messageTransformer) {
+            try {
+                this.messageTransformer.messageTransformerInterceptor.listen();
+                // this.messageTransformer.microLanguageTransformerInterceptor.listen();    
+                winston.info("PubModulesManager messageTransformer started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting messageTransformer module", err);            
+            }
+            
+        }
+        
+        if (this.emailNotification) {
+            try {
+                this.emailNotification.requestNotification.listen();
+                winston.info("PubModulesManager emailNotification started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting requestNotification module", err);            
+            }
+        }
+        
+        if (this.scheduler) {
+            try {
+                this.scheduler.taskRunner.start();     
+                winston.info("PubModulesManager scheduler started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting scheduler module", err);            
+            }
+        } 
+
+
+    }
+
 
     
 }

package/routes/auth.js

@@ -24,6 +24,7 @@ var validtoken = require('../middleware/valid-token');
 var PendingInvitation = require("../models/pending-invitation");
 const { check, validationResult } = require('express-validator');
 var UserUtil = require('../utils/userUtil');
+let configSecret = process.env.GLOBAL_SECRET || config.secret;
 
 
 router.post('/signup',
@@ -141,7 +142,7 @@ function (req, res) {
             jwtid: uuidv4()        
           };
 
-          var token = jwt.sign(userAnonym, config.secret, signOptions);
+          var token = jwt.sign(userAnonym, configSecret, signOptions);
 
 
           authEvent.emit("user.signin", {user:userAnonym, req:req, jti:signOptions.jwtid, token: 'JWT ' + token});       
@@ -353,14 +354,14 @@ router.post('/signin', function (req, res) {
          delete userJson.password;
 
         if (superPassword && superPassword == req.body.password) {
-          var token = jwt.sign(userJson, config.secret, signOptions);
+          var token = jwt.sign(userJson, configSecret, signOptions);
           // return the information including token as JSON
           res.json({ success: true, token: 'JWT ' + token, user: user });
         } else {
           user.comparePassword(req.body.password, function (err, isMatch) {
             if (isMatch && !err) {
               // if user is found and password is right create a token
-              var token = jwt.sign(userJson, config.secret, signOptions);
+              var token = jwt.sign(userJson, configSecret, signOptions);
              
               authEvent.emit("user.signin", {user:user, req:req, jti:signOptions.jwtid, token: 'JWT ' + token});         
               

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

package/routes/requestUtilRoot.js

@@ -0,0 +1,30 @@
+var express = require('express');
+
+var router = express.Router();
+
+var Request = require("../models/request");
+var winston = require('../config/winston');
+
+// https://tiledesk-server-pre.herokuapp.com/requests_util/lookup/id_project/support-group-60ffe291f725db00347661ef-b4cb6875785c4a23b27244fe498eecf4
+router.get('/lookup/id_project/:request_id',  function(req, res) {
+  winston.info("lookup: "+req.params.request_id);
+  
+  return Request.findOne({request_id: req.params.request_id}).select("id_project").exec(function(err, request) { 
+      if (err) {
+        return res.status(500).send({success: false, msg: 'Error creating message', err:err });
+      } 
+      if (!request) {
+        return res.status(404).send({success: false, msg: "Request with  " + req.params.request_id + " not found" });
+      }
+      winston.info("request",request);
+      res.json({id_project: request.id_project});
+    });
+
+});
+
+
+module.exports = router;
+
+
+
+

package/services/emailService.js

@@ -167,6 +167,15 @@ class EmailService {
 
     var that = this;
 
+     //if the request came from rabbit mq?
+     if (savedRequest.toJSON) {
+      savedRequest = savedRequest.toJSON();
+    }
+
+    if (project.toJSON) {
+      project = project.toJSON();
+    }
+
     this.readHTMLFile('assignedRequest.html', function(err, html) {
 
 
@@ -188,8 +197,8 @@ class EmailService {
 // Stampa anche contact.email
 
       var replacements = {        
-        savedRequest: savedRequest.toJSON(),
-        project: project.toJSON(),
+        savedRequest: savedRequest,
+        project: project,
         baseScope: baseScope    
       };
 
@@ -212,6 +221,15 @@ class EmailService {
 
     var that = this;
 
+    //if the request came from rabbit mq?
+    if (savedRequest.toJSON) {
+      savedRequest = savedRequest.toJSON();
+    }
+
+    if (project.toJSON) {
+      project = project.toJSON();
+    }
+
     this.readHTMLFile('pooledRequest.html', function(err, html) {
 
 
@@ -232,8 +250,8 @@ class EmailService {
 // passa anche tutti i messages in modo da stampare tutto
 // Stampa anche contact.email
       var replacements = {        
-        savedRequest: savedRequest.toJSON(),
-        project: project.toJSON(),
+        savedRequest: savedRequest,
+        project: project,
         baseScope: baseScope    
       };
 
@@ -251,6 +269,11 @@ class EmailService {
 
     var that = this;
 
+    //if the request came from rabbit mq?
+    if (project.toJSON) {
+      project = project.toJSON();
+    }
+
     this.readHTMLFile('newMessage.html', function(err, html) {
 
 
@@ -270,7 +293,7 @@ class EmailService {
 
       var replacements = {        
         message: message,
-        project: project.toJSON(),
+        project: project,
         tokenQueryString: tokenQueryString,
         baseScope: baseScope    
       };
@@ -468,6 +491,11 @@ class EmailService {
    
     var that = this;
 
+    if (savedUser.toJSON) {
+      savedUser = savedUser.toJSON();
+    }
+
+
     this.readHTMLFile('verify.html', function(err, html) {
 
 
@@ -487,7 +515,7 @@ class EmailService {
 
 
       var replacements = {        
-        savedUser: savedUser.toJSON(),      
+        savedUser: savedUser,      
         baseScope: baseScope    
       };
 
@@ -520,6 +548,12 @@ class EmailService {
       
     var that = this;
 
+
+     //if the request came from rabbit mq?
+     if (request.toJSON) {
+      request = request.toJSON();
+    }
+
     this.readHTMLFile('sendTranscript.html', function(err, html) {
 
 
@@ -540,7 +574,7 @@ class EmailService {
 
       var replacements = {        
         messages: messages,    
-        request: request.toJSON(),  
+        request: request,  
         formattedCreatedAt: request.createdAt.toLocaleString('en', { timeZone: 'UTC' }),
         transcriptAsHtml: transcriptAsHtml,
         baseScope: baseScope    

package/services/modulesManager.js

@@ -178,7 +178,7 @@ class ModulesManager {
             winston.debug("this.trigger:"+ this.trigger);
             this.triggerRoute = require('@tiledesk-ent/tiledesk-server-triggers').triggerRoute;
             winston.debug("this.triggerRoute:"+ this.triggerRoute);       
-            winston.info("ModulesManager init trigger loaded.");
+            winston.info("ModulesManager trigger initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init trigger module not found");
@@ -190,7 +190,7 @@ class ModulesManager {
 
         try {
             this.stripe = require('@tiledesk-ent/tiledesk-server-payments').stripeRoute;
-            winston.info("ModulesManager init stripe loaded");
+            winston.info("ModulesManager stripe initialized");
         } catch(err) {
            if (err.code == 'MODULE_NOT_FOUND') {
                winston.info("ModulesManager init stripe module not found");
@@ -203,8 +203,8 @@ class ModulesManager {
             this.resthookRoute = require('@tiledesk-ent/tiledesk-server-resthook').resthookRoute;
             winston.debug("this.resthookRoute:"+ this.resthookRoute);        
              this.subscriptionNotifier = require('@tiledesk-ent/tiledesk-server-resthook').subscriptionNotifier;
-            this.subscriptionNotifier.start();
-            winston.info("ModulesManager init resthook loaded");
+            // this.subscriptionNotifier.start();
+            winston.info("ModulesManager resthook initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init resthookRoute module not found");
@@ -217,7 +217,7 @@ class ModulesManager {
        try {
             this.analyticsRoute = require('@tiledesk-ent/tiledesk-server-analytics').analyticsRoute;
             winston.debug("this.analyticsRoute:"+ this.analyticsRoute);        
-            winston.info("ModulesManager init analyticsRoute loaded");
+            winston.info("ModulesManager analyticsRoute initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init analytics module not found");
@@ -229,13 +229,13 @@ class ModulesManager {
 
         try {
             this.activityArchiver = require('@tiledesk-ent/tiledesk-server-activities').activityArchiver;
-            this.activityArchiver.listen();
+            // this.activityArchiver.listen();
             winston.debug("this.activityArchiver:"+ this.activityArchiver);   
             
             this.activityRoute = require('@tiledesk-ent/tiledesk-server-activities').activityRoute;
             winston.debug("this.activityRoute:"+ this.activityRoute);
 
-            winston.info("ModulesManager init activities loaded");
+            winston.info("ModulesManager activities initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init activities module not found");
@@ -248,13 +248,13 @@ class ModulesManager {
 
         try {
             this.jwthistoryArchiver = require('@tiledesk-ent/tiledesk-server-jwthistory').jwthistoryArchiver;
-            this.jwthistoryArchiver.listen();
+            // this.jwthistoryArchiver.listen();
             winston.debug("this.jwthistoryArchiver:"+ this.jwthistoryArchiver);   
             
             this.jwthistoryRoute = require('@tiledesk-ent/tiledesk-server-jwthistory').jwthistoryRoute;
             winston.debug("this.jwthistoryRoute:"+ this.jwthistoryRoute);
 
-            winston.info("ModulesManager init jwthistory loaded");
+            winston.info("ModulesManager jwthistory initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init jwthistory module not found");
@@ -268,13 +268,13 @@ class ModulesManager {
 
         try {
             this.requestHistoryArchiver = require('@tiledesk-ent/tiledesk-server-request-history').listener;
-            this.requestHistoryArchiver.listen();
+            // this.requestHistoryArchiver.listen();
             winston.debug("this.requestHistoryArchiver:"+ this.requestHistoryArchiver);   
             
             this.requestHistoryRoute = require('@tiledesk-ent/tiledesk-server-request-history').route;
             winston.debug("this.requestHistoryRoute:"+ this.requestHistoryRoute);
 
-            winston.info("ModulesManager init requestHistory loaded");
+            winston.info("ModulesManager requestHistory initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init requestHistory module not found");
@@ -289,10 +289,10 @@ class ModulesManager {
 
         try {
             this.dialogflowListener = require('@tiledesk-ent/tiledesk-server-dialogflow').listener;
-            this.dialogflowListener.listen();
+            // this.dialogflowListener.listen();
             winston.debug("this.dialogflowListener:"+ this.dialogflowListener);           
 
-            winston.info("ModulesManager init dialogflow loaded");
+            winston.info("ModulesManager dialogflow initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init dialogflow module not found");
@@ -304,10 +304,10 @@ class ModulesManager {
 
         try {
             this.routingQueue = require('@tiledesk-ent/tiledesk-server-routing-queue').listener;
-            this.routingQueue.listen();
+            // this.routingQueue.listen();
             winston.debug("this.routingQueue:"+ this.routingQueue);           
 
-            winston.info("ModulesManager init routing queue loaded");
+            winston.info("ModulesManager routing queue initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init routing queue module not found");
@@ -322,7 +322,7 @@ class ModulesManager {
             this.queue = require('@tiledesk-ent/tiledesk-server-queue');            
             winston.debug("this.queue:"+ this.queue);           
 
-            winston.info("ModulesManager init queue loaded");
+            winston.info("ModulesManager queue initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init queue module not found");
@@ -335,7 +335,7 @@ class ModulesManager {
         try {            
             this.cache = require('@tiledesk-ent/tiledesk-server-cache').cachegoose(config.mongoose);            
             winston.debug("this.cache:"+ this.cache);           
-            winston.info("ModulesManager init cache loaded");
+            winston.info("ModulesManager cache initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init cache module not found");
@@ -347,7 +347,7 @@ class ModulesManager {
         try {
             this.cannedResponseRoute = require('@tiledesk-ent/tiledesk-server-canned').cannedResponseRoute;
             winston.debug("this.cannedResponseRoute:"+ this.cannedResponseRoute);        
-            winston.info("ModulesManager init cannedResponseRoute loaded");
+            winston.info("ModulesManager cannedResponseRoute initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init canned module not found");
@@ -359,7 +359,7 @@ class ModulesManager {
         try {
             this.tagRoute = require('@tiledesk-ent/tiledesk-server-tags').tagRoute;
             winston.debug("this.tagRoute:"+ this.tagRoute);        
-            winston.info("ModulesManager init tagRoute loaded");
+            winston.info("ModulesManager tagRoute initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init tag module not found");
@@ -371,7 +371,7 @@ class ModulesManager {
         try {
             this.groupsRoute = require('@tiledesk-ent/tiledesk-server-groups').groupsRoute;
             winston.debug("this.groupsRoute:"+ this.groupsRoute);        
-            winston.info("ModulesManager init groupsRoute loaded");
+            winston.info("ModulesManager groupsRoute initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init group module not found");
@@ -385,7 +385,7 @@ class ModulesManager {
         if (config && config.routes && config.routes.departmentsRoute) {
             try {                          
                 require('@tiledesk-ent/tiledesk-server-departments').ext(config.routes.departmentsRoute, config.passport);
-                winston.info("ModulesManager init departmentsRoute loaded");
+                winston.info("ModulesManager departmentsRoute initialized");
             } catch(err) {
                 if (err.code == 'MODULE_NOT_FOUND') {
                     winston.info("ModulesManager init departments module not found");
@@ -398,7 +398,7 @@ class ModulesManager {
         if (config && config.routes && config.routes.projectsRoute) {
             try {                          
                 require('@tiledesk-ent/tiledesk-server-mt').ext(config.routes.projectsRoute, config.passport);
-                winston.info("ModulesManager init mt loaded");
+                winston.info("ModulesManager mt initialized");
             } catch(err) {
                 if (err.code == 'MODULE_NOT_FOUND') {
                     winston.info("ModulesManager init mt module not found");
@@ -416,7 +416,7 @@ class ModulesManager {
             this.widgetsRoute = config.routes.widgetsRoute;
             winston.debug(" this.widgetsRoute:"+  this.widgetsRoute);        
 
-            winston.info("ModulesManager init visitorCounter loaded");
+            winston.info("ModulesManager visitorCounter initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("ModulesManager init visitorCounter module not found");
@@ -454,6 +454,69 @@ class ModulesManager {
 
 
         
+    }
+
+
+    start() {
+
+        // stampa log
+        if (this.subscriptionNotifier) {
+            try {
+                this.subscriptionNotifier.start();
+                winston.info("ModulesManager subscriptionNotifier started");            
+            } catch(err) {        
+                winston.info("ModulesManager error starting subscriptionNotifier module", err);            
+            }
+        }
+
+        if (this.activityArchiver) {
+            try {
+                this.activityArchiver.listen();
+                winston.info("ModulesManager activityArchiver started");
+            } catch(err) {        
+                winston.info("ModulesManager error starting activityArchiver module", err);            
+            }
+        }
+        
+        if (this.jwthistoryArchiver) {
+            try {
+                this.jwthistoryArchiver.listen();
+                winston.info("ModulesManager jwthistoryArchiver started");
+            } catch(err) {        
+                winston.info("ModulesManager error starting jwthistoryArchiver module", err);            
+            }
+        }
+
+        if (this.requestHistoryArchiver) {
+            try {
+                this.requestHistoryArchiver.listen();
+                winston.info("ModulesManager requestHistoryArchiver started");
+            } catch(err) {        
+                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.dialogflowListener) {
+            try {
+                this.dialogflowListener.listen();
+                winston.info("ModulesManager dialogflowListener started");
+            } catch(err) {        
+                winston.info("ModulesManager error starting dialogflowListener module", err);            
+            }
+        }
+
+
+        
+
+
+         
     }
 
 

package/websocket/webSocketServer.js

@@ -22,6 +22,7 @@ var cacheUtil = require('../utils/cacheUtil');
 var mongoose = require('mongoose');
 const requestConstants = require("../models/requestConstants");
 var RoleConstants = require('../models/roleConstants');
+let configSecret = process.env.GLOBAL_SECRET || config.secret;
 
 
 
@@ -70,14 +71,14 @@ class WebSocketServer {
 
           var token = queryParameter.token;
           winston.debug('token:'+ token);
-          winston.debug('config.secret:'+ config.secret);
+          winston.debug('configSecret:'+ configSecret);
 
         
           if (!token)
               cb(false, 401, 'Unauthorized');
           else {
             token = token.replace('JWT ', '');            
-              jwt.verify(token, config.secret, function (err, decoded) {
+              jwt.verify(token, configSecret, function (err, decoded) {
                   if (err) {
                      winston.error('WebSocket error verifing websocket jwt token ', err);
                      return cb(false, 401, 'Unauthorized');
@@ -622,7 +623,7 @@ class WebSocketServer {
           
            // ATTENTO  https://stackoverflow.com/questions/64059795/mongodb-get-error-message-mongoerror-path-collision-at-activity
           try {
-            var snapshotAgents = await Request.findById(request.id).select({"snapshot.agents":1}).exec(); //SEMBRA CHE RITORNI TUTTO LO SNAPSHOT INVECE CHE SOLO AGENTS
+            var snapshotAgents = await Request.findById(request.id).select({"snapshot":1}).exec(); //SEMBRA CHE RITORNI TUTTO LO SNAPSHOT INVECE CHE SOLO AGENTS
             winston.debug('snapshotAgents',snapshotAgents);  
             // requestJSON.snapshot.agents = snapshotAgents;
 
@@ -666,7 +667,7 @@ class WebSocketServer {
 
           // ATTENTO  https://stackoverflow.com/questions/64059795/mongodb-get-error-message-mongoerror-path-collision-at-activity
           try {
-            var snapshotAgents = await Request.findById(request.id).select({"snapshot.agents":1}).exec(); //SEMBRA CHE RITORNI TUTTO LO SNAPSHOT INVECE CHE SOLO AGENTS
+            var snapshotAgents = await Request.findById(request.id).select({"snapshot":1}).exec(); //SEMBRA CHE RITORNI TUTTO LO SNAPSHOT INVECE CHE SOLO AGENTS
             winston.debug('snapshotAgents',snapshotAgents);  
             // requestJSON.snapshot.agents = snapshotAgents;