@tiledesk/tiledesk-server 2.7.8 → 2.7.10

package/CHANGELOG.md

@@ -5,6 +5,15 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.7.10
+- Fix get email templates
+
+# 2.7.9
+- Updated whatsapp-connector to 0.2.66
+- Updated telegram-connector to 0.2.11
+- Updated messenger-connector to 0.2.20
+- Fixed bug: duplicated faq with intentid
+
 # 2.7.8
 - Updated tybot-connector to 0.2.61
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.7.8",
+  "version": "2.7.10",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -44,12 +44,12 @@
     "@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.18",
+    "@tiledesk/tiledesk-messenger-connector": "^0.1.20",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-telegram-connector": "^0.1.10",
+    "@tiledesk/tiledesk-telegram-connector": "^0.1.11",
     "@tiledesk/tiledesk-train-jobworker": "^0.0.7",
     "@tiledesk/tiledesk-tybot-connector": "^0.2.61",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.65",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.66",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.7",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",

package/pubmodules/messenger/listener.js

@@ -30,6 +30,11 @@ class Listener {
         let dashboard_base_url = process.env.EMAIL_BASEURL || config.baseUrl;
         winston.debug("Messenger dashboard_base_url: ", dashboard_base_url);
 
+        let brand_name = null;
+        if (process.env.BRAND_NAME) {
+            brand_name = process.env.BRAND_NAME
+        }
+
 
         messenger.startApp({
             MONGODB_URL: config.databaseUri,          
@@ -41,6 +46,7 @@ class Listener {
             GRAPH_URL: graph_url,
             DASHBOARD_BASE_URL: dashboard_base_url,
             VERIFY_TOKEN: fb_verify_token,
+            BRAND_NAME: brand_name,
             log: log
         }, (err) => {
             if (!err) {

package/pubmodules/telegram/listener.js

@@ -15,16 +15,17 @@ class Listener {
 
         let telegram_api_url = process.env.TELEGRAM_API_URL || config.telegramApiUrl || "https://api.telegram.org/bot"
         winston.debug("Telegram api url: " + telegram_api_url);
-        winston.info("Telegram api url: " + telegram_api_url);
-
 
         let telegram_file_url = process.env.TELEGRAM_FILE_URL || config.telegramFileUrl || "https://api.telegram.org/file/bot"
         winston.debug("Telegram file url: " + telegram_file_url);
-        winston.info("Telegram file url: " + telegram_file_url);
 
         let log = process.env.TELEGRAM_LOG || 'debug'
-        winston.debug("Telegram log: ", log);
-        winston.info("Telegram log: " + log);
+        winston.debug("Telegram log: " + log);
+
+        let brand_name = null;
+        if (process.env.BRAND_NAME) {
+            brand_name = process.env.BRAND_NAME
+        }
 
         telegram.startApp({
             MONGODB_URL: config.databaseUri,
@@ -33,6 +34,7 @@ class Listener {
             TELEGRAM_FILE_URL: telegram_file_url,
             BASE_URL: apiUrl + "/modules/telegram",
             APPS_API_URL: apiUrl + "/modules/apps",
+            BRAND_NAME: brand_name,
             log: log
         }, (err) => {
             if (!err) {

package/pubmodules/whatsapp/listener.js

@@ -36,6 +36,11 @@ class Listener {
         let amqp_manager_url = process.env.AMQP_MANAGER_URL;
         winston.debug("amqp_manager_url " + amqp_manager_url);
 
+        let brand_name = null;
+        if (process.env.BRAND_NAME) {
+            brand_name = process.env.BRAND_NAME
+        }
+
         let log = process.env.WHATSAPP_LOG || false
         winston.debug("Whatsapp log: "+ log);
 
@@ -52,6 +57,7 @@ class Listener {
             REDIS_PASSWORD: password,
             AMQP_MANAGER_URL: amqp_manager_url,
             JOB_TOPIC_EXCHANGE: job_topic,
+            BRAND_NAME: brand_name,
             log: log
         }, (err) => {
             if (!err) {

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;

package/routes/faq.js

@@ -427,7 +427,8 @@ router.put('/:faqid', function (req, res) {
 
   if (faqid.startsWith("intentId")) {
     let intent_id = faqid.substring(8);
-    Faq.findOneAndUpdate({ id_faq_kb: id_faq_kb, intent_id: intent_id }, update, { new: true, upsert: true }, (err, updatedFaq) => {
+    //Faq.findOneAndUpdate({ id_faq_kb: id_faq_kb, intent_id: intent_id }, update, { new: true, upsert: true }, (err, updatedFaq) => {
+    Faq.findOneAndUpdate({ id_faq_kb: id_faq_kb, intent_id: intent_id }, update, { new: true }, (err, updatedFaq) => {
       if (err) {
         if (err.code == 11000) {
           return res.status(409).send({ success: false, msg: 'Duplicate  intent_display_name.' });