@tiledesk/tiledesk-server 2.4.100 → 2.4.101

package/services/emailService.js

@@ -7,8 +7,9 @@ var winston = require('../config/winston');
 var marked = require('marked');
 var handlebars = require('handlebars');
 var encode = require('html-entities').encode;
+const emailEvent = require('../event/emailEvent');
 
-handlebars.registerHelper('ifEquals', function(arg1, arg2, options) {
+handlebars.registerHelper('ifEquals', function (arg1, arg2, options) {
   return (arg1 == arg2) ? options.fn(this) : options.inverse(this);
 });
 
@@ -33,14 +34,14 @@ const MaskData = require("maskdata");
 
 const maskOptions = {
   // Character to mask the data. default value is '*'
-  maskWith : "*",
+  maskWith: "*",
   // If the starting 'n' digits needs to be unmasked
   // Default value is 4
-  unmaskedStartDigits : 3, //Should be positive Integer
+  unmaskedStartDigits: 3, //Should be positive Integer
   //If the ending 'n' digits needs to be unmasked
   // Default value is 1
-  unmaskedEndDigits : 3 // Should be positive Integer
-  };
+  unmaskedEndDigits: 3 // Should be positive Integer
+};
 
 // const X_REQUEST_ID_HEADER_KEY = "X-TILEDESK-REQUEST-ID";
 // const X_TICKET_ID_HEADER_KEY = "X-TILEDESK-TICKET-ID";
@@ -55,46 +56,46 @@ class EmailService {
   constructor() {
 
     this.enabled = false;
-    if (process.env.EMAIL_ENABLED ==="true" || process.env.EMAIL_ENABLED === true ) {
+    if (process.env.EMAIL_ENABLED === "true" || process.env.EMAIL_ENABLED === true) {
       this.enabled = true;
     }
 
-    winston.info('EmailService enabled: '+ this.enabled);
+    winston.info('EmailService enabled: ' + this.enabled);
 
     this.baseUrl = process.env.EMAIL_BASEURL || config.baseUrl;
-    winston.info('EmailService baseUrl: '+ this.baseUrl);
-    
+    winston.info('EmailService baseUrl: ' + this.baseUrl);
+
     this.apiUrl = process.env.API_URL || configGlobal.apiUrl;
-    winston.info('EmailService apiUrl: '+ this.apiUrl);
+    winston.info('EmailService apiUrl: ' + this.apiUrl);
 
     this.from = process.env.EMAIL_FROM_ADDRESS || config.from;
-    winston.info('EmailService from email: '+ this.from);
+    winston.info('EmailService from email: ' + this.from);
 
     this.bcc = process.env.EMAIL_BCC || config.bcc;
-    winston.info('EmailService bcc address: '+ this.bcc);
+    winston.info('EmailService bcc address: ' + this.bcc);
 
     this.replyEnabled = config.replyEnabled;
-    if (process.env.EMAIL_REPLY_ENABLED  === "true" || process.env.EMAIL_REPLY_ENABLED === true ) {
+    if (process.env.EMAIL_REPLY_ENABLED === "true" || process.env.EMAIL_REPLY_ENABLED === true) {
       this.replyEnabled = true;
     }
-    winston.info('EmailService replyEnabled : '+ this.replyEnabled);
+    winston.info('EmailService replyEnabled : ' + this.replyEnabled);
 
     // this is used as fixed reply to url, but this is unused we always return support-group-dynamic
     this.replyTo = process.env.EMAIL_REPLY_TO || config.replyTo;
-    winston.info('EmailService replyTo address: '+ this.replyTo);
+    winston.info('EmailService replyTo address: ' + this.replyTo);
 
-    this.inboundDomain = process.env.EMAIL_INBOUND_DOMAIN || config.inboundDomain;         
-    winston.info('EmailService inboundDomain : '+ this.inboundDomain);
-    
-    this.inboundDomainDomainWithAt = "@"+this.inboundDomain;
-    winston.verbose('EmailService inboundDomainDomainWithAt : '+ this.inboundDomainDomainWithAt);
+    this.inboundDomain = process.env.EMAIL_INBOUND_DOMAIN || config.inboundDomain;
+    winston.info('EmailService inboundDomain : ' + this.inboundDomain);
+
+    this.inboundDomainDomainWithAt = "@" + this.inboundDomain;
+    winston.verbose('EmailService inboundDomainDomainWithAt : ' + this.inboundDomainDomainWithAt);
 
     this.pass = process.env.EMAIL_PASSWORD;
 
     var maskedemailPassword;
     if (this.pass) {
       maskedemailPassword = MaskData.maskPhone(this.pass, maskOptions);
-    }else {
+    } else {
       maskedemailPassword = this.pass;
     }
 
@@ -103,26 +104,26 @@ class EmailService {
     this.host = process.env.EMAIL_HOST || config.host;
     winston.info('EmailService host: ' + this.host);
 
-    this.secure  = false;     
-    if (process.env.EMAIL_SECURE == "true" || process.env.EMAIL_SECURE ==true) {
-      this.secure  = true;     
+    this.secure = false;
+    if (process.env.EMAIL_SECURE == "true" || process.env.EMAIL_SECURE == true) {
+      this.secure = true;
     }
     // this.secure  = process.env.EMAIL_SECURE || false;     
     winston.info('EmailService secure: ' + this.secure);
 
-    this.user  = process.env.EMAIL_USERNAME || config.username;
+    this.user = process.env.EMAIL_USERNAME || config.username;
     winston.info('EmailService username: ' + this.user);
 
-    this.port  = process.env.EMAIL_PORT;  //default is 587
+    this.port = process.env.EMAIL_PORT;  //default is 587
     winston.info('EmailService port: ' + this.port);
 
 
     this.markdown = true;
-    if (process.env.EMAIL_MARKDOWN =="false" || process.env.EMAIL_MARKDOWN ==false) {
+    if (process.env.EMAIL_MARKDOWN == "false" || process.env.EMAIL_MARKDOWN == false) {
       this.markdown = false;
     }
     // this.markdown = process.env.EMAIL_MARKDOWN || true;
-    winston.info('EmailService markdown: '+ this.markdown);
+    winston.info('EmailService markdown: ' + this.markdown);
 
     this.headers = {
       // "X-Mailer": "Tiledesk Mailer",
@@ -131,7 +132,7 @@ class EmailService {
 
     this.ccEnabled = false //cc creates loop when you send an email with cc: support@tiledesk.com -> Tiledesk generates an email with ticket id with in cc support@tiledesk.com that loop 
 
-    if (process.env.EMAIL_CC_ENABLED ==="true" || process.env.EMAIL_CC_ENABLED === true ) {
+    if (process.env.EMAIL_CC_ENABLED === "true" || process.env.EMAIL_CC_ENABLED === true) {
       this.ccEnabled = true;
     }
     winston.info('EmailService ccEnabled: ' + this.ccEnabled);
@@ -141,49 +142,49 @@ class EmailService {
   readTemplate(templateName, settings) {
     // aggiunsta questo
     var that = this;
-    winston.debug('EmailService readTemplate: '+ templateName + '  ' + JSON.stringify(settings)); 
-    
+    winston.debug('EmailService readTemplate: ' + templateName + '  ' + JSON.stringify(settings));
+
 
-      if (settings && settings.email && settings.email.templates) {
+    if (settings && settings.email && settings.email.templates) {
 
-       var templates = settings.email.templates;
-       winston.debug('EmailService templates: ',templates); 
+      var templates = settings.email.templates;
+      winston.debug('EmailService templates: ', templates);
 
-       var templateDbName = templateName.replace(".html", "");
-       winston.debug('EmailService templateDbName: '+templateDbName); 
+      var templateDbName = templateName.replace(".html", "");
+      winston.debug('EmailService templateDbName: ' + templateDbName);
 
 
-       var template = templates[templateDbName];
-       winston.debug('EmailService template: '+template); 
+      var template = templates[templateDbName];
+      winston.debug('EmailService template: ' + template);
 
-        if (template) {
+      if (template) {
         // that.callback(template);
-          return new Promise(function (resolve, reject) {
-            return resolve(template);
-          });
-        }else {
-          return that.readTemplateFile(templateName);
-        }      
+        return new Promise(function (resolve, reject) {
+          return resolve(template);
+        });
       } else {
         return that.readTemplateFile(templateName);
-      } 
+      }
+    } else {
+      return that.readTemplateFile(templateName);
+    }
   }
   readTemplateFile(templateName) {
     // var that = this;
     return new Promise(function (resolve, reject) {
-      fs.readFile(appRoot + '/template/email/'+templateName, {encoding: 'utf-8'}, function (err, html) {
-          if (err) {
-              winston.error('error readTemplateFile getting ', err);
-              // callback(err);
-              return reject(err);
-          }
-          else {
-              // callback(null, html);
-              return resolve(html);
-          }
-      }); 
+      fs.readFile(appRoot + '/template/email/' + templateName, { encoding: 'utf-8' }, function (err, html) {
+        if (err) {
+          winston.error('error readTemplateFile getting ', err);
+          // callback(err);
+          return reject(err);
+        }
+        else {
+          // callback(null, html);
+          return resolve(html);
+        }
+      });
     });
-};
+  };
 
 
   getTransport(configEmail) {
@@ -192,21 +193,21 @@ class EmailService {
       configEmail = {
         host: this.host,
         port: this.port, // defaults to 587 if is secure is false or 465 if true
-        secure: this.secure,         
+        secure: this.secure,
         user: this.user,
-        pass: this.pass      
+        pass: this.pass
       }
       winston.debug("getTransport initialized with default");
     } else {
       winston.verbose("getTransport custom", configEmail);
     }
 
-    winston.debug("getTransport configEmail: "+ JSON.stringify(configEmail));
+    winston.debug("getTransport configEmail: " + JSON.stringify(configEmail));
 
     let transport = {
       host: configEmail.host,
       port: configEmail.port, // defaults to 587 if is secure is false or 465 if true
-      secure: configEmail.secure, 
+      secure: configEmail.secure,
       auth: {
         user: configEmail.user,
         pass: configEmail.pass
@@ -216,11 +217,11 @@ class EmailService {
       //   ciphers:'SSLv3'
       // },
 
-// 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"
+      // 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",
@@ -231,7 +232,7 @@ class EmailService {
       // }
     };
 
-    winston.debug("getTransport transport: ",transport);
+    winston.debug("getTransport transport: ", transport);
 
     // create reusable transporter object using the default SMTP transport
     let transporter = nodemailer.createTransport(transport);
@@ -243,16 +244,32 @@ class EmailService {
   //   return this.sendMail({to:to, subject:subject, html:html});
   // }
 
-  send(mail) {
+  async send(mail, quoteEnabled, project, quoteManager) {
 
     if (!this.enabled) {
       winston.info('EmailService is disabled. Not sending email');
       return 0;
     }
-    if (process.env.NODE_ENV == 'test')  {	
+    if (process.env.NODE_ENV == 'test') {
       return winston.warn("EmailService not sending email for testing");
     }
 
+    let payload = { project: project }
+    if (quoteEnabled && quoteEnabled === true) {
+      mail.createdAt = new Date();
+      payload.email = mail;
+
+      if (quoteManager) {
+        let result = await quoteManager.checkQuote(project, mail, 'email');
+        if (result === false) {
+          // Stop
+          winston.verbose('Unable to send email - Quota exceeded')
+          return false;
+        }
+      }
+    }
+
+
     let mailOptions = {
       from: mail.from || this.from, // sender address
       to: mail.to,
@@ -266,33 +283,38 @@ class EmailService {
       html: mail.html,
 
       headers: mail.headers || this.headers,
-      
+
       messageId: mail.messageId,
       sender: mail.sender
     };
 
     winston.debug('mailOptions', mailOptions);
-    winston.debug(' mail.config',  mail.config);
-   
+    winston.debug(' mail.config', mail.config);
+
     if (!mail.to) {
       return winston.warn("EmailService send method. to field is not defined", mailOptions);
     }
 
     // send mail with defined transport object
     this.getTransport(mail.config).sendMail(mailOptions, (error, info) => {
-      if (error) {    
-        if (mail.callback){
-          mail.callback(error, {info:info});
+      if (error) {
+        if (mail.callback) {
+          mail.callback(error, { info: info });
         }
-        return winston.error("Error sending email ", {error:error,  mailConfig: mail.config, mailOptions:mailOptions});
+        return winston.error("Error sending email ", { error: error, mailConfig: mail.config, mailOptions: mailOptions });
       }
-      winston.verbose('Email sent:', {info: info});
-      winston.debug('Email sent:', {info: info, mailOptions: mailOptions});
+      winston.verbose('Email sent:', { info: info });
+      winston.debug('Email sent:', { info: info, mailOptions: mailOptions });
 
-      if (mail.callback){
-        mail.callback(error, {info:info});
+      if (quoteEnabled && quoteEnabled === true) {
+        emailEvent.emit('email.send.quote', payload);
+        winston.verbose("email.send.quote event emitted");
       }
-      
+
+      if (mail.callback) {
+        mail.callback(error, { info: info });
+      }
+
       // Preview only available when sending through an Ethereal account
       // winston.debug('Preview URL: %s', nodemailer.getTestMessageUrl(info));
 
@@ -302,26 +324,26 @@ class EmailService {
   }
 
 
-  async sendTest(to, configEmail, callback) {      
+  async sendTest(to, configEmail, callback) {
 
     var that = this;
 
-    var html = await this.readTemplate('test.html',{ "email" : {"templates": {test: "123"}}});
+    var html = await this.readTemplate('test.html', { "email": { "templates": { test: "123" } } });
 
     var template = handlebars.compile(html);
 
-    var replacements = {              
+    var replacements = {
     };
 
     var html = template(replacements);
-    
-    return that.send({to:to, subject:`Tiledesk test email`, config: configEmail, html: html, callback: callback});
-    
+
+    return that.send({ to: to, subject: `Tiledesk test email`, config: configEmail, html: html, callback: callback });
+
   }
 
 
 
-  async sendNewAssignedRequestNotification(to, request, project) {      
+  async sendNewAssignedRequestNotification(to, request, project) {
 
     var that = this;
 
@@ -337,10 +359,10 @@ class EmailService {
     var html = await this.readTemplate('assignedRequest.html', project.settings);
 
     var envTemplate = process.env.EMAIL_ASSIGN_REQUEST_HTML_TEMPLATE;
-      winston.debug("envTemplate: " + envTemplate);
+    winston.debug("envTemplate: " + envTemplate);
 
     if (envTemplate) {
-        html = envTemplate;
+      html = envTemplate;
     }
 
     winston.debug("html: " + html);
@@ -351,7 +373,7 @@ class EmailService {
     delete baseScope.pass;
 
     // passa anche tutti i messages in modo da stampare tutto
-// Stampa anche contact.email
+    // Stampa anche contact.email
 
 
     let msgText = request.first_text;//.replace(/[\n\r]/g, '<br>');
@@ -361,11 +383,11 @@ class EmailService {
     if (this.markdown) {
       msgText = marked(msgText);
     }
-    
-    
+
+
     winston.debug("msgText: " + msgText);
 
-    var replacements = {        
+    var replacements = {
       request: request,
       project: project,
       msgText: msgText,
@@ -378,7 +400,7 @@ class EmailService {
     var html = template(replacements);
     winston.debug("html after: " + html);
 
-  
+
     let messageId = "notification" + "@" + MESSAGE_ID_DOMAIN;
 
     let replyTo;
@@ -387,19 +409,19 @@ class EmailService {
     }
 
     let headers;
-    if (request) { 
-      
-        messageId = request.request_id + "+" + messageId;
-
-        if (request.attributes && request.attributes.email_replyTo) {
-          replyTo = request.attributes.email_replyTo;
-        }        
-    
+    if (request) {
+
+      messageId = request.request_id + "+" + messageId;
+
+      if (request.attributes && request.attributes.email_replyTo) {
+        replyTo = request.attributes.email_replyTo;
+      }
+
       headers = {
-                  "X-TILEDESK-PROJECT-ID": project._id, 
-                  "X-TILEDESK-REQUEST-ID": request.request_id, 
-                  "X-TILEDESK-TICKET-ID":request.ticket_id,
-                };
+        "X-TILEDESK-PROJECT-ID": project._id,
+        "X-TILEDESK-REQUEST-ID": request.request_id,
+        "X-TILEDESK-TICKET-ID": request.ticket_id,
+      };
 
       winston.debug("messageId: " + messageId);
       winston.debug("replyTo: " + replyTo);
@@ -411,13 +433,13 @@ class EmailService {
     if (request.attributes) {
       if (request.attributes.email_messageId) {
         inReplyTo = request.attributes.email_messageId;
-        }
-        if (request.attributes.email_references) {
+      }
+      if (request.attributes.email_references) {
         references = request.attributes.email_references;
-        }
+      }
     }
-    winston.debug("email inReplyTo: "+ inReplyTo);
-    winston.debug("email references: "+ references);
+    winston.debug("email inReplyTo: " + inReplyTo);
+    winston.debug("email references: " + references);
 
     let from;
     let configEmail;
@@ -428,7 +450,7 @@ class EmailService {
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.debug("custom from email setting found: "+ from);
+        winston.debug("custom from email setting found: " + from);
       }
     }
 
@@ -448,40 +470,40 @@ class EmailService {
     // if (request.ticket_id) {
     //   subject = `[Ticket #${request.ticket_id}] New Assigned Chat`;
     // }
-    
+
     // if (request.ticket_id && request.subject) {
     //   subject = `[Ticket #${request.ticket_id}] ${request.subject}`;
     // }
 
     that.send({
       messageId: messageId,
-      from:from, 
-      to:to, 
+      from: from,
+      to: to,
       replyTo: replyTo,
-      subject: subject, 
-      html:html, 
+      subject: subject,
+      html: html,
       config: configEmail,
-      headers:headers 
+      headers: headers
     });
 
-    messageId =  "notification" + messageId;
+    messageId = "notification" + messageId;
 
 
     // togliere bcc 
     that.send({
       messageId: messageId,
-      to: that.bcc, 
+      to: that.bcc,
       replyTo: replyTo,
-      subject: subject + ` ${to}  - notification`, 
-      html:html,
-      headers:headers 
+      subject: subject + ` ${to}  - notification`,
+      html: html,
+      headers: headers
     });
 
-    
+
   }
 
 
-  async sendNewAssignedAgentMessageEmailNotification(to, request, project, message) {      
+  async sendNewAssignedAgentMessageEmailNotification(to, request, project, message) {
 
     var that = this;
 
@@ -493,15 +515,15 @@ class EmailService {
     if (project.toJSON) {
       project = project.toJSON();
     }
-    
+
     var html = await this.readTemplate('assignedEmailMessage.html', project.settings);
 
 
     var envTemplate = process.env.EMAIL_ASSIGN_MESSAGE_EMAIL_HTML_TEMPLATE;
-      winston.debug("envTemplate: " + envTemplate);
+    winston.debug("envTemplate: " + envTemplate);
 
     if (envTemplate) {
-        html = envTemplate;
+      html = envTemplate;
     }
 
     winston.debug("html: " + html);
@@ -512,22 +534,22 @@ class EmailService {
     delete baseScope.pass;
 
     // passa anche tutti i messages in modo da stampare tutto
-// Stampa anche contact.email
+    // Stampa anche contact.email
 
-  let msgText = message.text;//.replace(/[\n\r]/g, '<br>');
-  msgText = encode(msgText);
-  if (this.markdown) {
-    msgText = marked(msgText);
-  }
+    let msgText = message.text;//.replace(/[\n\r]/g, '<br>');
+    msgText = encode(msgText);
+    if (this.markdown) {
+      msgText = marked(msgText);
+    }
 
-  winston.debug("msgText: " + msgText);
+    winston.debug("msgText: " + msgText);
 
-    var replacements = {        
+    var replacements = {
       request: request,
       project: project,
       message: message,
       msgText: msgText,
-      baseScope: baseScope    
+      baseScope: baseScope
     };
 
     winston.debug("replacements ", replacements);
@@ -544,15 +566,15 @@ class EmailService {
     }
 
     let headers;
-    if (message.request) { 
-      
-        messageId = message.request.request_id + "+" + messageId;
+    if (message.request) {
 
-        if (message.request.attributes && message.request.attributes.email_replyTo) {
+      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 };
+      }
+
+      headers = { "X-TILEDESK-PROJECT-ID": project._id, "X-TILEDESK-REQUEST-ID": message.request.request_id, "X-TILEDESK-TICKET-ID": message.request.ticket_id };
 
       winston.debug("sendNewAssignedAgentMessageEmailNotification messageId: " + messageId);
       winston.debug("sendNewAssignedAgentMessageEmailNotification replyTo: " + replyTo);
@@ -569,8 +591,8 @@ class EmailService {
         references = message.request.attributes.email_references;
       }
     }
-    winston.debug("sendNewAssignedAgentMessageEmailNotification email inReplyTo: "+ inReplyTo);
-    winston.debug("sendNewAssignedAgentMessageEmailNotification email references: "+ references);
+    winston.debug("sendNewAssignedAgentMessageEmailNotification email inReplyTo: " + inReplyTo);
+    winston.debug("sendNewAssignedAgentMessageEmailNotification email references: " + references);
 
     let from;
     let configEmail;
@@ -581,7 +603,7 @@ class EmailService {
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.debug("sendNewAssignedAgentMessageEmailNotification custom from email setting found: "+ from);
+        winston.debug("sendNewAssignedAgentMessageEmailNotification custom from email setting found: " + from);
       }
     }
 
@@ -594,7 +616,7 @@ class EmailService {
     if (request.ticket_id) {
       subjectDef = `[Ticket #${request.ticket_id}] New message`;
     }
-    
+
     if (request.ticket_id && request.subject) {
       subjectDef = `[Ticket #${request.ticket_id}] ${request.subject}`;
     }
@@ -605,34 +627,34 @@ class EmailService {
 
     that.send({
       messageId: messageId,
-      from:from, 
-      to:to, 
+      from: from,
+      to: to,
       replyTo: replyTo,
       // inReplyTo: inReplyTo,???
       // references: references,??
       subject: subject,
-      html:html, 
-      config: configEmail,        
-      headers:headers 
+      html: html,
+      config: configEmail,
+      headers: headers
     });
 
 
-  
-    messageId =  "notification" + messageId;
+
+    messageId = "notification" + messageId;
 
     that.send({
       messageId: messageId,
-      to: that.bcc, 
+      to: that.bcc,
       replyTo: replyTo,
-      subject: subject + ` - notification`, 
-      html:html,
-      headers:headers 
+      subject: subject + ` - notification`,
+      html: html,
+      headers: headers
     });
 
-    
+
   }
 
-  
+
   async sendNewPooledRequestNotification(to, request, project) {
 
     //if the request came from rabbit mq?
@@ -649,10 +671,10 @@ class EmailService {
     var html = await this.readTemplate('pooledRequest.html', project.settings);
 
     var envTemplate = process.env.EMAIL_POOLED_REQUEST_HTML_TEMPLATE;
-      winston.debug("envTemplate: " + envTemplate);
+    winston.debug("envTemplate: " + envTemplate);
 
     if (envTemplate) {
-        html = envTemplate;
+      html = envTemplate;
     }
 
     winston.debug("html: " + html);
@@ -662,8 +684,8 @@ class EmailService {
     var baseScope = JSON.parse(JSON.stringify(that));
     delete baseScope.pass;
 
-// passa anche tutti i messages in modo da stampare tutto
-// Stampa anche contact.email
+    // passa anche tutti i messages in modo da stampare tutto
+    // Stampa anche contact.email
 
     let msgText = request.first_text;//.replace(/[\n\r]/g, '<br>');
     msgText = encode(msgText);
@@ -673,16 +695,16 @@ class EmailService {
 
     winston.debug("msgText: " + msgText);
 
-    var replacements = {        
+    var replacements = {
       request: request,
       project: project,
       msgText: msgText,
-      baseScope: baseScope    
+      baseScope: baseScope
     };
-  
+
     var html = template(replacements);
 
-    
+
     let messageId = "notification-pooled" + new Date().getTime() + "@" + MESSAGE_ID_DOMAIN;
 
     let replyTo;
@@ -691,15 +713,15 @@ class EmailService {
     }
 
     let headers;
-    if (request) { 
-      
-        messageId = request.request_id + "+" + messageId;
+    if (request) {
+
+      messageId = request.request_id + "+" + messageId;
 
-        if (request.attributes && request.attributes.email_replyTo) {
+      if (request.attributes && request.attributes.email_replyTo) {
         replyTo = request.attributes.email_replyTo;
-        }         
+      }
 
-      headers = {"X-TILEDESK-PROJECT-ID": project._id, "X-TILEDESK-REQUEST-ID": request.request_id, "X-TILEDESK-TICKET-ID":request.ticket_id };
+      headers = { "X-TILEDESK-PROJECT-ID": project._id, "X-TILEDESK-REQUEST-ID": request.request_id, "X-TILEDESK-TICKET-ID": request.ticket_id };
 
       winston.debug("sendNewPooledRequestNotification messageId: " + messageId);
       winston.debug("sendNewPooledRequestNotification replyTo: " + replyTo);
@@ -711,13 +733,13 @@ class EmailService {
     if (request.attributes) {
       if (request.attributes.email_messageId) {
         inReplyTo = request.attributes.email_messageId;
-        }
-        if (request.attributes.email_references) {
+      }
+      if (request.attributes.email_references) {
         references = request.attributes.email_references;
-        }
+      }
     }
-    winston.debug("sendNewPooledRequestNotification email inReplyTo: "+ inReplyTo);
-    winston.debug("sendNewPooledRequestNotification email references: "+ references);
+    winston.debug("sendNewPooledRequestNotification email inReplyTo: " + inReplyTo);
+    winston.debug("sendNewPooledRequestNotification email references: " + references);
 
     let from;
     let configEmail;
@@ -728,7 +750,7 @@ class EmailService {
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.debug("sendNewPooledRequestNotification custom from email setting found: "+ from);
+        winston.debug("sendNewPooledRequestNotification custom from email setting found: " + from);
       }
     }
 
@@ -744,7 +766,7 @@ class EmailService {
     // if (request.ticket_id) {
     //   subject = `[Ticket #${request.ticket_id}] New Pooled Chat`;
     // }
-    
+
     // if (request.ticket_id && request.subject) {
     //   subject = `[Ticket #${request.ticket_id}] ${request.subject}`;
     // }
@@ -753,16 +775,16 @@ class EmailService {
 
     that.send({
       messageId: messageId,
-      from:from, 
-      to: to, 
+      from: from,
+      to: to,
       replyTo: replyTo,
-      subject: subject, 
-      html:html, 
-      config:configEmail,
-      headers:headers 
+      subject: subject,
+      html: html,
+      config: configEmail,
+      headers: headers
     });
-  // this.send(that.bcc, `[TileDesk ${project ? project.name : '-'}] New Pooled Request`, html);
-  
+    // this.send(that.bcc, `[TileDesk ${project ? project.name : '-'}] New Pooled Request`, html);
+
   }
 
 
@@ -773,7 +795,7 @@ class EmailService {
 
     var that = this;
 
-    
+
     //if the request came from rabbit mq?
     if (request.toJSON) {
       request = request.toJSON();
@@ -791,7 +813,7 @@ class EmailService {
 
 
     if (envTemplate) {
-        html = envTemplate;
+      html = envTemplate;
     }
 
     winston.debug("html: " + html);
@@ -810,14 +832,14 @@ class EmailService {
     winston.debug("msgText: " + msgText);
 
     // passa anche tutti i messages in modo da stampare tutto
-// Stampa anche contact.email
+    // Stampa anche contact.email
 
-    var replacements = {        
+    var replacements = {
       request: request,
       project: project,
       message: message,
       msgText: msgText,
-      baseScope: baseScope    
+      baseScope: baseScope
     };
 
     winston.debug("replacements ", replacements);
@@ -835,15 +857,15 @@ class EmailService {
     }
 
     let headers;
-    if (message.request) { 
-      
-        messageId = message.request.request_id + "+" + messageId;
+    if (message.request) {
 
-        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 };
+      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.debug("sendNewPooledMessageEmailNotification messageId: " + messageId);
       winston.debug("sendNewPooledMessageEmailNotification replyTo: " + replyTo);
@@ -860,8 +882,8 @@ class EmailService {
         references = message.request.attributes.email_references;
       }
     }
-    winston.debug("sendNewPooledMessageEmailNotification email inReplyTo: "+ inReplyTo);
-    winston.debug("sendNewPooledMessageEmailNotification email references: "+ references);
+    winston.debug("sendNewPooledMessageEmailNotification email inReplyTo: " + inReplyTo);
+    winston.debug("sendNewPooledMessageEmailNotification email references: " + references);
 
     let from;
     let configEmail;
@@ -872,7 +894,7 @@ class EmailService {
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.debug("sendNewPooledMessageEmailNotification custom from email setting found: "+ from);
+        winston.debug("sendNewPooledMessageEmailNotification custom from email setting found: " + from);
       }
     }
 
@@ -885,7 +907,7 @@ class EmailService {
     if (request.ticket_id) {
       subjectDef = `[Ticket #${request.ticket_id}] New Message`;
     }
-    
+
     if (request.ticket_id && request.subject) {
       subjectDef = `[Ticket #${request.ticket_id}] ${request.subject}`;
     }
@@ -895,19 +917,19 @@ class EmailService {
 
     that.send({
       messageId: messageId,
-      from:from, 
-      to:to, 
+      from: from,
+      to: to,
       replyTo: replyTo,
       // inReplyTo: inReplyTo,???
       // references: references,??
       subject: subject,
-      html:html, 
-      config: configEmail,        
-      headers:headers 
+      html: html,
+      config: configEmail,
+      headers: headers
     });
 
 
-  
+
     // messageId =  "notification" + messageId;
 
     // that.send({
@@ -919,7 +941,7 @@ class EmailService {
     //   headers:headers 
     // });
 
-    
+
   }
 
 
@@ -928,7 +950,7 @@ class EmailService {
     var that = this;
 
     //if the request came from rabbit mq?
-   
+
     if (project.toJSON) {
       project = project.toJSON();
     }
@@ -938,10 +960,10 @@ class EmailService {
 
 
     var envTemplate = process.env.EMAIL_NEW_MESSAGE_HTML_TEMPLATE;
-      winston.debug("envTemplate: " + envTemplate);
+    winston.debug("envTemplate: " + envTemplate);
 
     if (envTemplate) {
-        html = envTemplate;
+      html = envTemplate;
     }
 
     winston.debug("html: " + html);
@@ -959,13 +981,13 @@ class EmailService {
 
     winston.debug("msgText: " + msgText);
 
-    var replacements = {        
+    var replacements = {
       message: message,
       project: project,
-      msgText:msgText, 
+      msgText: msgText,
       seamlessPage: sourcePage,
       tokenQueryString: tokenQueryString,
-      baseScope: baseScope    
+      baseScope: baseScope
     };
 
     var html = template(replacements);
@@ -980,15 +1002,15 @@ class EmailService {
     }
 
     let headers;
-    if (message.request) { 
-      
-        messageId = message.request.request_id + "+" + messageId;
+    if (message.request) {
 
-        if (message.request.attributes && message.request.attributes.email_replyTo) {
+      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 };
+      }
+
+      headers = { "X-TILEDESK-PROJECT-ID": project._id, "X-TILEDESK-REQUEST-ID": message.request.request_id, "X-TILEDESK-TICKET-ID": message.request.ticket_id };
 
       winston.debug("messageId: " + messageId);
       winston.debug("replyTo: " + replyTo);
@@ -1006,8 +1028,8 @@ class EmailService {
         references = message.request.attributes.email_references;
       }
     }
-    winston.debug("email inReplyTo: "+ inReplyTo);
-    winston.debug("email references: "+ references);
+    winston.debug("email inReplyTo: " + inReplyTo);
+    winston.debug("email references: " + references);
 
     let from;
     let configEmail;
@@ -1018,7 +1040,7 @@ class EmailService {
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.debug("custom from email setting found: "+ from);
+        winston.debug("custom from email setting found: " + from);
       }
     }
 
@@ -1028,35 +1050,35 @@ class EmailService {
     that.send({
       messageId: messageId,
       // sender: message.senderFullname, //must be an email
-      from:from, 
-      to:to, 
-      replyTo: replyTo, 
+      from: from,
+      to: to,
+      replyTo: replyTo,
       inReplyTo: inReplyTo,
       references: references,
-      subject:subject,    //TODO (anche per il cloud) aggiungere variabile env per cambiare i subjects
-      html:html, 
-      config:configEmail, 
+      subject: subject,    //TODO (anche per il cloud) aggiungere variabile env per cambiare i subjects
+      html: html,
+      config: configEmail,
       headers: headers
     });
 
-    messageId =  "notification" + messageId;
+    messageId = "notification" + messageId;
 
     that.send({
       messageId: messageId,
       // sender: message.senderFullname, //must be an email
-      to: that.bcc, 
+      to: that.bcc,
       replyTo: replyTo,
-      inReplyTo: inReplyTo, 
+      inReplyTo: inReplyTo,
       references: references,
-      subject: `[Tiledesk ${project ? project.name : '-'}] New Offline Message - notification`, 
-      html:html, 
+      subject: `[Tiledesk ${project ? project.name : '-'}] New Offline Message - notification`,
+      html: html,
       headers: headers
     });
 
   }
 
-  
-  
+
+
   async sendEmailChannelNotification(to, message, project, tokenQueryString, sourcePage) {
 
     var that = this;
@@ -1071,10 +1093,10 @@ class EmailService {
 
 
     var envTemplate = process.env.EMAIL_TICKET_HTML_TEMPLATE;
-      winston.debug("envTemplate: " + envTemplate);
+    winston.debug("envTemplate: " + envTemplate);
 
     if (envTemplate) {
-        html = envTemplate;
+      html = envTemplate;
     }
 
     winston.debug("html: " + html);
@@ -1090,26 +1112,26 @@ class EmailService {
     if (this.markdown) {
       msgText = marked(msgText);
     }
-    
+
     winston.debug("msgText: " + msgText);
     winston.debug("baseScope: " + JSON.stringify(baseScope));
-    
 
-    var replacements = {        
+
+    var replacements = {
       message: message,
       project: project,
       seamlessPage: sourcePage,
       msgText: msgText,
       tokenQueryString: tokenQueryString,
-      baseScope: baseScope    
+      baseScope: baseScope
     };
 
     var html = template(replacements);
     winston.debug("html: " + html);
 
-    
-  
-    
+
+
+
     let messageId = message._id + "@" + MESSAGE_ID_DOMAIN;
 
     let replyTo;
@@ -1118,21 +1140,21 @@ class EmailService {
     }
 
     let headers;
-    if (message.request) { 
-      
-        messageId = message.request.request_id + "+" + messageId;
+    if (message.request) {
 
-        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 };
+      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.debug("messageId: " + messageId);
       winston.debug("replyTo: " + replyTo);
       winston.debug("email headers", headers);
     }
-    
+
 
     let inReplyTo;
     let references;
@@ -1147,24 +1169,24 @@ class EmailService {
       }
       if (message.request.attributes.email_references) {
         references = message.request.attributes.email_references;
-      }        
+      }
 
-      if (that.ccEnabled==true) {
+      if (that.ccEnabled == true) {
         if (message.request.attributes.email_cc) {
-          cc = 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) {
+        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.debug("email inReplyTo: "+ inReplyTo);
-    winston.debug("email references: "+ references);
+    winston.debug("email inReplyTo: " + inReplyTo);
+    winston.debug("email references: " + references);
     winston.debug("email cc: ", cc);
-    winston.debug("email ccString: "+ ccString);
+    winston.debug("email ccString: " + ccString);
 
     let from;
     let configEmail;
@@ -1175,7 +1197,7 @@ class EmailService {
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.debug("custom from email setting found: "+ from);
+        winston.debug("custom from email setting found: " + from);
       }
     }
 
@@ -1183,7 +1205,7 @@ class EmailService {
     let subject = that.formatText("ticketSubject", `R: ${message.request ? message.request.subject : '-'}`, message, project.settings);
 
     //ocf 
-        //prod                                                      //pre
+    //prod                                                      //pre
     // if (project._id =="6406e34727b57500120b1bd6" || project._id == "642c609f179910002cc56b3e") {
     //   subject = "Richiesta di supporto #" + message.request.ticket_id;
     //   if (message.request.subject) {
@@ -1191,43 +1213,43 @@ class EmailService {
     //   } 
     //   // console.log("subject",subject);
     // }
-    
+
     // if (message.request && message.request.lead && message.request.lead.email) {
     //   winston.info("message.request.lead.email: " + message.request.lead.email);
     //   replyTo = replyTo + ", "+ message.request.lead.email;
     // }
-    
+
     that.send({
       messageId: messageId,
       // sender: message.senderFullname, //must be an email
-      from:from, 
-      to:to, 
+      from: from,
+      to: to,
       cc: ccString,
-      replyTo: replyTo, 
+      replyTo: replyTo,
       inReplyTo: inReplyTo,
       references: references,
       // subject:`${message.request ? message.request.subject : '-'}`, 
       subject: subject,
-      text:html, 
-      html:html,
-      config:configEmail, 
-      headers:headers 
-    }); 
-    
-    messageId =  "notification" + messageId;
+      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, 
+      to: that.bcc,
+      replyTo: replyTo,
       inReplyTo: inReplyTo,
       references: references,
       // subject: `${message.request ? message.request.subject : '-'} - notification`, 
-      subject: `R: ${message.request ? message.request.subject : '-'} - notification`, 
-      text:html, 
-      html:html,
-      headers:headers
+      subject: `R: ${message.request ? message.request.subject : '-'} - notification`,
+      text: html,
+      html: html,
+      headers: headers
     });
 
   }
@@ -1241,7 +1263,7 @@ class EmailService {
 
 
 
-  
+
   async sendFollowerNotification(to, message, project) {
 
     var that = this;
@@ -1255,10 +1277,10 @@ class EmailService {
 
 
     var envTemplate = process.env.EMAIL_FOLLOWER_HTML_TEMPLATE;
-      winston.debug("envTemplate: " + envTemplate);
+    winston.debug("envTemplate: " + envTemplate);
 
     if (envTemplate) {
-        html = envTemplate;
+      html = envTemplate;
     }
 
     winston.debug("html: " + html);
@@ -1274,26 +1296,26 @@ class EmailService {
     if (this.markdown) {
       msgText = marked(msgText);
     }
-    
+
     winston.debug("msgText: " + msgText);
     winston.debug("baseScope: " + JSON.stringify(baseScope));
-    
 
-    var replacements = {        
+
+    var replacements = {
       message: message,
       project: project,
       msgText: msgText,
-      baseScope: baseScope    
+      baseScope: baseScope
     };
 
-    var html = template(replacements); 
+    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;
@@ -1302,21 +1324,21 @@ class EmailService {
     }
 
     let headers;
-    if (message.request) { 
-      
-        messageId = message.request.request_id + "+" + messageId;
+    if (message.request) {
 
-        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 };
+      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.debug("messageId: " + messageId);
       winston.debug("replyTo: " + replyTo);
       winston.debug("email headers", headers);
     }
-    
+
 
     let inReplyTo;
     let references;
@@ -1331,23 +1353,23 @@ class EmailService {
       }
       if (message.request.attributes.email_references) {
         references = message.request.attributes.email_references;
-      }        
+      }
 
-      if (that.ccEnabled==true) {
+      if (that.ccEnabled == true) {
         if (message.request.attributes.email_cc) {
-          cc = 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) {
+        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.debug("email inReplyTo: "+ inReplyTo);
-    winston.debug("email references: "+ references);
+    winston.debug("email inReplyTo: " + inReplyTo);
+    winston.debug("email references: " + references);
     winston.debug("email cc: ", cc);
-    winston.debug("email ccString: "+ ccString);
+    winston.debug("email ccString: " + ccString);
 
     let from;
     let configEmail;
@@ -1358,32 +1380,32 @@ class EmailService {
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.debug("custom from email setting found: "+ from);
+        winston.debug("custom from email setting found: " + from);
       }
     }
 
 
     let subject = that.formatText("newMessageFollowerSubject", `${message.request ? message.request.ticket_id : '-'}`, message, project.settings);
 
-  
-    
+
+
     that.send({
       messageId: messageId,
       // sender: message.senderFullname, //must be an email
-      from:from, 
-      to:to, 
+      from: from,
+      to: to,
       cc: ccString,
-      replyTo: replyTo, 
+      replyTo: replyTo,
       inReplyTo: inReplyTo,
       references: references,
       // subject:`${message.request ? message.request.subject : '-'}`, 
       subject: subject,  //gmail uses subject
-      text:html, 
-      html:html,
-      config:configEmail, 
-      headers:headers 
-    }); 
-    
+      text: html,
+      html: html,
+      config: configEmail,
+      headers: headers
+    });
+
     // // messageId =  "notification" + messageId;
 
     // // that.send({
@@ -1404,151 +1426,153 @@ class EmailService {
   }
 
 
-/*
-  sendEmailChannelTakingNotification(to, request, project, tokenQueryString) {
-
-    var that = this;
-
-    this.readTemplateFile('ticket-taking.txt', function(err, html) {
-      // this.readTemplateFile('ticket.html', function(err, html) {
-
-
-      var envTemplate = process.env.EMAIL_TICKET_HTML_TEMPLATE;
-       winston.debug("envTemplate: " + envTemplate);
+  /*
+    sendEmailChannelTakingNotification(to, request, project, tokenQueryString) {
+  
+      var that = this;
+  
+      this.readTemplateFile('ticket-taking.txt', function(err, html) {
+        // this.readTemplateFile('ticket.html', function(err, html) {
+  
+  
+        var envTemplate = process.env.EMAIL_TICKET_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;
+  
+        var replacements = {        
+          request: request,
+          project: project.toJSON(),
+          tokenQueryString: tokenQueryString,
+          baseScope: baseScope    
+        };
+  
+        var html = template(replacements);
+        winston.debug("html: " + html);
+  
+  
+        // if (message.request && message.request.lead && message.request.lead.email) {
+        //   winston.info("message.request.lead.email: " + message.request.lead.email);
+        //   replyTo = replyTo + ", "+ request.lead.email;
+        // }
+        
+  
+        that.send({to:to, replyTo: replyTo, subject:`R: ${request ? request.subject : '-'}`, text:html }); //html:html
+        that.send({to: that.bcc, replyTo: replyTo, subject: `R: ${request ? request.subject : '-'} - notification`, text:html});//html:html
+  
+      });
+    }
+  */
 
-      if (envTemplate) {
-          html = envTemplate;
-      }
 
-      winston.debug("html: " + html);
 
-      var template = handlebars.compile(html);
 
-      var baseScope = JSON.parse(JSON.stringify(that));
-      delete baseScope.pass;
 
-      var replacements = {        
-        request: request,
-        project: project.toJSON(),
-        tokenQueryString: tokenQueryString,
-        baseScope: baseScope    
-      };
 
-      var html = template(replacements);
-      winston.debug("html: " + html);
 
+  async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload, replyTo, quoteManager) {
 
-      // if (message.request && message.request.lead && message.request.lead.email) {
-      //   winston.info("message.request.lead.email: " + message.request.lead.email);
-      //   replyTo = replyTo + ", "+ request.lead.email;
-      // }
-      
+    var that = this;
 
-      that.send({to:to, replyTo: replyTo, subject:`R: ${request ? request.subject : '-'}`, text:html }); //html:html
-      that.send({to: that.bcc, replyTo: replyTo, subject: `R: ${request ? request.subject : '-'} - notification`, text:html});//html:html
 
-    });
-  }
-*/
+    if (project.toJSON) {
+      project = project.toJSON();
+    }
 
+    var html = await this.readTemplate('emailDirect.html', project.settings);
 
+    var envTemplate = process.env.EMAIL_DIRECT_HTML_TEMPLATE;
+    winston.debug("envTemplate: " + envTemplate);
 
+    if (envTemplate) {
+      html = envTemplate;
+    }
 
+    winston.debug("html: " + html);
 
+    var template = handlebars.compile(html);
 
-  
-async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload, replyTo) {
+    var baseScope = JSON.parse(JSON.stringify(that));
+    delete baseScope.pass;
 
-  var that = this;
 
+    let msgText = text;
+    msgText = encode(msgText);
+    if (this.markdown) {
+      msgText = marked(msgText);
+    }
 
-  if (project.toJSON) {
-    project = project.toJSON();
-  }
+    winston.debug("msgText: " + msgText);
+    winston.debug("baseScope: " + JSON.stringify(baseScope));
 
-  var html = await this.readTemplate('emailDirect.html', project.settings);
 
-  var envTemplate = process.env.EMAIL_DIRECT_HTML_TEMPLATE;
-    winston.debug("envTemplate: " + envTemplate);
+    var replacements = {
+      project: project,
+      request_id: request_id,
+      seamlessPage: sourcePage,
+      msgText: msgText,
+      tokenQueryString: tokenQueryString,
+      baseScope: baseScope,
+      payload: payload
+    };
 
-  if (envTemplate) {
-      html = envTemplate;
-  }
+    var html = template(replacements);
+    winston.debug("html: " + html);
 
-  winston.debug("html: " + html);
 
-  var template = handlebars.compile(html);
+    // let replyTo;
 
-  var baseScope = JSON.parse(JSON.stringify(that));
-  delete baseScope.pass;
+    if (!replyTo && this.replyEnabled && request_id) {
+      replyTo = request_id + this.inboundDomainDomainWithAt;
+    }
 
+    let from;
+    let configEmail;
+    if (project && project.settings && project.settings.email) {
+      if (project.settings.email.config) {
+        configEmail = project.settings.email.config;
+        winston.debug("custom email configEmail setting found: ", configEmail);
+      }
+      if (project.settings.email.from) {
+        from = project.settings.email.from;
+        winston.debug("custom from email setting found: " + from);
+      }
+    }
 
-  let msgText = text;
-  msgText = encode(msgText);
-  if (this.markdown) {
-    msgText = marked(msgText);
-  }
-  
-  winston.debug("msgText: " + msgText);
-  winston.debug("baseScope: " + JSON.stringify(baseScope));
-  
+    let subjectParsed = that.parseText(subject, payload);
 
-  var replacements = {        
-    project: project,
-    request_id: request_id,
-    seamlessPage: sourcePage,
-    msgText: msgText,
-    tokenQueryString: tokenQueryString,
-    baseScope: baseScope,
-    payload: payload
-  };
+    // if (message.request && message.request.lead && message.request.lead.email) {
+    //   winston.info("message.request.lead.email: " + message.request.lead.email);
+    //   replyTo = replyTo + ", "+ message.request.lead.email;
+    // }
 
-  var html = template(replacements);
-  winston.debug("html: " + html);
+    // if (!subject) {
+    //   subject = "Tiledesk"
+    // }
 
-  
-  // let replyTo;
+    let email_enabled = true;
 
-  if (!replyTo && this.replyEnabled && request_id) {
-    replyTo = request_id + this.inboundDomainDomainWithAt;
-  }
+    that.send({
+      from: from,
+      to: to,
+      replyTo: replyTo,
+      subject: subjectParsed,
+      text: html,
+      html: html,
+      config: configEmail,
+    }, email_enabled, project, quoteManager);
 
-  let from;
-  let configEmail;
-  if (project && project.settings && project.settings.email) {
-    if (project.settings.email.config) {
-      configEmail = project.settings.email.config;
-      winston.debug("custom email configEmail setting found: ", configEmail);
-    }
-    if (project.settings.email.from) {
-      from = project.settings.email.from;
-      winston.debug("custom from email setting found: "+ from);
-    }
   }
 
-  let subjectParsed = that.parseText(subject, payload);
-
-  // if (message.request && message.request.lead && message.request.lead.email) {
-  //   winston.info("message.request.lead.email: " + message.request.lead.email);
-  //   replyTo = replyTo + ", "+ message.request.lead.email;
-  // }
-
-  // if (!subject) {
-  //   subject = "Tiledesk"
-  // }
-  
-  that.send({
-    from:from, 
-    to:to, 
-    replyTo: replyTo, 
-    subject:subjectParsed,
-    text:html, 
-    html:html,
-    config:configEmail, 
-  }); 
-  
-}
-
 
 
   // ok
@@ -1560,13 +1584,13 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
 
 
     var envTemplate = process.env.EMAIL_RESET_PASSWORD_HTML_TEMPLATE;
-      winston.debug("envTemplate: " + envTemplate);
+    winston.debug("envTemplate: " + envTemplate);
 
     if (envTemplate) {
-        html = envTemplate;
+      html = envTemplate;
     }
 
-      winston.debug("html: " + html);
+    winston.debug("html: " + html);
 
     var template = handlebars.compile(html);
 
@@ -1574,18 +1598,18 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
     delete baseScope.pass;
 
 
-    var replacements = {        
+    var replacements = {
       resetPswRequestId: resetPswRequestId,
       userFirstname: userFirstname,
       userLastname: userLastname,
-      baseScope: baseScope    
+      baseScope: baseScope
     };
 
     var html = template(replacements);
 
 
-    that.send({to: to, subject: '[Tiledesk] Password reset request', html:html});
-    that.send({to:that.bcc, subject: '[Tiledesk] Password reset request - notification', html:html });
+    that.send({ to: to, subject: '[Tiledesk] Password reset request', html: html });
+    that.send({ to: that.bcc, subject: '[Tiledesk] Password reset request - notification', html: html });
 
   }
 
@@ -1598,13 +1622,13 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
 
 
     var envTemplate = process.env.EMAIL_PASSWORD_CHANGED_HTML_TEMPLATE;
-      winston.debug("envTemplate: " + envTemplate);
+    winston.debug("envTemplate: " + envTemplate);
 
     if (envTemplate) {
-        html = envTemplate;
+      html = envTemplate;
     }
 
-      winston.debug("html: " + html);
+    winston.debug("html: " + html);
 
     var template = handlebars.compile(html);
 
@@ -1612,42 +1636,42 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
     delete baseScope.pass;
 
 
-    var replacements = {        
+    var replacements = {
       userFirstname: userFirstname,
       userLastname: userLastname,
       to: to,
-      baseScope: baseScope    
+      baseScope: baseScope
     };
 
     var html = template(replacements);
 
 
-    that.send({to: to, subject:'[Tiledesk] Your password has been changed', html:html });
-    that.send({to: that.bcc, subject: '[Tiledesk] Your password has been changed - notification', html: html });
+    that.send({ to: to, subject: '[Tiledesk] Your password has been changed', html: html });
+    that.send({ to: that.bcc, subject: '[Tiledesk] Your password has been changed - notification', html: html });
 
   }
 
 
-    // ok
+  // ok
 
 
   /**
    *! *** EMAIL: YOU HAVE BEEN INVITED AT THE PROJECT  ***
    */
-   async sendYouHaveBeenInvited(to, currentUserFirstname, currentUserLastname, projectName, id_project, invitedUserFirstname, invitedUserLastname, invitedUserRole) {
+  async sendYouHaveBeenInvited(to, currentUserFirstname, currentUserLastname, projectName, id_project, invitedUserFirstname, invitedUserLastname, invitedUserRole) {
 
     var that = this;
 
     var html = await this.readTemplateFile('beenInvitedExistingUser.html');
 
     var envTemplate = process.env.EMAIL_EXUSER_INVITED_HTML_TEMPLATE;
-      winston.debug("envTemplate: " + envTemplate);
+    winston.debug("envTemplate: " + envTemplate);
 
     if (envTemplate) {
-        html = envTemplate;
+      html = envTemplate;
     }
 
-      winston.debug("html: " + html);
+    winston.debug("html: " + html);
 
     var template = handlebars.compile(html);
 
@@ -1655,7 +1679,7 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
     delete baseScope.pass;
 
 
-    var replacements = {        
+    var replacements = {
       currentUserFirstname: currentUserFirstname,
       currentUserLastname: currentUserLastname,
       projectName: projectName,
@@ -1663,37 +1687,37 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
       invitedUserFirstname: invitedUserFirstname,
       invitedUserLastname: invitedUserLastname,
       invitedUserRole: invitedUserRole,
-      baseScope: baseScope    
+      baseScope: baseScope
     };
 
     var html = template(replacements);
 
 
-    that.send({to:to, subject: `[Tiledesk] You have been invited to the '${projectName}' project`, html:html});
-    that.send({to: that.bcc, subject: `[Tiledesk] You have been invited to the '${projectName}' project - notification`, html: html});
+    that.send({ to: to, subject: `[Tiledesk] You have been invited to the '${projectName}' project`, html: html });
+    that.send({ to: that.bcc, subject: `[Tiledesk] You have been invited to the '${projectName}' project - notification`, html: html });
   }
 
-    // ok
+  // ok
 
 
   /**
    *! *** EMAIL: YOU HAVE BEEN INVITED AT THE PROJECT (USER NOT REGISTERED) ***
    */
-   async sendInvitationEmail_UserNotRegistered(to, currentUserFirstname, currentUserLastname, projectName, id_project, invitedUserRole, pendinginvitationid) {
+  async sendInvitationEmail_UserNotRegistered(to, currentUserFirstname, currentUserLastname, projectName, id_project, invitedUserRole, pendinginvitationid) {
+
 
-   
     var that = this;
 
     var html = await this.readTemplateFile('beenInvitedNewUser.html');
 
     var envTemplate = process.env.EMAIL_NEWUSER_INVITED_HTML_TEMPLATE;
-      winston.debug("envTemplate: " + envTemplate);
+    winston.debug("envTemplate: " + envTemplate);
 
     if (envTemplate) {
-        html = envTemplate;
+      html = envTemplate;
     }
 
-      winston.debug("html: " + html);
+    winston.debug("html: " + html);
 
     var template = handlebars.compile(html);
 
@@ -1701,27 +1725,27 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
     delete baseScope.pass;
 
 
-    var replacements = {        
+    var replacements = {
       currentUserFirstname: currentUserFirstname,
       currentUserLastname: currentUserLastname,
       projectName: projectName,
       id_project: id_project,
       invitedUserRole: invitedUserRole,
       pendinginvitationid: pendinginvitationid,
-      baseScope: baseScope    
+      baseScope: baseScope
     };
 
     var html = template(replacements);
 
-    that.send({to:to, subject: `[Tiledesk] You have been invited to the '${projectName}' project`, html:html });
-    that.send({to: that.bcc, subject: `[Tiledesk] You have been invited to the '${projectName}' project - notification`, html: html});
+    that.send({ to: to, subject: `[Tiledesk] You have been invited to the '${projectName}' project`, html: html });
+    that.send({ to: that.bcc, subject: `[Tiledesk] You have been invited to the '${projectName}' project - notification`, html: html });
 
   }
 
   // ok
   async sendVerifyEmailAddress(to, savedUser) {
 
-   
+
     var that = this;
 
     if (savedUser.toJSON) {
@@ -1730,13 +1754,13 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
     var html = await this.readTemplateFile('verify.html');
 
     var envTemplate = process.env.EMAIL_VERIFY_HTML_TEMPLATE;
-      winston.debug("envTemplate: " + envTemplate);
+    winston.debug("envTemplate: " + envTemplate);
 
     if (envTemplate) {
-        html = envTemplate;
+      html = envTemplate;
     }
 
-      winston.debug("html: " + html);
+    winston.debug("html: " + html);
 
     var template = handlebars.compile(html);
 
@@ -1744,16 +1768,16 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
     delete baseScope.pass;
 
 
-    var replacements = {        
-      savedUser: savedUser,      
-      baseScope: baseScope    
+    var replacements = {
+      savedUser: savedUser,
+      baseScope: baseScope
     };
 
     var html = template(replacements);
 
 
-    that.send({to: to, subject: `[Tiledesk] Verify your email address`, html:html });
-    that.send({to: that.bcc, subject: `[Tiledesk] Verify your email address `+to + " - notification", html:html });
+    that.send({ to: to, subject: `[Tiledesk] Verify your email address`, html: html });
+    that.send({ to: that.bcc, subject: `[Tiledesk] Verify your email address ` + to + " - notification", html: html });
 
   }
 
@@ -1763,13 +1787,13 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
 
 
 
-// ok
+  // ok
 
-async sendRequestTranscript(to, messages, request, project) {
-  winston.debug("sendRequestTranscript: "+to); 
+  async sendRequestTranscript(to, messages, request, project) {
+    winston.debug("sendRequestTranscript: " + to);
 
-     //if the request came from rabbit mq?
-     if (request.toJSON) {
+    //if the request came from rabbit mq?
+    if (request.toJSON) {
       request = request.toJSON();
     }
 
@@ -1779,24 +1803,24 @@ async sendRequestTranscript(to, messages, request, project) {
 
     var transcriptAsHtml = ""; //https://handlebarsjs.com/guide/expressions.html#html-escaping
     messages.forEach(message => {
-      transcriptAsHtml = transcriptAsHtml + '['+ message.createdAt.toLocaleTimeString('en', { timeZone: 'UTC' }) +'] ' + message.senderFullname + ': ' + message.text + '<br>';
+      transcriptAsHtml = transcriptAsHtml + '[' + message.createdAt.toLocaleTimeString('en', { timeZone: 'UTC' }) + '] ' + message.senderFullname + ': ' + message.text + '<br>';
     });
     winston.debug("transcriptAsHtml: " + transcriptAsHtml);
-    
-   
-      
+
+
+
     var that = this;
 
     var html = await this.readTemplate('sendTranscript.html', project.settings);
 
     var envTemplate = process.env.EMAIL_SEND_TRANSCRIPT_HTML_TEMPLATE;
-      winston.debug("envTemplate: " + envTemplate);
+    winston.debug("envTemplate: " + envTemplate);
 
     if (envTemplate) {
-        html = envTemplate;
+      html = envTemplate;
     }
 
-      winston.debug("html: " + html);
+    winston.debug("html: " + html);
 
     var template = handlebars.compile(html);
 
@@ -1804,17 +1828,17 @@ async sendRequestTranscript(to, messages, request, project) {
     delete baseScope.pass;
 
 
-    var replacements = {        
-      messages: messages,    
-      request: request,  
+    var replacements = {
+      messages: messages,
+      request: request,
       formattedCreatedAt: request.createdAt.toLocaleString('en', { timeZone: 'UTC' }),
       transcriptAsHtml: transcriptAsHtml,
-      baseScope: baseScope    
+      baseScope: baseScope
     };
 
     var html = template(replacements);
 
-  
+
 
     let from;
     let configEmail;
@@ -1825,7 +1849,7 @@ async sendRequestTranscript(to, messages, request, project) {
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.debug("custom from email setting found: "+ from);
+        winston.debug("custom from email setting found: " + from);
       }
     }
 
@@ -1835,7 +1859,7 @@ async sendRequestTranscript(to, messages, request, project) {
     // console.log("ocf",project._id);
     let subject = that.formatText("sendTranscriptSubject", '[Tiledesk] Transcript', request, project.settings);
 
-         //prod                                               //pre
+    //prod                                               //pre
     // if (project._id =="6406e34727b57500120b1bd6" || project._id == "642c609f179910002cc56b3e") {
     //   subject = "Segnalazione #" + request.ticket_id;
     //   // subject = "Richiesta di supporto #" + request.ticket_id;
@@ -1846,136 +1870,136 @@ async sendRequestTranscript(to, messages, request, project) {
     // }
     // hcustomization.emailTranscript(to, subject, html, configEmail)
 
-    that.send({from:from, to:to, subject: subject, html:html, config: configEmail});
-    that.send({to: that.bcc, subject: '[Tiledesk] Transcript - notification', html:html });
+    that.send({ from: from, to: to, subject: subject, html: html, config: configEmail });
+    that.send({ to: that.bcc, subject: '[Tiledesk] Transcript - notification', html: html });
 
-}
+  }
 
-async sendEmailRedirectOnDesktop(to, token, project_id, chatbot_id) {
-  winston.debug("sendEmailRedirectOnDesktop: " + to);
+  async sendEmailRedirectOnDesktop(to, token, project_id, chatbot_id) {
+    winston.debug("sendEmailRedirectOnDesktop: " + to);
 
-  var that = this;
+    var that = this;
 
-  let html = await this.readTemplate('redirectToDesktopEmail.html');
+    let html = await this.readTemplate('redirectToDesktopEmail.html');
 
-  let envTemplate = process.env.EMAIL_REDIRECT_TO_DESKTOP_TEMPLATE
-  winston.debug("envTemplate: " + envTemplate);
+    let envTemplate = process.env.EMAIL_REDIRECT_TO_DESKTOP_TEMPLATE
+    winston.debug("envTemplate: " + envTemplate);
 
-  if (envTemplate) {
-    html = envTemplate;
-  }
+    if (envTemplate) {
+      html = envTemplate;
+    }
 
-  winston.debug("html: " + html);
+    winston.debug("html: " + html);
 
-  let template = handlebars.compile(html);
+    let template = handlebars.compile(html);
 
-  let baseScope = JSON.parse(JSON.stringify(that));
-  delete baseScope.pass;
+    let baseScope = JSON.parse(JSON.stringify(that));
+    delete baseScope.pass;
 
-  let replacements = {
-    baseScope: baseScope,
-    token: token,
-    project_id: project_id,
-    chatbot_id: chatbot_id
-  }
+    let replacements = {
+      baseScope: baseScope,
+      token: token,
+      project_id: project_id,
+      chatbot_id: chatbot_id
+    }
 
-  html = template(replacements);
+    html = template(replacements);
 
-  that.send({ to: to, subject: "Join Tiledesk from Desktop", html: html });
+    that.send({ to: to, subject: "Join Tiledesk from Desktop", html: html });
 
-}
+  }
 
-parseText(text, payload) {
+  parseText(text, payload) {
 
- 
 
-  var baseScope = JSON.parse(JSON.stringify(this));
-  delete baseScope.pass;
 
-  winston.debug("parseText text: "+ text);
+    var baseScope = JSON.parse(JSON.stringify(this));
+    delete baseScope.pass;
 
-  var templateHand = handlebars.compile(text);
+    winston.debug("parseText text: " + text);
 
-  var replacements = {        
-    payload: payload,  
-    baseScope: baseScope,
-    test: "test"
-  };
+    var templateHand = handlebars.compile(text);
 
-  var textTemplate = templateHand(replacements);
-  winston.debug("parseText textTemplate: "+ textTemplate);
+    var replacements = {
+      payload: payload,
+      baseScope: baseScope,
+      test: "test"
+    };
 
-  return textTemplate;
+    var textTemplate = templateHand(replacements);
+    winston.debug("parseText textTemplate: " + textTemplate);
 
+    return textTemplate;
 
-}
 
-formatText(templateName, defaultText, payload, settings) {
+  }
 
-  let text = defaultText;
-  winston.debug("formatText defaultText: "+ defaultText);
+  formatText(templateName, defaultText, payload, settings) {
 
-  let template = this.getTemplate(templateName, settings);
+    let text = defaultText;
+    winston.debug("formatText defaultText: " + defaultText);
 
-  winston.debug("formatText template: "+ template);
+    let template = this.getTemplate(templateName, settings);
 
-  if (template) {
-    text = template;
-  }
+    winston.debug("formatText template: " + template);
 
-  var baseScope = JSON.parse(JSON.stringify(this));
-  delete baseScope.pass;
+    if (template) {
+      text = template;
+    }
 
-  winston.debug("formatText text: "+ text);
+    var baseScope = JSON.parse(JSON.stringify(this));
+    delete baseScope.pass;
 
-  var templateHand = handlebars.compile(text);
+    winston.debug("formatText text: " + text);
 
-  var replacements = {        
-    payload: payload,  
-    baseScope: baseScope,
-    test: "test"
-  };
+    var templateHand = handlebars.compile(text);
+
+    var replacements = {
+      payload: payload,
+      baseScope: baseScope,
+      test: "test"
+    };
 
-  var textTemplate = templateHand(replacements);
-  winston.debug("formatText textTemplate: "+ textTemplate);
+    var textTemplate = templateHand(replacements);
+    winston.debug("formatText textTemplate: " + textTemplate);
 
-  return textTemplate;
+    return textTemplate;
 
-}
+  }
 
-getTemplate(templateName, settings) {
+  getTemplate(templateName, settings) {
+
+    var that = this;
+    winston.debug('getTemplate formatSubject: ' + JSON.stringify(settings));
 
-   var that = this;
-    winston.debug('getTemplate formatSubject: ' + JSON.stringify(settings)); 
-    
 
-      if (settings && settings.email && settings.email.templates) {
-        winston.debug('getTemplate settings.email.templates: ',settings.email.templates); 
+    if (settings && settings.email && settings.email.templates) {
+      winston.debug('getTemplate settings.email.templates: ', settings.email.templates);
 
-       var templates = settings.email.templates;
-       winston.debug('getTemplate templates: ',templates); 
+      var templates = settings.email.templates;
+      winston.debug('getTemplate templates: ', templates);
 
-       var templateDbName = templateName.replace(".subject", "");
-       winston.debug('getTemplate templateDbName: '+templateDbName); 
+      var templateDbName = templateName.replace(".subject", "");
+      winston.debug('getTemplate templateDbName: ' + templateDbName);
 
 
-       var template = templates[templateDbName];
-       winston.debug('getTemplate template: '+template); 
+      var template = templates[templateDbName];
+      winston.debug('getTemplate template: ' + template);
 
-        if (template) {
+      if (template) {
         // that.callback(template);
-          // return new Promise(function (resolve, reject) {
-            // return resolve(template);
-            return template;
-          // });
-        }else {
-          return undefined;
-        }      
+        // return new Promise(function (resolve, reject) {
+        // return resolve(template);
+        return template;
+        // });
       } else {
         return undefined;
-      } 
+      }
+    } else {
+      return undefined;
+    }
 
-}
+  }