@tiledesk/tiledesk-server 2.7.9 → 2.7.11

package/CHANGELOG.md

@@ -5,6 +5,13 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.7.11
+- Updated telegram-connector to 0.2.12
+- Updated messenger-connector to 0.2.21
+
+# 2.7.10
+- Fix get email templates
+
 # 2.7.9
 - Updated whatsapp-connector to 0.2.66
 - Updated telegram-connector to 0.2.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.7.9",
+  "version": "2.7.11",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -44,9 +44,9 @@
     "@tiledesk/tiledesk-dialogflow-connector": "^1.8.4",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
-    "@tiledesk/tiledesk-messenger-connector": "^0.1.20",
+    "@tiledesk/tiledesk-messenger-connector": "^0.1.21",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-telegram-connector": "^0.1.11",
+    "@tiledesk/tiledesk-telegram-connector": "^0.1.12",
     "@tiledesk/tiledesk-train-jobworker": "^0.0.7",
     "@tiledesk/tiledesk-tybot-connector": "^0.2.61",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.66",

package/pubmodules/messenger/listener.js

@@ -1,10 +1,13 @@
 const messenger = require("@tiledesk/tiledesk-messenger-connector");
 var winston = require('../../config/winston');
 var configGlobal = require('../../config/global');
+const mongoose = require("mongoose");
 
 const apiUrl = process.env.API_URL || configGlobal.apiUrl;
 //winston.info('Messenger apiUrl: ' + apiUrl);
 
+const dbConnection = mongoose.connection;
+
 class Listener {
 
     listen(config) {
@@ -37,7 +40,8 @@ class Listener {
 
 
         messenger.startApp({
-            MONGODB_URL: config.databaseUri,          
+            MONGODB_URL: config.databaseUri,   
+            dbconnection: dbConnection,      
             API_URL: apiUrl,
             BASE_URL: apiUrl + "/modules/messenger",
             APPS_API_URL: apiUrl + "/modules/apps",

package/pubmodules/telegram/listener.js

@@ -1,10 +1,13 @@
 const telegram = require("@tiledesk/tiledesk-telegram-connector");
 var winston = require('../../config/winston');
 var configGlobal = require('../../config/global');
+const mongoose = require("mongoose");
 
 const apiUrl = process.env.API_URL || configGlobal.apiUrl;
 winston.info("telegram apiUrl: " + apiUrl);
 
+const dbConnection = mongoose.connection;
+
 class Listener {
 
     listen(config) {
@@ -29,6 +32,7 @@ class Listener {
 
         telegram.startApp({
             MONGODB_URL: config.databaseUri,
+            dbconnection: dbConnection,
             API_URL: apiUrl,
             TELEGRAM_API_URL: telegram_api_url,
             TELEGRAM_FILE_URL: telegram_file_url,

package/routes/email.js

@@ -10,13 +10,75 @@ const recipientEmailUtil = require("../utils/recipientEmailUtil");
 
 router.get('/templates/:templateid', 
  async (req, res) => {
+
   let templateid = req.params.templateid+".html";
-  winston.debug("templateid",templateid);
+  winston.debug("req.params.templateid: "+req.params.templateid);
+  winston.debug("process.env.EMAIL_ASSIGN_REQUEST_HTML_TEMPLATE: "+process.env.EMAIL_ASSIGN_REQUEST_HTML_TEMPLATE);
 
   var html = await emailService.readTemplateFile(templateid);
-    res.json({template:html});
+
+  if (req.params.templateid == "assignedRequest" && process.env.EMAIL_ASSIGN_REQUEST_HTML_TEMPLATE) {
+    html = process.env.EMAIL_ASSIGN_REQUEST_HTML_TEMPLATE;
+  }
+
+  if (req.params.templateid == "assignedEmailMessage" && process.env.EMAIL_ASSIGN_MESSAGE_EMAIL_HTML_TEMPLATE) {
+    html = process.env.EMAIL_ASSIGN_MESSAGE_EMAIL_HTML_TEMPLATE;
+  }
+
+  if (req.params.templateid == "pooledRequest" && process.env.EMAIL_POOLED_REQUEST_HTML_TEMPLATE) {
+    html = process.env.EMAIL_POOLED_REQUEST_HTML_TEMPLATE;
+  }
+
+  if (req.params.templateid == "pooledEmailMessage" && process.env.EMAIL_POOLED_MESSAGE_EMAIL_HTML_TEMPLATE) {
+    html = process.env.EMAIL_POOLED_MESSAGE_EMAIL_HTML_TEMPLATE;
+  }
+
+  if (req.params.templateid == "newMessage" && process.env.EMAIL_NEW_MESSAGE_HTML_TEMPLATE) {
+    html = process.env.EMAIL_NEW_MESSAGE_HTML_TEMPLATE;
+  }
+  
+  if (req.params.templateid == "ticket" && process.env.EMAIL_TICKET_HTML_TEMPLATE) {
+    html = process.env.EMAIL_TICKET_HTML_TEMPLATE;
+  }
+  
+  if (req.params.templateid == "newMessageFollower" && process.env.EMAIL_FOLLOWER_HTML_TEMPLATE) {
+    html = process.env.EMAIL_FOLLOWER_HTML_TEMPLATE;
+  }
+  
+  if (req.params.templateid == "emailDirect" && process.env.EMAIL_DIRECT_HTML_TEMPLATE) {
+    html = process.env.EMAIL_DIRECT_HTML_TEMPLATE;
+  }
+  
+  if (req.params.templateid == "resetPassword" && process.env.EMAIL_RESET_PASSWORD_HTML_TEMPLATE) {
+    html = process.env.EMAIL_RESET_PASSWORD_HTML_TEMPLATE;
+  }
+  
+  if (req.params.templateid == "passwordChanged" && process.env.EMAIL_PASSWORD_CHANGED_HTML_TEMPLATE) {
+    html = process.env.EMAIL_PASSWORD_CHANGED_HTML_TEMPLATE;
+  }
+  
+  if (req.params.templateid == "beenInvitedExistingUser" && process.env.EMAIL_EXUSER_INVITED_HTML_TEMPLATE) {
+    html = process.env.EMAIL_EXUSER_INVITED_HTML_TEMPLATE;
+  }
+
+  if (req.params.templateid == "beenInvitedNewUser" && process.env.EMAIL_NEWUSER_INVITED_HTML_TEMPLATE) {
+    html = process.env.EMAIL_NEWUSER_INVITED_HTML_TEMPLATE;
+  }
+
+  if (req.params.templateid == "verify" && process.env.EMAIL_VERIFY_HTML_TEMPLATE) {
+    html = process.env.EMAIL_VERIFY_HTML_TEMPLATE;
+  }
+  
+  if (req.params.templateid == "sendTranscript" && process.env.EMAIL_SEND_TRANSCRIPT_HTML_TEMPLATE) {
+    html = process.env.EMAIL_SEND_TRANSCRIPT_HTML_TEMPLATE;
+  }
+
+  
+  res.json({template:html});
 });
  
+
+
 router.post('/test/send', 
  async (req, res) => {
   let to = req.body.to;