@tiledesk/tiledesk-server 2.3.49 → 2.3.50

package/CHANGELOG.md

@@ -5,6 +5,10 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.48) 
 
+# Untagged
+- Added new email sending endpoint 
+- Emails endpoint is now usable by agents
+
 # 2.3.49 -> PROD 
 - @tiledesk/tiledesk-tybot-connector": "^0.1.22
 

package/app.js

@@ -481,7 +481,8 @@ app.use('/:projectid/labels', [fetchLabels],labels);
 
 app.use('/:projectid/campaigns',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], campaigns);
 
-app.use('/:projectid/emails',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('owner')], email);
+app.use('/:projectid/emails',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], email);
+
 
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.49",
+  "version": "2.3.50",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -36,6 +36,9 @@
     "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"
   },
   "dependencies": {
+    "@tiledesk/tiledesk-apps": "^1.0.6",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.19",
+    "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.5",
     "@tiledesk/tiledesk-chat21-app": "^1.1.7",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",

package/pubmodules/apps/index.js

@@ -0,0 +1,8 @@
+const listener = require("./listener");
+
+const apps = require("@tiledesk/tiledesk-apps");
+const appsRoute = apps.router;
+
+
+module.exports = { listener: listener, appsRoute: appsRoute }
+

package/pubmodules/apps/listener.js

@@ -0,0 +1,27 @@
+const apps = require("@tiledesk/tiledesk-apps");
+var winston = require('../../config/winston');
+
+class Listener {
+
+    listen(config) {
+
+        winston.info("Apps Listener listen");
+        
+        if (config.databaseUri) {
+            winston.debug("apps config databaseUri: " + config.databaseUri);
+        }
+
+        apps.startApp({
+            ACCESS_TOKEN_SECRET: process.env.APPS_ACCESS_TOKEN_SECRET || 'nodeauthsecret',
+            MONGODB_URI: process.env.APPS_MONGODB_URI || config.databaseUri,
+        }, () => {
+            winston.info("Tiledesk Apps proxy server succesfully started.")
+        })
+
+    }
+
+}
+
+var listener = new Listener();
+
+module.exports = listener;

package/pubmodules/kaleyra/index.js

@@ -0,0 +1,6 @@
+const listener = require('./listener');
+
+const kaleyra = require('@tiledesk/tiledesk-kaleyra-proxy');
+const kaleyraRoute = kaleyra.router;
+
+module.exports = { listener: listener, kaleyraRoute: kaleyraRoute }

package/pubmodules/kaleyra/listener.js

@@ -0,0 +1,32 @@
+const kaleyra = require("@tiledesk/tiledesk-kaleyra-proxy");
+var winston = require('../../config/winston');
+var configGlobal = require('../../config/global');
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+winston.info("Kaleyra apiUrl: " + apiUrl);
+ 
+class Listener {
+
+    listen(config) {
+        winston.info("Kaleyra Listener listen");
+        if (config.databaseUri) {
+            winston.debug("kaleyra config databaseUri: " + config.databaseUri);
+        }
+
+        kaleyra.startApp({
+            MONGODB_URL: config.databaseUri,
+            API_URL: apiUrl,
+            BASE_URL: apiUrl + "/modules/kaleyra",
+            APPS_API_URL: apiUrl + "/modules/apps",
+            KALEYRA_API_URL: process.env.KALEYRA_API_URL,
+            API_KEY: process.env.API_KEY,
+            log: process.env.KALEYRA_LOG
+        }, () => {
+            winston.info("Tiledesk Kaleyra proxy server succesfully started.");
+        })
+    }
+}
+
+var listener = new Listener();
+
+module.exports = listener;

package/pubmodules/pubModulesManager.js

@@ -21,6 +21,15 @@ class PubModulesManager {
         this.rasa = undefined;
         this.rasaRoute = undefined;
 
+        this.apps = undefined;
+        this.appsRoute = undefined;
+
+        this.whatsapp = undefined;
+        this.whatsappRoute = undefined;
+
+        this.kaleyra = undefined;
+        this.kaleyraRoute = undefined;
+
         this.activityArchiver = undefined;
         this.activityRoute = undefined;
 
@@ -53,6 +62,18 @@ class PubModulesManager {
             app.use('/modules/rasa', this.rasaRoute);
             winston.info("ModulesManager rasaRoute controller loaded");       
         }
+        if (this.appsRoute) {
+            app.use('/modules/apps', this.appsRoute);
+            winston.info("ModulesManager appsRoute controller loaded");       
+        }
+        if (this.whatsappRoute) {
+            app.use('/modules/whatsapp', this.whatsappRoute);
+            winston.info("ModulesManager whatsappRoute controller loaded");
+        }
+        if (this.kaleyraRoute) {
+            app.use('/modules/kaleyra', this.kaleyraRoute);
+            winston.info("ModulesManager kaleyraRoute controller loaded");
+        }
         if (this.tilebotRoute) {
             app.use('/modules/tilebot', this.tilebotRoute);
             winston.info("ModulesManager tilebot controller loaded");       
@@ -217,7 +238,53 @@ class PubModulesManager {
             }
         }
 
+        try {
+            this.apps = require('./apps');
+            winston.debug("this.apps: " + this.apps);
+            this.apps.listener.listen(config);
+
+            this.appsRoute = this.apps.appsRoute;
+
+            winston.info("PubModulesManager initialized apps.");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') { 
+                winston.info("PubModulesManager init apps module not found");
+            }else {
+                winston.info("PubModulesManager error initializing init apps module", err);
+            }
+        }
+
+        try {
+            this.whatsapp = require('./whatsapp');
+            winston.debug("this.whatsapp: " + this.whatsapp);
+            this.whatsapp.listener.listen(config);
 
+            this.whatsappRoute = this.whatsapp.whatsappRoute;
+
+            winston.info("PubModulesManager initialized apps.");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') { 
+                winston.info("PubModulesManager init apps module not found");
+            }else {
+                winston.info("PubModulesManager error initializing init apps module", err);
+            }
+        }
+
+        try {
+            this.kaleyra = require('./kaleyra');
+            winston.debug("this.kaleyra: " + this.kaleyra);
+            this.kaleyra.listener.listen(config);
+
+            this.kaleyraRoute = this.kaleyra.kaleyraRoute;
+
+            winston.info("PubModulesManager initialized apps.");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') { 
+                winston.info("PubModulesManager init apps module not found");
+            }else {
+                winston.info("PubModulesManager error initializing init apps module", err);
+            }
+        }
 
         try {
             this.activityArchiver = require('./activities').activityArchiver;

package/pubmodules/whatsapp/index.js

@@ -0,0 +1,7 @@
+const listener = require("./listener");
+
+const whatsapp = require("@tiledesk/tiledesk-whatsapp-connector");
+const whatsappRoute = whatsapp.router;
+
+
+module.exports = { listener: listener, whatsappRoute: whatsappRoute }

package/pubmodules/whatsapp/listener.js

@@ -0,0 +1,32 @@
+const whatsapp = require("@tiledesk/tiledesk-whatsapp-connector");
+var winston = require('../../config/winston');
+var configGlobal = require('../../config/global');
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+winston.info('Whatsapp apiUrl: ' + apiUrl);
+
+class Listener {
+
+    listen(config) {
+        winston.info("WhatsApp Listener listen");
+        if (config.databaseUri) {
+            winston.debug("whatsapp config databaseUri: " + config.databaseUri);
+        }
+
+        whatsapp.startApp({
+            MONGODB_URL: config.databaseUri,          
+            API_URL: apiUrl,
+            GRAPH_URL: process.env.META_GRAPH_URL || config.graphUrl,
+            BASE_URL: apiUrl + "/modules/whatsapp",                     
+            APPS_API_URL: apiUrl + "/modules/apps",                 
+            log: process.env.WHATSAPP_LOG
+        }, () => {
+            winston.info("Tiledesk WhatsApp Connector proxy server succesfully started.");
+        })
+
+    }
+}
+
+var listener = new Listener();
+
+module.exports = listener;

package/routes/email.js

@@ -17,10 +17,10 @@ router.get('/templates/:templateid',
 router.post('/test/send', 
  async (req, res) => {
   let to = req.body.to;
-  winston.info("to",to);
+  winston.debug("to",to);
 
   let configEmail = req.body.config;
-  winston.info("configEmail", configEmail);
+  winston.debug("configEmail", configEmail);
 
   emailService.sendTest(to, configEmail, function(err,obj) {
     // winston.info("sendTest rest", err, obj);
@@ -29,4 +29,28 @@ router.post('/test/send',
     
 });
 
+
+router.post('/send', 
+ async (req, res) => {
+  let to = req.body.to;
+  winston.info("to: " + to);
+
+  let text = req.body.text;
+  winston.info("text: " + text);
+
+  let request_id = req.body.request_id;
+  winston.info("request_id: " + request_id);
+
+  let subject = req.body.subject;
+  winston.info("subject: " + subject);
+
+  winston.info("req.project", req.project);
+
+             //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage)
+  emailService.sendEmailDirect(to, text, req.project, request_id, subject, undefined, undefined);
+  
+  res.json({"queued": true});
+    
+});
+
 module.exports = router;

package/services/emailService.js

@@ -1030,7 +1030,7 @@ class EmailService {
 
   }
 
-
+  
   
   async sendEmailChannelNotification(to, message, project, tokenQueryString, sourcePage) {
 
@@ -1360,10 +1360,6 @@ class EmailService {
   }
 
 
-
-
-
-
 /*
   sendEmailChannelTakingNotification(to, request, project, tokenQueryString) {
 
@@ -1411,6 +1407,102 @@ class EmailService {
   }
 */
 
+
+
+
+
+
+  
+async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage) {
+
+  var that = this;
+
+
+  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);
+
+  var baseScope = JSON.parse(JSON.stringify(that));
+  delete baseScope.pass;
+
+
+  let msgText = text;
+  msgText = encode(msgText);
+  if (this.markdown) {
+    msgText = marked(msgText);
+  }
+  
+  winston.debug("msgText: " + msgText);
+  winston.debug("baseScope: " + JSON.stringify(baseScope));
+  
+
+  var replacements = {        
+    project: project,
+    seamlessPage: sourcePage,
+    msgText: msgText,
+    tokenQueryString: tokenQueryString,
+    baseScope: baseScope    
+  };
+
+  var html = template(replacements);
+  winston.debug("html: " + html);
+
+  
+  let replyTo;
+  if (this.replyEnabled) {
+    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.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);
+    }
+  }
+
+
+  // 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:subject,
+    text:html, 
+    html:html,
+    config:configEmail, 
+  }); 
+  
+}
+
+
+
   // ok
   async sendPasswordResetRequestEmail(to, resetPswRequestId, userFirstname, userLastname) {
 
@@ -1693,6 +1785,5 @@ async sendRequestTranscript(to, messages, request, project) {
 
 var emailService = new EmailService();
 
-//  emailService.sendTest("abc@abc.it");
 
 module.exports = emailService;

package/template/email/beenInvitedExistingUser.html

@@ -94,7 +94,7 @@
                           {{currentUserFirstname}} {{currentUserLastname}} has invited you to the TileDesk project <strong> {{projectName}}</strong> 
                         </h2>
 
-                        <br> <br<strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">Hi {{invitedUserFirstname}} {{invitedUserLastname}},</strong>
+                        <br> <br><strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">Hi {{invitedUserFirstname}} {{invitedUserLastname}},</strong>
                         
                         <br> <br>
                         I invited you to take on the role of  {{invitedUserRole}} of the TileDesk <strong> {{projectName}}</strong> project

package/template/email/beenInvitedNewUser.html

@@ -95,7 +95,7 @@
                         {{currentUserFirstname}} {{currentUserLastname}} has invited you to the Tiledesk project <strong> {{projectName}}</strong> 
                         </h2>
 
-                        <br> <br<strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">{{to}},</strong>
+                        <br> <br><strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">{{to}},</strong>
                         
                         <br> <br>
                         I invited you to take on the role of {{invitedUserRole}} of the Tiledesk <strong> {{projectName}}</strong> project

package/template/email/emailDirect.html

@@ -0,0 +1,121 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+
+  <head>
+    <meta name="viewport" content="width=device-width" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>New Ticket from TileDesk</title>
+
+    <style type="text/css">
+      img {
+        max-width: 100%;
+        margin-left:16px;
+        margin-bottom:16px;
+        text-align:center !important;
+      }
+      body {
+        -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em;
+      }
+      body {
+        background-color: #f6f6f6;
+      }
+
+      @media only screen and (max-width: 640px) {
+        body {
+          padding: 0 !important;
+        }
+        h1 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+          text-align:center !important;
+        }
+        h2 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h3 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h4 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h1 {
+          font-size: 22px !important;
+        }
+        h2 {
+          font-size: 18px !important;
+        }
+        h3 {
+          font-size: 16px !important;
+        }
+        .container {
+          padding: 0 !important; width: 100% !important;
+        }
+        .content {
+          padding: 0 !important;
+        }
+        .content-wrap {
+          padding: 10px !important;
+        }
+        .invoice {
+          width: 100% !important;
+        }
+      }
+    </style>
+  </head>
+
+  <body itemscope itemtype="http://schema.org/EmailMessage" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6">
+
+    {{#if baseScope.replyEnabled}}
+        <div>\# Please type your reply above this line \#</div>
+    {{/if}}
+
+            <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background-color: #fff; margin: 0; border: 1px solid #e9e9e9;" bgcolor="#fff">
+            
+            <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+			<td class="alert alert-warning" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 16px; vertical-align: top; font-weight: 500; text-align: center; border-radius: 3px 3px 0 0; margin: 0;" align="center"  valign="top">
+              
+                <div style="text-align:center">
+                  <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
+                    <!-- <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:20%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd"> -->
+                    <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
+                  </a>
+                </div>
+              </td>
+            </tr>
+           
+              
+              <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                <td class="content-wrap" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 20px;" valign="top">
+                  <table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                                     
+
+                   
+
+                    <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                      <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                            <div style="white-space: pre-wrap;">{{{msgText}}}</div>
+                      </td>
+                    </tr>
+                                  
+
+
+                  
+                    <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                      <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+            <div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
+              <table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                  <td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">
+                    <span><a href="http://www.tiledesk.com" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;" > Tiledesk.com </a></span>
+                    <!-- <br><span><a href="%unsubscribe_url%"  style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">Unsubscribe</a></span>  -->
+                 </td>
+                </tr>
+              </table>
+
+  </body>
+</html>