@tiledesk/tiledesk-server 2.2.38 → 2.3.1-8.1

package/services/banUserNotifier.js

@@ -0,0 +1,86 @@
+var messageService = require("./messageService");
+var projectEvent = require("../event/projectEvent");
+
+var winston = require('../config/winston');
+
+var MessageConstants = require("../models/messageConstants");
+
+class BanUserNotifier {
+
+    listen() {
+        projectEvent.on("project.update.user.ban", function(data) {
+            var project=data.project;
+            var banInfo = data.banInfo;
+
+            winston.debug("User Banned");
+
+            var message = {
+                sender: 'system',
+                senderFullname: 'Bot',
+                recipient: banInfo.id,
+                recipientFullname: banInfo.id,
+                text: "User Banned",
+                id_project: project._id,
+                createdBy: "system",
+                attributes: {subtype:"info", messagelabel: {key: "USER_BANNED"} },
+                channel_type: MessageConstants.CHANNEL_TYPE.DIRECT,
+                status: MessageConstants.CHAT_MESSAGE_STATUS.SENDING,
+                // channel: {name: "chat21"}
+            };
+            messageService.save(message);
+            winston.info("User banned", message);
+            // messageService.send(
+            //     'system', 
+            //     'Bot',                                     
+            //     banInfo.id,
+            //     "User Banned", 
+            //     project._id,
+            //     'system', 
+            //     {subtype:"info"},
+            //     undefined,
+            //     undefined
+            // );
+        });
+        projectEvent.on("project.update.user.unban", function(data) {
+            var project=data.project;
+            var banInfo = data.banInfo;
+
+            winston.debug("User UnBanned: "+banInfo);
+
+            // var message = {
+            //     sender: 'system',
+            //     senderFullname: 'Bot',
+            //     recipient: banInfo,
+            //     recipientFullname: banInfo,
+            //     text: "User Unbanned",
+            //     id_project: project._id,
+            //     createdBy: "system",
+            //     attributes: {subtype:"info", messagelabel: {key: "USER_BANNED"}},
+            //     channel_type: MessageConstants.CHANNEL_TYPE.DIRECT,
+            //     status: MessageConstants.CHAT_MESSAGE_STATUS.SENDING,
+            // };
+            // messageService.save(message);
+            // winston.info("User UnBanned", message);
+
+
+            
+
+            // messageService.send(
+            //     'system', 
+            //     'Bot',                                     
+            //     banInfo.id,
+            //     "User Unbanned", 
+            //     project._id,
+            //     'system', 
+            //     {subtype:"info"},
+            //     undefined,
+            //     undefined
+            // );
+        });
+    }
+
+}
+var banUserNotifier = new BanUserNotifier();
+
+
+module.exports = banUserNotifier;

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/faqBotHandler.js

@@ -10,7 +10,6 @@ var BotFromParticipant = require("../utils/botFromParticipant");
 var cacheUtil = require('../utils/cacheUtil');
 var eventService = require('../pubmodules/events/eventService');
 var mongoose = require('mongoose');
-const { TiledeskChatbotUtil } = require('@tiledesk/tiledesk-chatbot-util');
 const ActionsConstants = require('../models/actionsConstants');
 var httpUtil = require('../utils/httpUtil');
 
@@ -138,7 +137,7 @@ class FaqBotHandler {
 
            
 
-
+            // EXACT MATCH
             Faq.find(query) 
             .lean().               
              exec(async (err, faqs) => {
@@ -301,6 +300,7 @@ class FaqBotHandler {
                 }               
         
             
+                
                 Faq.find(query,  mongoproject)  
                 .sort(sort) 
                 .lean().               

package/services/faqBotSupport.js

@@ -4,7 +4,6 @@
 
 const Faq = require('../models/faq');
 const Faq_kb = require('../models/faq_kb');
-const MessageConstants = require('../models/messageConstants');
 var winston = require('../config/winston');
 
 var jwt = require('jsonwebtoken');

package/services/faqService.js

@@ -39,7 +39,7 @@ class FaqService {
           
           winston.debug('type '+ type)      
 
-          if (type==="internal") {      
+          if (type==="internal" || type==="tilebot") {      
             
             if (!template) {
               template = "example";
@@ -78,7 +78,7 @@ class FaqService {
           { 'question': '\\start', 'answer': 'Hello 👋. I\'m a bot 🤖.\n\nChoose one of the options below or write a message to reach our staff.\n* Who are you?\n* Where are you?\n* What can you do?\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'start', 'topic': 'internal' },            
           { 'question': 'defaultFallback', 'answer': 'I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Back to start tdAction:start\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'defaultFallback', 'topic': 'internal' }, //TODO se metto spazio n * nn va      
           { 'question': 'What can you do?', 'answer': 'Using natural language processing, I\'m able to find the best answer for your users. I also support images, videos etc.. Let\'s try:\n* Sample Image\n* Sample Video\n* Sample Action tdAction:action1\n* Sample Frame\n* Back to start tdAction:start', 'topic': 'sample' },    
-          { 'question': 'Sample Image', 'answer': 'tdImage:https://tiledesk.com/tiledesk-logo-x1.png\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
+          { 'question': 'Sample Image', 'answer': 'tdImage:https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
           { 'question': 'Sample Frame', 'answer': 'tdFrame:https://www.emanueleferonato.com/wp-content/uploads/2019/02/runner/\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
           { 'question': 'Sample Video', 'answer': 'tdVideo:https://www.youtube.com/embed/EngW7tLk6R8\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
           { 'question': 'Where are you?', 'answer': 'We are here ❤️\ntdFrame:https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d6087916.923447935!2d8.234804542117423!3d41.836572992140624!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x12d4fe82448dd203%3A0xe22cf55c24635e6f!2sItaly!5e0!3m2!1sen!2sit!4v1613657475377!5m2!1sen!2sit\n* Back to start tdAction:start', 'topic': 'sample' },    

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