@tiledesk/tiledesk-server 2.3.127 → 2.3.129

package/CHANGELOG.md

@@ -5,7 +5,126 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
-# 2.3.93 -> PROD v3
+
+
+# 2.3.127
+- Added Google OAuth Strategy
+- tiledesk/tiledesk-tybot-connector": "^0.1.76
+
+
+# 2.3.126
+- removed secret from faq_kb cache before caching
+- removed description and attributes from chabot subscription notifier to reduce the payload size
+
+# 2.3.125
+-  @tiledesk/tiledesk-tybot-connector@0.1.74
+
+# 2.3.124
+-  tiledesk/tiledesk-messenger-connector 0.1.8
+
+# 2.3.123
+-  tiledesk/tiledesk-messenger-connector 0.1.7
+
+# 2.3.122
+- new stripe
+- Updated dependency @tiledesk/tiledesk-tybot-connector to 0.1.73
+
+# 2.3.121
+- trial period to 14 days
+- tiledesk-ent/tiledesk-server-payments: 1.1.9 with new stripe plan
+- Updated dependency @tiledesk/tiledesk-tybot-connector to 0.1.72
+
+# 2.3.120
+- ocf fix
+
+# 2.3.119
+- Updated dependency @tiledesk/tiledesk-tybot-connector to 0.1.71
+
+# 2.3.118
+-  tiledesk/tiledesk-messenger-connector 0.1.3
+
+# 2.3.117
+- Updated dependency @tiledesk/tiledesk-tybot-connector to 0.1.70
+
+# 2.3.116
+- tiledesk/tiledesk-dialogflow-connector": "^1.8.4",
+
+# 2.3.115
+- github action fix
+
+# 2.3.113
+- tiledesk-ent/tiledesk-server-payments: 1.1.7 with new stripe plan
+- Updated dependency @tiledesk/tiledesk-tybot-connector to 0.1.68
+- tiledesk-whatsapp-connector 0.1.41
+
+# 2.3.112
+- fb messenger fix
+
+# 2.3.111
+- Updated dependency @tiledesk/tiledesk-tybot-connector to 0.1.67
+- facebook messenger plugin added 
+
+# 2.3.110
+- websocket fix ATTENTION change value by reference
+- Bugfix: Cannot read property 'toString' of undefined at /usr/src/app/services/requestService.js:404
+- Updated tiledesk/tiledesk-whatsapp-connector 0.1.40
+- Implmented request /agent endpoint (also support request with empty deparment generated by direct agent/bot assignment with participants field)
+- fixed bug: fields webhook_enabled and webhook_url was ignored on “publish”
+
+# 2.3.109
+- Added support gif mimetype for image endpoint 
+
+# 2.3.108
+- BugFix Chat21 event emitter listener changes request attributes values by reference
+- Restored populate for message endpoint
+- Test attributes send message
+
+# 2.3.107
+- bugfix execPopulate message endpoint wrong attributes
+- Dependency updated tiledesk-whatsapp-connector 0.1.39
+
+
+# 2.3.106
+@tiledesk/tiledesk-tybot-connector 0.1.63
+{{dateFormat request.createdAt \"DD/MM/YYYY HH:mm:ss\"}}
+# 2.3.105
+- tiledesk/tiledesk-apps: 1.0.14
+
+# 2.3.104
+- apps module auth fix
+
+# 2.3.103 
+- Fix image not found bug
+
+# 2.3.102
+- Fix image not found bug
+
+# 2.3.101
+- created property entity and endpoint
+- JSON_BODY_LIMIT env variable fix
+
+# 2.3.100
+- added filter by tags for lead endpoint
+
+# 2.3.99
+- tags field changed to flat object
+
+# 2.3.98
+- Ocf fix
+
+# 2.3.97
+- Updated dependency @tiledesk/tiledesk-tybot-connector to 0.1.62
+
+# 2.3.96
+- image endpoint set content type and length headers
+
+# 2.3.95
+- Bugfix when a conversation has a first_text with \agent
+
+# 2.3.94
+- log fix
+
+# 2.3.93
 - subscriptionNotifier secret fix
 
 # 2.3.92

package/models/profile.js

@@ -29,6 +29,15 @@ var ProfileSchema = new Schema({
   subscriptionId:  {
     type: String,
   },
+  extra1:  {
+    type: String,
+  },
+  extra2:  {
+    type: String,
+  },
+  extra3:  {
+    type: String,
+  },
   subscription_creation_date: {
     type: Date,
   },

package/package.json

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

package/pubmodules/trigger/rulesTrigger.js

@@ -146,6 +146,7 @@ class RulesTrigger {
 
           if (text && text.endsWith(":tdk_msg_subtype_info")) {            
             attributes.subtype = "info";
+            //TODO ATTENTION change value by reference text. Text is string so string is passed by value. No problem
             text = text.replace(':tdk_msg_subtype_info', '');
             winston.verbose('tdk_msg_subtype_info');
           }
@@ -250,7 +251,8 @@ class RulesTrigger {
               //custom ocf here
                                                   //prod                                                          //pre
               if (eventTrigger.event.id_project =="6406e34727b57500120b1bd6" || eventTrigger.event.id_project == "642c609f179910002cc56b3e") {
-                subject = "Richiesta di supporto #" + eventTrigger.event.ticket_id;
+                // subject = "Richiesta di supporto #" + eventTrigger.event.ticket_id;
+                subject = "Segnalazione #" + eventTrigger.event.ticket_id;
                 if (eventTrigger.event.subject) {
                   subject = subject + " - " + eventTrigger.event.subject;
                 } 
@@ -758,6 +760,7 @@ class RulesTrigger {
           winston.debug('runAction action preflight: ' + preflight);
 
           if (text && text.indexOf(":tdk_msg_subtype_info")>-1) {
+          //TODO ATTENTION change value by reference text subtype. Text is string so string is passed by value. No problem
 
             subtype = "info";
             text = text.replace(':tdk_msg_subtype_info', '');
@@ -766,6 +769,7 @@ class RulesTrigger {
 
           if (text && text.indexOf(":tdk_req_status_hidden")>-1) {
 
+            //TODO ATTENTION change value by reference status preflight text. Text is string so string is passed by value. No problem
             status = 50;
             preflight = true;
             text = text.replace(':tdk_req_status_hidden', '');

package/routes/email.js

@@ -32,6 +32,276 @@ router.post('/test/send',
     
 });
 
+
+if (process.env.ENABLE_TEST_EMAIL_ENDPOINT==true || process.env.ENABLE_TEST_EMAIL_ENDPOINT=="true") {
+
+
+  router.post('/test/sendNewAssignedRequestNotification', 
+  async (req, res) => {
+
+    let to = req.body.to;
+    winston.debug("to",to);
+
+    let configEmail = req.body.config;
+    winston.debug("configEmail", configEmail);
+
+    let request = {
+      "_id" : "6316fe117c04320341200e8a",
+      "status" : 50,
+      "preflight" : true,
+      "hasBot" : false,
+      "participants" : [],
+      "priority" : "medium",
+      "request_id" : "support-group-123",
+      "first_text" : "first_text"
+    }
+
+    emailService.sendNewAssignedRequestNotification(to, request, req.project);
+    
+    res.json({"status":"delivering"});
+      
+  });
+
+
+  router.post('/test/sendNewAssignedAgentMessageEmailNotification', 
+  async (req, res) => {
+
+    let to = req.body.to;
+    winston.debug("to",to);
+
+    let configEmail = req.body.config;
+    winston.debug("configEmail", configEmail);
+
+    let request = {
+      "_id" : "6316fe117c04320341200e8a",
+      "status" : 50,
+      "preflight" : true,
+      "hasBot" : false,
+      "participants" : [],
+      "priority" : "medium",
+      "request_id" : "support-group-123",
+      "first_text" : "first_text"
+    }
+    let message = {
+      "text": "text",
+      "request": request
+    }
+                                                              //(to, request, project, message)
+    emailService.sendNewAssignedAgentMessageEmailNotification(to, request, req.project, message);
+    
+    res.json({"status":"delivering"});
+      
+  });
+
+
+
+
+
+  router.post('/test/sendNewPooledRequestNotification', 
+  async (req, res) => {
+
+    let to = req.body.to;
+    winston.debug("to",to);
+
+    let configEmail = req.body.config;
+    winston.debug("configEmail", configEmail);
+
+    let request = {
+      "_id" : "6316fe117c04320341200e8a",
+      "status" : 50,
+      "preflight" : true,
+      "hasBot" : false,
+      "participants" : [],
+      "priority" : "medium",
+      "request_id" : "support-group-123",
+      "first_text" : "first_text"
+    }
+                                                              
+    emailService.sendNewPooledRequestNotification(to, request, req.project);
+    
+    res.json({"status":"delivering"});
+      
+  });
+
+
+
+
+
+  router.post('/test/sendNewPooledMessageEmailNotification', 
+  async (req, res) => {
+
+    let to = req.body.to;
+    winston.debug("to",to);
+
+    let configEmail = req.body.config;
+    winston.debug("configEmail", configEmail);
+
+    let request = {
+      "_id" : "6316fe117c04320341200e8a",
+      "status" : 50,
+      "preflight" : true,
+      "hasBot" : false,
+      "participants" : [],
+      "priority" : "medium",
+      "request_id" : "support-group-123",
+      "first_text" : "first_text"
+    }
+    let message = {
+      "text": "text",
+      "request": request
+    }
+                                                              
+    emailService.sendNewPooledMessageEmailNotification(to, request, req.project, message);
+    
+    res.json({"status":"delivering"});
+      
+  });
+
+
+
+
+
+  router.post('/test/sendNewMessageNotification', 
+  async (req, res) => {
+
+    let to = req.body.to;
+    winston.debug("to",to);
+
+    let configEmail = req.body.config;
+    winston.debug("configEmail", configEmail);
+
+    let request = {
+      "_id" : "6316fe117c04320341200e8a",
+      "status" : 50,
+      "preflight" : true,
+      "hasBot" : false,
+      "participants" : [],
+      "priority" : "medium",
+      "request_id" : "support-group-123",
+      "first_text" : "first_text"
+    }
+    let message = {
+      "text": "text",
+      "request": request
+    }
+                    
+    // sendNewMessageNotification(to, message, project, tokenQueryString, sourcePage)
+    emailService.sendNewMessageNotification(to, message, req.project, "tokenQueryString", "sourcePage");
+    
+    res.json({"status":"delivering"});
+      
+  });
+
+
+
+  router.post('/test/sendEmailChannelNotification', 
+  async (req, res) => {
+
+    let to = req.body.to;
+    winston.debug("to",to);
+
+    let configEmail = req.body.config;
+    winston.debug("configEmail", configEmail);
+
+    let request = {
+      "_id" : "6316fe117c04320341200e8a",
+      "status" : 50,
+      "preflight" : true,
+      "hasBot" : false,
+      "participants" : [],
+      "priority" : "medium",
+      "request_id" : "support-group-123",
+      "first_text" : "first_text"
+    }
+    let message = {
+      "text": "text",
+      "request": request
+    }
+                    
+    // (to, message, project, tokenQueryString, sourcePage) 
+      emailService.sendEmailChannelNotification(to, message, req.project, "tokenQueryString", "sourcePage");
+    
+    res.json({"status":"delivering"});
+      
+  });
+
+
+
+
+  router.post('/test/sendFollowerNotification', 
+  async (req, res) => {
+
+    let to = req.body.to;
+    winston.debug("to",to);
+
+    let configEmail = req.body.config;
+    winston.debug("configEmail", configEmail);
+
+    let request = {
+      "_id" : "6316fe117c04320341200e8a",
+      "status" : 50,
+      "preflight" : true,
+      "hasBot" : false,
+      "participants" : [],
+      "priority" : "medium",
+      "request_id" : "support-group-123",
+      "first_text" : "first_text"
+    }
+    let message = {
+      "text": "text",
+      "request": request
+    }
+                    
+      emailService.sendFollowerNotification(to, message, req.project);
+    
+    res.json({"status":"delivering"});
+      
+  });
+
+
+
+  router.post('/test/sendRequestTranscript', 
+  async (req, res) => {
+
+    let to = req.body.to;
+    winston.debug("to",to);
+
+    let configEmail = req.body.config;
+    winston.debug("configEmail", configEmail);
+
+    let request = {
+      "_id" : "6316fe117c04320341200e8a",
+      "status" : 50,
+      "preflight" : true,
+      "hasBot" : false,
+      "participants" : [],
+      "priority" : "medium",
+      "request_id" : "support-group-123",
+      "first_text" : "first_text",
+      createdAt: new Date()
+
+    }
+    let messages = [{
+      "text": "text",
+      "request": request,
+      createdAt: new Date()
+    }]
+
+    // sendRequestTranscript(to, messages, request, project)
+
+                    
+      emailService.sendRequestTranscript(to, messages, request, req.project);
+    
+    res.json({"status":"delivering"});
+      
+  });
+
+
+}
+
+
+
+
 //TODO add cc
 router.post('/send', 
  async (req, res) => {

package/services/emailService.js

@@ -436,12 +436,15 @@ class EmailService {
     // cambiare in [Nicky:Dashboard Support] Assigned Chat
     // serve per aggiornare native... fai aggiornamento 
 
-    let subject = `[Tiledesk ${project ? project.name : '-'}] New Assigned Chat`;
+    let subjectDef = `[Tiledesk ${project ? project.name : '-'}] New Assigned Chat`;
 
     if (request.subject) {
-      subject = `[Tiledesk ${project ? project.name : '-'}] ${request.subject}`;
+      subjectDef = `[Tiledesk ${project ? project.name : '-'}] ${request.subject}`;
     }
 
+    let subject = that.formatText("assignedRequestSubject", subjectDef, request, project.settings);
+
+
     // if (request.ticket_id) {
     //   subject = `[Ticket #${request.ticket_id}] New Assigned Chat`;
     // }
@@ -583,19 +586,21 @@ class EmailService {
     }
 
 
-    let subject = `[Tiledesk ${project ? project.name : '-'}] New message`;
+    let subjectDef = `[Tiledesk ${project ? project.name : '-'}] New message`;
 
     if (request.subject) {
-      subject = `[Tiledesk ${project ? project.name : '-'}] ${request.subject}`;
+      subjectDef = `[Tiledesk ${project ? project.name : '-'}] ${request.subject}`;
     }
     if (request.ticket_id) {
-      subject = `[Ticket #${request.ticket_id}] New message`;
+      subjectDef = `[Ticket #${request.ticket_id}] New message`;
     }
     
     if (request.ticket_id && request.subject) {
-      subject = `[Ticket #${request.ticket_id}] ${request.subject}`;
+      subjectDef = `[Ticket #${request.ticket_id}] ${request.subject}`;
     }
 
+    let subject = that.formatText("assignedEmailMessageSubject", subjectDef, request, project.settings);
+
 
 
     that.send({
@@ -727,11 +732,15 @@ class EmailService {
       }
     }
 
-    let subject = `[Tiledesk ${project ? project.name : '-'}] New Pooled Chat`;
+    let subjectDef = `[Tiledesk ${project ? project.name : '-'}] New Pooled Chat`;
 
     if (request.subject) {
-      subject = `[Tiledesk ${project ? project.name : '-'}] ${request.subject}`;
+      subjectDef = `[Tiledesk ${project ? project.name : '-'}] ${request.subject}`;
     }
+
+    let subject = that.formatText("pooledRequestSubject", subjectDef, request, project.settings);
+
+
     // if (request.ticket_id) {
     //   subject = `[Ticket #${request.ticket_id}] New Pooled Chat`;
     // }
@@ -868,19 +877,21 @@ class EmailService {
     }
 
 
-    let subject = `[Tiledesk ${project ? project.name : '-'}] New Message`;
+    let subjectDef = `[Tiledesk ${project ? project.name : '-'}] New Message`;
 
     if (request.subject) {
-      subject = `[Tiledesk ${project ? project.name : '-'}] ${request.subject}`;
+      subjectDef = `[Tiledesk ${project ? project.name : '-'}] ${request.subject}`;
     }
     if (request.ticket_id) {
-      subject = `[Ticket #${request.ticket_id}] New Message`;
+      subjectDef = `[Ticket #${request.ticket_id}] New Message`;
     }
     
     if (request.ticket_id && request.subject) {
-      subject = `[Ticket #${request.ticket_id}] ${request.subject}`;
+      subjectDef = `[Ticket #${request.ticket_id}] ${request.subject}`;
     }
 
+    let subject = that.formatText("pooledEmailMessageSubject", subjectDef, request, project.settings);
+
 
     that.send({
       messageId: messageId,
@@ -1012,6 +1023,8 @@ class EmailService {
     }
 
 
+    let subject = that.formatText("newMessageSubject", `[Tiledesk ${project ? project.name : '-'}] New Offline Message`, message, project.settings);
+
     that.send({
       messageId: messageId,
       // sender: message.senderFullname, //must be an email
@@ -1020,7 +1033,7 @@ class EmailService {
       replyTo: replyTo, 
       inReplyTo: inReplyTo,
       references: references,
-      subject:`[Tiledesk ${project ? project.name : '-'}] New Offline Message`,    //TODO (anche per il cloud) aggiungere variabile env per cambiare i subjects
+      subject:subject,    //TODO (anche per il cloud) aggiungere variabile env per cambiare i subjects
       html:html, 
       config:configEmail, 
       headers: headers
@@ -1166,17 +1179,18 @@ class EmailService {
       }
     }
 
-    var subject = `R: ${message.request ? message.request.subject : '-'}`;  //gmail uses subject
+    //gmail uses subject
+    let subject = that.formatText("ticketSubject", `R: ${message.request ? message.request.subject : '-'}`, message, project.settings);
 
     //ocf 
         //prod                                                      //pre
-    if (project._id =="6406e34727b57500120b1bd6" || project._id == "642c609f179910002cc56b3e") {
-      subject = "Richiesta di supporto #" + message.request.ticket_id;
-      if (message.request.subject) {
-        subject = subject + " - " + message.request.subject;
-      } 
-      // console.log("subject",subject);
-    }
+    // if (project._id =="6406e34727b57500120b1bd6" || project._id == "642c609f179910002cc56b3e") {
+    //   subject = "Richiesta di supporto #" + message.request.ticket_id;
+    //   if (message.request.subject) {
+    //     subject = subject + " - " + message.request.subject;
+    //   } 
+    //   // console.log("subject",subject);
+    // }
     
     // if (message.request && message.request.lead && message.request.lead.email) {
     //   winston.info("message.request.lead.email: " + message.request.lead.email);
@@ -1349,6 +1363,8 @@ class EmailService {
     }
 
 
+    let subject = that.formatText("newMessageFollowerSubject", `${message.request ? message.request.ticket_id : '-'}`, message, project.settings);
+
   
     
     that.send({
@@ -1361,7 +1377,7 @@ class EmailService {
       inReplyTo: inReplyTo,
       references: references,
       // subject:`${message.request ? message.request.subject : '-'}`, 
-      subject:`${message.request ? message.request.ticket_id : '-'}`,  //gmail uses subject
+      subject: subject,  //gmail uses subject
       text:html, 
       html:html,
       config:configEmail, 
@@ -1814,15 +1830,17 @@ async sendRequestTranscript(to, messages, request, project) {
 
     //custom ocf here
     // console.log("ocf",project._id);
-    let subject = '[Tiledesk] Transcript';        
+    let subject = that.formatText("sendTranscriptSubject", '[Tiledesk] Transcript', request, project.settings);
+
          //prod                                               //pre
-    if (project._id =="6406e34727b57500120b1bd6" || project._id == "642c609f179910002cc56b3e") {
-      subject = "Richiesta di supporto #" + request.ticket_id;
-      if (request.subject) {
-        subject = subject + " - " + request.subject;
-      } 
-      // console.log("subject",subject);
-    }
+    // if (project._id =="6406e34727b57500120b1bd6" || project._id == "642c609f179910002cc56b3e") {
+    //   subject = "Segnalazione #" + request.ticket_id;
+    //   // subject = "Richiesta di supporto #" + request.ticket_id;
+    //   if (request.subject) {
+    //     subject = subject + " - " + request.subject;
+    //   } 
+    //   // console.log("subject",subject);
+    // }
     // hcustomization.emailTranscript(to, subject, html, configEmail)
 
     that.send({from:from, to:to, subject: subject, html:html, config: configEmail});
@@ -1830,6 +1848,72 @@ async sendRequestTranscript(to, messages, request, project) {
 
 }
 
+formatText(templateName, defaultText, payload, settings) {
+
+  let text = defaultText;
+  winston.verbose("formatText defaultText: "+ defaultText);
+
+  let template = this.getTemplate(templateName, settings);
+
+  winston.verbose("formatText template: "+ template);
+
+  if (template) {
+    text = template;
+  }
+
+  var baseScope = JSON.parse(JSON.stringify(this));
+  delete baseScope.pass;
+
+  winston.verbose("formatText text: "+ text);
+
+  var templateHand = handlebars.compile(text);
+
+  var replacements = {        
+    payload: payload,  
+    baseScope: baseScope,
+    test: "test"
+  };
+
+  var textTemplate = templateHand(replacements);
+  winston.verbose("formatText textTemplate: "+ textTemplate);
+
+  return textTemplate;
+
+}
+
+getTemplate(templateName, settings) {
+
+   var that = this;
+    winston.verbose('getTemplate formatSubject: ' + JSON.stringify(settings)); 
+    
+
+    winston.verbose('getTemplate settings.email.templates: ',settings.email.templates); 
+      if (settings && settings.email && settings.email.templates) {
+
+       var templates = settings.email.templates;
+       winston.verbose('getTemplate templates: ',templates); 
+
+       var templateDbName = templateName.replace(".subject", "");
+       winston.verbose('getTemplate templateDbName: '+templateDbName); 
+
+
+       var template = templates[templateDbName];
+       winston.verbose('getTemplate template: '+template); 
+
+        if (template) {
+        // that.callback(template);
+          // return new Promise(function (resolve, reject) {
+            // return resolve(template);
+            return template;
+          // });
+        }else {
+          return undefined;
+        }      
+      } else {
+        return undefined;
+      } 
+
+}