@tiledesk/tiledesk-server 2.3.1 → 2.3.4

package/services/emailService.js

@@ -191,20 +191,24 @@ class EmailService {
         user: configEmail.user,
         pass: configEmail.pass
       },
+      // secureConnection: false,
+      // tls:{
+      //   ciphers:'SSLv3'
+      // },
 
-// openssl genrsa -out dkim_private.pem 2048
+// openssl genrsa -out dkim_private.pem 2048   
 // openssl rsa -in dkim_private.pem -pubout -outform der 2>/dev/null | openssl base64 -A
 // -> 
 // v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAunT2EopDAYnHwAOHd33KhlzjUXJfhmA+fK+cG85i9Pm33oyv1NoGrOynsni0PO6j7oRxxHqs6EMDOw4I/Q0C7aWn20oBomJZehTOkCV2xpuPKESiRktCe/MIZqbkRdypis4jSkFfFFkBHwgkAg5tb11E9elJap0ed/lN5/XlpGedqoypKxp+nEabgYO5mBMMNKRvbHx0eQttRYyIaNkTuMbAaqs4y3TkHOpGvZTJsvUonVMGAstSCfUmXnjF38aKpgyTausTSsxHbaxh3ieUB4ex+svnvsJ4Uh5Skklr+bxLVEHeJN55rxmV67ytLg5XCRWqdKIcJHFvSlm2YwJfcwIDAQABMacAL
 // testdkim._domainkey.tiledesk.com. 86400 IN TXT "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAunT2EopDAYnHwAOHd33KhlzjUXJfhmA+fK+cG85i9Pm33oyv1NoGrOynsni0PO6j7oRxxHqs6EMDOw4I/Q0C7aWn20oBomJZehTOkCV2xpuPKESiRktCe/MIZqbkRdypis4jSkFfFFkBHwgkAg5tb11E9elJap0ed/lN5/XlpGedqoypKxp+nEabgYO5mBMMNKRvbHx0eQttRYyIaNkTuMbAaqs4y3TkHOpGvZTJsvUonVMGAstSCfUmXnjF38aKpgyTausTSsxHbaxh3ieUB4ex+svnvsJ4Uh5Skklr+bxLVEHeJN55rxmV67ytLg5XCRWqdKIcJHFvSlm2YwJfcwIDAQABMacAL"
 
-      dkim: {
-        domainName: "example.com",
-        keySelector: "2017",
-        privateKey: "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBg...",
-        cacheDir: "/tmp",
-        cacheTreshold: 100 * 1024
-      }
+      // dkim: {
+      //   domainName: "example.com",
+      //   keySelector: "2017",
+      //   privateKey: "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBg...",
+      //   cacheDir: "/tmp",
+      //   cacheTreshold: 100 * 1024
+      // }
     };
 
     winston.debug("getTransport transport: ",transport);
@@ -406,7 +410,9 @@ class EmailService {
       }
     }
 
-
+    // troncare nome utnete e nome progetto a max 10 caratteri
+    // cambiare in [Nicky:Dashboard Support] Assigned Chat
+    // serve per aggiornare native... fai aggiornamento 
 
     let subject = `[Tiledesk ${project ? project.name : '-'}] New Assigned Chat`;
 
@@ -958,11 +964,12 @@ class EmailService {
 
     let inReplyTo;
     let references;
+    winston.debug("message.request.attributes", message.request.attributes);
     if (message.request.attributes) {
       if (message.request.attributes.email_messageId) {
         inReplyTo = message.request.attributes.email_messageId;
       }
-      if (message.attributes.email_references) {
+      if (message.request.attributes.email_references) {
         references = message.request.attributes.email_references;
       }
     }
@@ -1176,6 +1183,177 @@ class EmailService {
   }
 
 
+
+
+
+
+
+
+
+
+  
+  async sendFollowerNotification(to, message, project) {
+
+    var that = this;
+
+
+    if (project.toJSON) {
+      project = project.toJSON();
+    }
+
+    var html = await this.readTemplate('newMessageFollower.html', project.settings);
+
+
+    var envTemplate = process.env.EMAIL_FOLLOWER_HTML_TEMPLATE;
+      winston.debug("envTemplate: " + envTemplate);
+
+    if (envTemplate) {
+        html = envTemplate;
+    }
+
+    winston.debug("html: " + html);
+
+    var template = handlebars.compile(html);
+
+    var baseScope = JSON.parse(JSON.stringify(that));
+    delete baseScope.pass;
+
+
+    let msgText = message.text;//.replace(/[\n\r]/g, '<br>');
+    msgText = encode(msgText);
+    if (this.markdown) {
+      msgText = marked(msgText);
+    }
+    
+    winston.debug("msgText: " + msgText);
+    winston.debug("baseScope: " + JSON.stringify(baseScope));
+    
+
+    var replacements = {        
+      message: message,
+      project: project,
+      msgText: msgText,
+      baseScope: baseScope    
+    };
+
+    var html = template(replacements); 
+    winston.debug("html: " + html);
+
+    const fs = require('fs');
+    fs.writeFileSync('tem1111.html', html);
+
+  
+    
+    let messageId = message._id + "@" + MESSAGE_ID_DOMAIN;
+
+    let replyTo;
+    if (this.replyEnabled) {
+      replyTo = message.request.request_id + this.inboundDomainDomainWithAt;
+    }
+
+    let headers;
+    if (message.request) { 
+      
+        messageId = message.request.request_id + "+" + messageId;
+
+        if (message.request.attributes && message.request.attributes.email_replyTo) {
+          replyTo = message.request.attributes.email_replyTo;
+        }
+     
+      headers = {"X-TILEDESK-PROJECT-ID": project._id, "X-TILEDESK-REQUEST-ID": message.request.request_id, "X-TILEDESK-TICKET-ID":message.request.ticket_id };
+
+      winston.verbose("messageId: " + messageId);
+      winston.verbose("replyTo: " + replyTo);
+      winston.verbose("email headers", headers);
+    }
+    
+
+    let inReplyTo;
+    let references;
+    let cc;
+    let ccString;
+
+    if (message.request && message.request.attributes) {
+      winston.debug("email message.request.attributes: ", message.request.attributes);
+
+      if (message.request.attributes.email_messageId) {
+        inReplyTo = message.request.attributes.email_messageId;
+      }
+      if (message.request.attributes.email_references) {
+        references = message.request.attributes.email_references;
+      }        
+
+      if (message.request.attributes.email_cc) {
+        cc = message.request.attributes.email_cc;       
+      }
+      winston.debug("email message.request.attributes.email_ccStr: "+ message.request.attributes.email_ccStr);
+      if (message.request.attributes.email_ccStr!=undefined) {
+        ccString = message.request.attributes.email_ccStr;
+        winston.debug("email set ccString");
+      }
+    }
+    winston.verbose("email inReplyTo: "+ inReplyTo);
+    winston.verbose("email references: "+ references);
+    winston.verbose("email cc: ", cc);
+    winston.verbose("email ccString: "+ ccString);
+
+    let from;
+    let configEmail;
+    if (project && project.settings && project.settings.email) {
+      if (project.settings.email.config) {
+        configEmail = project.settings.email.config;
+        winston.verbose("custom email configEmail setting found: ", configEmail);
+      }
+      if (project.settings.email.from) {
+        from = project.settings.email.from;
+        winston.verbose("custom from email setting found: "+ from);
+      }
+    }
+
+
+  
+    
+    that.send({
+      messageId: messageId,
+      // sender: message.senderFullname, //must be an email
+      from:from, 
+      to:to, 
+      cc: ccString,
+      replyTo: replyTo, 
+      inReplyTo: inReplyTo,
+      references: references,
+      // subject:`${message.request ? message.request.subject : '-'}`, 
+      subject:`${message.request ? message.request.ticket_id : '-'}`,  //gmail uses subject
+      text:html, 
+      html:html,
+      config:configEmail, 
+      headers:headers 
+    }); 
+    
+    // // messageId =  "notification" + messageId;
+
+    // // that.send({
+    // //   messageId: messageId,
+    // //   // sender: message.senderFullname, //must be an email
+    // //   to: that.bcc, 
+    // //   replyTo: replyTo, 
+    // //   inReplyTo: inReplyTo,
+    // //   references: references,
+    // //   // subject: `${message.request ? message.request.subject : '-'} - notification`, 
+    // //   subject: `${message.request ? message.request.subject : '-'} - notification`, 
+    // //   text:html, 
+    // //   html:html,
+    // //   headers:headers
+    // // });
+
+
+  }
+
+
+
+
+
+
 /*
   sendEmailChannelTakingNotification(to, request, project, tokenQueryString) {
 
@@ -1505,6 +1683,6 @@ async sendRequestTranscript(to, messages, request, project) {
 
 var emailService = new EmailService();
 
-// emailService.sendTest("al@f21.it");
+//  emailService.sendTest("asd.");
 
 module.exports = emailService;

package/services/leadService.js

@@ -128,6 +128,8 @@ class LeadService {
 
       
         leadEvent.emit('lead.update', updatedLead);
+        leadEvent.emit('lead.email.update', updatedLead);
+        leadEvent.emit('lead.fullname.update', updatedLead);
         return resolve(updatedLead);
       });
     });

package/services/requestService.js

@@ -21,6 +21,7 @@ class RequestService {
 
   listen() {
     this.updateSnapshotLead();
+    this.sendMessageUpdateLead();
   }
   updateSnapshotLead() {
     leadEvent.on('lead.update', function(lead) {
@@ -58,6 +59,62 @@ class RequestService {
           });
         });
   }
+
+
+  sendMessageUpdateLead() {
+    leadEvent.on('lead.fullname.update', function(lead) {
+      // leadEvent.on('lead.update', function(lead) {
+      
+      setImmediate(() => {
+          winston.debug("sendMessageUpdateLead on lead.update ",  lead);
+          
+          Request.find({lead: lead._id, id_project: lead.id_project}, function(err, requests) {
+
+            if (err) {
+                winston.error("Error getting sendMessageUpdateLead request by lead", err);
+                return 0;
+            }
+            if (!requests || (requests && requests.length==0)) {
+                winston.warn("sendMessageUpdateLead No request found for lead id " +lead._id );
+                return 0;
+            }
+            
+            // winston.info("sendMessageUpdateLead requests ", requests);
+
+            requests.forEach(function(request) {
+
+              winston.debug("sendMessageUpdateLead request ", request);
+
+              // send(sender, senderFullname, recipient, text, id_project, createdBy, attributes, type, metadata, language)
+              messageService.send(
+                  'system', 
+                  'Bot',     
+                  // lead.fullname,                                
+                  request.request_id,
+                  "Lead updated", 
+                  request.id_project,
+                  'system', 
+                  { 
+                    subtype:"info/support",
+                    "updateconversation" : false, 
+                    messagelabel: {key: "LEAD_UPDATED"},
+                    updateUserEmail: lead.email,
+                    updateUserFullname: lead.fullname
+                  },
+                  undefined,
+                  request.language
+
+              ); 
+
+            });
+
+          });          
+         
+        });
+    });
+  }
+
+
   getAvailableAgentsCount(agents) {
      
       var project_users_available = agents.filter(function (projectUser) {
@@ -142,6 +199,7 @@ class RequestService {
             request.snapshot = {}
           }
 
+          
           request.snapshot.department = result.department;
           request.snapshot.agents = result.agents;
           request.snapshot.availableAgentsCount = that.getAvailableAgentsCount(result.agents);
@@ -400,6 +458,10 @@ class RequestService {
     var notes = request.notes;
     var priority = request.priority;
 
+    var auto_close = request.auto_close;
+
+    var followers = request.followers;
+
     if (!departmentid) {
       departmentid ='default';
     }
@@ -421,7 +483,7 @@ class RequestService {
           first_text:first_text, departmentid:departmentid, sourcePage:sourcePage, language:language, userAgent:userAgent, status:status, 
           createdBy:createdBy, attributes:attributes, subject:subject, preflight: preflight, channel: channel, location: location,
           participants:participants, tags: tags, notes:notes,
-          priority: priority}};
+          priority: priority, auto_close: auto_close, followers: followers}};
 
           winston.debug("context",context);
 
@@ -505,6 +567,7 @@ class RequestService {
             snapshot.department = result.department;
           }
           
+          // console.log("result.agents",result.agents);
           snapshot.agents = agents;
           snapshot.availableAgentsCount = that.getAvailableAgentsCount(agents);
 
@@ -549,7 +612,9 @@ class RequestService {
                 snapshot: snapshot,
                 tags: tags,
                 notes: notes,
-                priority: priority
+                priority: priority,
+                auto_close: auto_close,
+                followers: followers
               });
                     
 
@@ -842,14 +907,14 @@ class RequestService {
 
   }
 
-  setClosedAtByRequestId(request_id, id_project, closed_at) {
+  setClosedAtByRequestId(request_id, id_project, closed_at, closed_by) {
 
     return new Promise(function (resolve, reject) {
      // winston.debug("request_id", request_id);
      // winston.debug("newstatus", newstatus);
 
         return Request        
-        .findOneAndUpdate({request_id: request_id, id_project: id_project}, {closed_at: closed_at}, {new: true, upsert:false})
+        .findOneAndUpdate({request_id: request_id, id_project: id_project}, {closed_at: closed_at, closed_by: closed_by}, {new: true, upsert:false})
         .populate('lead')
         .populate('department')
         .populate('participatingBots')
@@ -934,7 +999,7 @@ class RequestService {
   }
 
 
-  closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify) {
+  closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by) {
 
     var that = this;
     return new Promise(function (resolve, reject) {
@@ -991,7 +1056,8 @@ class RequestService {
                   return resolve(updatedRequest);
                 }
                 
-                return that.setClosedAtByRequestId(request_id, id_project, new Date().getTime()).then(function(updatedRequest) {
+                // setClosedAtByRequestId(request_id, id_project, closed_at, closed_by)
+                return that.setClosedAtByRequestId(request_id, id_project, new Date().getTime(), closed_by).then(function(updatedRequest) {
                   
                     winston.verbose("Request closed with id: " + updatedRequest.id);
                     winston.debug("Request closed ", updatedRequest);
@@ -1728,6 +1794,298 @@ class RequestService {
 
 
 
+
+
+
+
+  addFollowerByRequestId(request_id, id_project, member) {
+    winston.debug("request_id: " + request_id);
+    winston.debug("id_project: " + id_project);
+    winston.debug("addFollowerByRequestId member: " + member);
+
+ 
+
+//TODO control if member is a valid project_user of the project
+// validate member is string
+    return new Promise(function (resolve, reject) {
+
+      if (member==undefined) {
+        var err = "addFollowerByRequestId error, member field is null";
+        winston.error(err);
+        return reject(err);
+      }
+
+      return Request       
+      .findOne({request_id: request_id, id_project: id_project})     
+      // qui cache         
+      .exec( function(err, request) {
+        if (err){
+          winston.error("Error adding follower ", err);
+          return reject(err);
+        }
+        if (!request) {
+          winston.error('Request not found for request_id '+ request_id + ' and id_project '+ id_project);
+          return reject('Request not found for request_id '+ request_id + ' and id_project '+ id_project);
+        }
+
+        winston.debug("assigned_operator here1");
+
+      // return Request.findById(id).then(function (request) {
+        if (request.followers.indexOf(member)==-1){
+          request.followers.push(member);
+
+          request.save(function(err, savedRequest) {
+            if (err) {
+              winston.error(err);
+              return reject(err);
+            }
+
+            winston.debug("saved", savedRequest);
+
+            return savedRequest
+            .populate('lead')
+            .populate('department')
+            .populate('participatingBots')
+            .populate('participatingAgents') 
+            // .populate('followers')  
+            .populate({path:'requester',populate:{path:'id_user'}})
+            .execPopulate( function(err, requestComplete) {
+
+              if (err) {
+                winston.error("Error getting addFollowerByRequestId", err);
+                return reject(err);
+              }
+
+
+              winston.debug("populated", requestComplete);
+           
+              requestEvent.emit('request.update', requestComplete);
+              requestEvent.emit("request.update.comment", {comment:"FOLLOWER_ADD",request:requestComplete});//Deprecated
+              requestEvent.emit("request.updated", {comment:"FOLLOWER_ADD",request:requestComplete, patch:  {member:member}});
+              requestEvent.emit('request.followers.join', {member:member, request: requestComplete});
+                       
+              return resolve(requestComplete);
+          });
+        });
+          // qui assignetat
+        } else {
+          winston.debug('Request member '+ member+ ' already added for request_id '+ request_id + ' and id_project '+ id_project);
+          return request
+          .populate('lead')
+          .populate('department')
+          .populate('participatingBots')
+          .populate('participatingAgents')  
+          // .populate('followers')  
+          .populate({path:'requester',populate:{path:'id_user'}})
+          .execPopulate( function(err, requestComplete) {
+            return resolve(requestComplete);
+          });
+        }
+                       
+      });
+   });
+  }
+
+
+
+
+
+  setFollowersByRequestId(request_id, id_project, newfollowers) {
+    
+    //TODO validate participants
+    // validate if array of string newparticipants
+    return new Promise(function (resolve, reject) {
+      
+      var isArray = Array.isArray(newfollowers);
+
+      if(isArray==false) {
+        winston.error('setFollowersByRequestId error  newfollowers is not an array for request_id '+ request_id + ' and id_project '+ id_project);
+        return reject('setFollowersByRequestId error  newfollowers is not an array for request_id '+ request_id + ' and id_project '+ id_project);
+      }
+
+      return Request
+       
+      .findOne({request_id: request_id, id_project: id_project})     
+      // qui cache ok
+      .exec( function(err, request) {
+        if (err) {
+          winston.error("Error setFollowersByRequestId", err);
+          return reject(err);
+        }       
+        if (!request) {
+          winston.error('Request not found for request_id '+ request_id + ' and id_project '+ id_project);
+          return reject('Request not found for request_id '+ request_id + ' and id_project '+ id_project);
+        }
+        var oldfollowers = request.followers;
+        winston.debug('oldParticipants', oldfollowers);
+        winston.debug('newparticipants', newfollowers);
+        
+        if (requestUtil.arraysEqual(oldfollowers, newfollowers)){
+        //if (oldParticipants === newparticipants) {
+          winston.verbose('Request members '+ oldfollowers+ ' already equal to ' + newfollowers + ' for request_id '+ request_id + ' and id_project '+ id_project);
+          return request
+          .populate('lead')
+          .populate('department')
+          .populate('participatingBots')
+          .populate('participatingAgents')  
+          .populate({path:'requester',populate:{path:'id_user'}})
+          .execPopulate( function(err, requestComplete) {
+            return resolve(requestComplete);
+          });
+
+        }
+
+        request.followers = newfollowers;
+
+          //cacheinvalidation
+        return request.save(function(err, updatedRequest) {
+          // dopo save non aggiorna participating
+          if (err) {
+            winston.error("Error setFollowersByRequestId", err);
+            return reject(err);
+          }
+        
+         return updatedRequest
+          .populate('lead')
+          .populate('department')
+          .populate('participatingBots')
+          .populate('participatingAgents')  
+          .populate({path:'requester',populate:{path:'id_user'}})
+          .execPopulate( function(err, requestComplete) {
+
+
+            if (err) {
+              winston.error("Error getting setFollowersByRequestId", err);
+              return reject(err);
+            }
+
+            winston.debug("oldfollowers ", oldfollowers);
+
+            requestEvent.emit('request.update', requestComplete);
+            requestEvent.emit("request.update.comment", {comment:"FOLLOWERS_SET",request:requestComplete});//Deprecated
+            requestEvent.emit("request.updated", {comment:"FOLLOWERS_SET",request:requestComplete, patch:  {}});            
+
+            // requestEvent.emit('request.followers.update', {beforeRequest:request, 
+            //             removedParticipants:removedParticipants, 
+            //             addedParticipants:addedParticipants,
+            //             request:requestComplete});
+
+            return resolve(requestComplete);
+           });
+        });
+       
+      });
+
+
+    });
+  }
+
+
+
+
+
+
+  removeFollowerByRequestId(request_id, id_project, member) {
+    winston.debug("request_id", request_id);
+    winston.debug("id_project", id_project);
+    winston.debug("member", member);
+
+    return new Promise(function (resolve, reject)  {
+
+
+
+      if (member==undefined) {
+        var err = "removeFollowerByRequestId error, member field is null";
+        winston.error(err);
+        return reject(err);
+      }
+
+    
+      return Request        
+        .findOne({request_id: request_id, id_project: id_project})
+        // .populate('participatingAgents')  //for abandoned_by_project_users
+        // qui cache    
+        .exec( async (err, request) => {
+        
+        if (err){
+          winston.error("Error removing follower ", err);
+          return reject(err);
+        }
+
+        if (!request) {
+          winston.error('Request not found for request_id '+ request_id + ' and id_project '+ id_project);
+          return reject('Request not found for request_id '+ request_id + ' and id_project '+ id_project);
+        }
+
+        var index = request.followers.indexOf(member);
+        winston.debug("index", index);
+
+        if (index > -1) {
+          request.followers.splice(index, 1);
+          // winston.debug(" request.participants",  request.participants);
+         
+
+          // winston.debug(" request",  request);
+         //cacheinvalidation
+         return request.save(function(err, savedRequest) {
+            if (err){
+              winston.error("Error saving removed follower ", err);
+              return reject(err);
+            }
+            
+            return savedRequest
+            .populate('lead')
+            .populate('department')
+            .populate('participatingBots')
+            .populate('participatingAgents')  
+            // .populate('followers')  
+            .populate({path:'requester',populate:{path:'id_user'}})
+            .execPopulate( function(err, requestComplete) {
+
+            if (err){
+              winston.error("Error getting removed follower ", err);
+              return reject(err);
+            }
+
+            
+            requestEvent.emit('request.update', requestComplete);
+            requestEvent.emit("request.update.comment", {comment:"FOLLOWER_REMOVE",request:requestComplete});//Deprecated
+            requestEvent.emit("request.updated", {comment:"FOLLOWER_REMOVE",request:requestComplete, patch:  {member:member}});
+            requestEvent.emit('request.followers.leave', {member:member, request: requestComplete});
+            
+
+            return resolve(requestComplete);
+
+          });
+        });
+
+
+        }else {
+          winston.verbose('Request member '+ member+ ' already not found for request_id '+ request_id + ' and id_project '+ id_project);
+
+          return request
+          .populate('lead')
+          .populate('department')
+          .populate('participatingBots')
+          .populate('participatingAgents') 
+          // .populate('followers')   
+          .populate({path:'requester',populate:{path:'id_user'}})
+          .execPopulate( function(err, requestComplete) {
+            return resolve(requestComplete);
+          });
+        }
+                          
+      });
+    });
+  }
+
+
+
+
+
+
+
+
 }