@tiledesk/tiledesk-server 2.7.15 → 2.7.16

package/CHANGELOG.md

@@ -5,14 +5,17 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.7.16
+- Updated tybot-connector to 0.2.63
+
 # 2.7.15
-- Updated whatsapp-connector to 0.2.69
+- Updated whatsapp-connector to 0.1.69
 
 # 2.7.14
-- Updated whatsapp-connector to 0.2.68
+- Updated whatsapp-connector to 0.1.68
 
 # 2.7.13
-- Updated whatsapp-connector to 0.2.67
+- Updated whatsapp-connector to 0.1.67
 
 # 2.7.12
 - Updated tybot-connector to 0.2.62

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.7.15",
+  "version": "2.7.16",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -48,7 +48,7 @@
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.12",
     "@tiledesk/tiledesk-train-jobworker": "^0.0.7",
-    "@tiledesk/tiledesk-tybot-connector": "^0.2.62",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.63",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.69",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.7",
     "amqplib": "^0.5.5",

package/routes/request.js

@@ -1492,5 +1492,27 @@ router.get('/:requestid', function (req, res) {
   });
 });
 
+router.get('/:requestid/chatbot/parameters', async (req, res) => {
+
+  let project_id = req.projectid;
+  let request_id = req.params.requestid;
+
+  let split_pattern = /-/
+  let splitted = request_id.split(split_pattern);
+  
+  if (project_id !== splitted[2]) {
+    return res.status(401).send({ success: false, message: "Request does not belong to the project"})
+  }
+
+  requestService.getRequestParametersFromChatbot(request_id).then((parameters) => {
+    res.status(200).send(parameters);
+
+  }).catch((err) => {
+    console.error("err: ", err.response)
+    res.status(400).send(err);
+  })
+
+})
+
 
 module.exports = router;

package/services/emailService.js

@@ -139,10 +139,10 @@ class EmailService {
 
   }
 
-  readTemplate(templateName, settings) {
+  readTemplate(templateName, settings, environmentVariableKey) {
     // aggiunsta questo
     var that = this;
-    winston.debug('EmailService readTemplate: ' + templateName + '  ' + JSON.stringify(settings));
+    winston.debug('EmailService readTemplate: ' + templateName + ' environmentVariableKey:  ' + environmentVariableKey + ' setting ' + JSON.stringify(settings));
 
 
     if (settings && settings.email && settings.email.templates) {
@@ -162,11 +162,24 @@ class EmailService {
         return new Promise(function (resolve, reject) {
           return resolve(template);
         });
+      } 
+      // else {
+      //   return that.readTemplateFile(templateName);
+      // }
+    } else {
+      var envTemplate = process.env[environmentVariableKey];
+      winston.debug('EmailService envTemplate: ' + envTemplate);
+
+      if (envTemplate) {
+        winston.debug('EmailService return envTemplate: ' + envTemplate);
+
+        return envTemplate;
       } else {
+        winston.debug('EmailService return file: ' + templateName);
+
         return that.readTemplateFile(templateName);
       }
-    } else {
-      return that.readTemplateFile(templateName);
+      
     }
   }
   readTemplateFile(templateName) {
@@ -328,7 +341,8 @@ class EmailService {
 
     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" } } }, "EMAIL_TEST_HTML_TEMPLATE");
+    var html = await this.readTemplate('test.html', undefined, "EMAIL_TEST_HTML_TEMPLATE");
 
     var template = handlebars.compile(html);
 
@@ -356,14 +370,7 @@ class EmailService {
       project = project.toJSON();
     }
 
-    var html = await this.readTemplate('assignedRequest.html', project.settings);
-
-    var envTemplate = process.env.EMAIL_ASSIGN_REQUEST_HTML_TEMPLATE;
-    winston.debug("envTemplate: " + envTemplate);
-
-    if (envTemplate) {
-      html = envTemplate;
-    }
+    var html = await this.readTemplate('assignedRequest.html', project.settings, "EMAIL_ASSIGN_REQUEST_HTML_TEMPLATE");
 
     winston.debug("html: " + html);
 
@@ -516,15 +523,7 @@ class EmailService {
       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);
-
-    if (envTemplate) {
-      html = envTemplate;
-    }
+    var html = await this.readTemplate('assignedEmailMessage.html', project.settings, "EMAIL_ASSIGN_MESSAGE_EMAIL_HTML_TEMPLATE");
 
     winston.debug("html: " + html);
 
@@ -668,14 +667,7 @@ class EmailService {
 
     var that = this;
 
-    var html = await this.readTemplate('pooledRequest.html', project.settings);
-
-    var envTemplate = process.env.EMAIL_POOLED_REQUEST_HTML_TEMPLATE;
-    winston.debug("envTemplate: " + envTemplate);
-
-    if (envTemplate) {
-      html = envTemplate;
-    }
+    var html = await this.readTemplate('pooledRequest.html', project.settings, "EMAIL_POOLED_REQUEST_HTML_TEMPLATE");
 
     winston.debug("html: " + html);
 
@@ -805,16 +797,7 @@ class EmailService {
       project = project.toJSON();
     }
 
-    var html = await this.readTemplate('pooledEmailMessage.html', project.settings);
-
-
-    var envTemplate = process.env.EMAIL_POOLED_MESSAGE_EMAIL_HTML_TEMPLATE;
-    winston.debug("envTemplate: " + envTemplate);
-
-
-    if (envTemplate) {
-      html = envTemplate;
-    }
+    var html = await this.readTemplate('pooledEmailMessage.html', project.settings, "EMAIL_POOLED_MESSAGE_EMAIL_HTML_TEMPLATE");
 
     winston.debug("html: " + html);
 
@@ -955,16 +938,7 @@ class EmailService {
       project = project.toJSON();
     }
 
-    var html = await this.readTemplate('newMessage.html', project.settings);
-
-
-
-    var envTemplate = process.env.EMAIL_NEW_MESSAGE_HTML_TEMPLATE;
-    winston.debug("envTemplate: " + envTemplate);
-
-    if (envTemplate) {
-      html = envTemplate;
-    }
+    var html = await this.readTemplate('newMessage.html', project.settings, "EMAIL_NEW_MESSAGE_HTML_TEMPLATE");
 
     winston.debug("html: " + html);
 
@@ -1088,17 +1062,9 @@ class EmailService {
       project = project.toJSON();
     }
 
-    var html = await this.readTemplate('ticket.html', project.settings);
+    var html = await this.readTemplate('ticket.html', project.settings, "EMAIL_TICKET_HTML_TEMPLATE");
     // this.readTemplateFile('ticket.txt', 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);
@@ -1273,15 +1239,7 @@ class EmailService {
       project = project.toJSON();
     }
 
-    var html = await this.readTemplate('newMessageFollower.html', project.settings);
-
-
-    var envTemplate = process.env.EMAIL_FOLLOWER_HTML_TEMPLATE;
-    winston.debug("envTemplate: " + envTemplate);
-
-    if (envTemplate) {
-      html = envTemplate;
-    }
+    var html = await this.readTemplate('newMessageFollower.html', project.settings, "EMAIL_FOLLOWER_HTML_TEMPLATE");
 
     winston.debug("html: " + html);
 
@@ -1488,14 +1446,8 @@ class EmailService {
       project = project.toJSON();
     }
 
-    var html = await this.readTemplate('emailDirect.html', project.settings);
-
-    var envTemplate = process.env.EMAIL_DIRECT_HTML_TEMPLATE;
-    winston.debug("envTemplate: " + envTemplate);
+    var html = await this.readTemplate('emailDirect.html', project.settings, "EMAIL_DIRECT_HTML_TEMPLATE");
 
-    if (envTemplate) {
-      html = envTemplate;
-    }
 
     winston.debug("html: " + html);
 
@@ -1580,15 +1532,7 @@ class EmailService {
 
     var that = this;
 
-    var html = await this.readTemplate('resetPassword.html');
-
-
-    var envTemplate = process.env.EMAIL_RESET_PASSWORD_HTML_TEMPLATE;
-    winston.debug("envTemplate: " + envTemplate);
-
-    if (envTemplate) {
-      html = envTemplate;
-    }
+    var html = await this.readTemplate('resetPassword.html', undefined, "EMAIL_RESET_PASSWORD_HTML_TEMPLATE");
 
     winston.debug("html: " + html);
 
@@ -1618,15 +1562,7 @@ class EmailService {
 
     var that = this;
 
-    var html = await this.readTemplateFile('passwordChanged.html');
-
-
-    var envTemplate = process.env.EMAIL_PASSWORD_CHANGED_HTML_TEMPLATE;
-    winston.debug("envTemplate: " + envTemplate);
-
-    if (envTemplate) {
-      html = envTemplate;
-    }
+    var html = await this.readTemplateFile('passwordChanged.html', undefined, "EMAIL_PASSWORD_CHANGED_HTML_TEMPLATE");
 
     winston.debug("html: " + html);
 
@@ -1662,14 +1598,7 @@ class EmailService {
 
     var that = this;
 
-    var html = await this.readTemplateFile('beenInvitedExistingUser.html');
-
-    var envTemplate = process.env.EMAIL_EXUSER_INVITED_HTML_TEMPLATE;
-    winston.debug("envTemplate: " + envTemplate);
-
-    if (envTemplate) {
-      html = envTemplate;
-    }
+    var html = await this.readTemplateFile('beenInvitedExistingUser.html', undefined, "EMAIL_EXUSER_INVITED_HTML_TEMPLATE");
 
     winston.debug("html: " + html);
 
@@ -1708,14 +1637,7 @@ class EmailService {
 
     var that = this;
 
-    var html = await this.readTemplateFile('beenInvitedNewUser.html');
-
-    var envTemplate = process.env.EMAIL_NEWUSER_INVITED_HTML_TEMPLATE;
-    winston.debug("envTemplate: " + envTemplate);
-
-    if (envTemplate) {
-      html = envTemplate;
-    }
+    var html = await this.readTemplateFile('beenInvitedNewUser.html', undefined, "EMAIL_NEWUSER_INVITED_HTML_TEMPLATE");
 
     winston.debug("html: " + html);
 
@@ -1751,14 +1673,7 @@ class EmailService {
     if (savedUser.toJSON) {
       savedUser = savedUser.toJSON();
     }
-    var html = await this.readTemplateFile('verify.html');
-
-    var envTemplate = process.env.EMAIL_VERIFY_HTML_TEMPLATE;
-    winston.debug("envTemplate: " + envTemplate);
-
-    if (envTemplate) {
-      html = envTemplate;
-    }
+    var html = await this.readTemplateFile('verify.html', undefined, "EMAIL_VERIFY_HTML_TEMPLATE");
 
     winston.debug("html: " + html);
 
@@ -1811,14 +1726,7 @@ class EmailService {
 
     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);
-
-    if (envTemplate) {
-      html = envTemplate;
-    }
+    var html = await this.readTemplate('sendTranscript.html', project.settings, "EMAIL_SEND_TRANSCRIPT_HTML_TEMPLATE");
 
     winston.debug("html: " + html);
 
@@ -1880,14 +1788,8 @@ class EmailService {
 
     var that = this;
 
-    let html = await this.readTemplate('redirectToDesktopEmail.html');
-
-    let envTemplate = process.env.EMAIL_REDIRECT_TO_DESKTOP_TEMPLATE
-    winston.debug("envTemplate: " + envTemplate);
+    let html = await this.readTemplate('redirectToDesktopEmail.html', undefined, "EMAIL_REDIRECT_TO_DESKTOP_TEMPLATE");
 
-    if (envTemplate) {
-      html = envTemplate;
-    }
 
     winston.debug("html: " + html);
 

package/services/requestService.js

@@ -16,6 +16,10 @@ var cacheEnabler = require("../services/cacheEnabler");
 var UIDGenerator = require("../utils/UIDGenerator");
 const { TdCache } = require('../utils/TdCache');
 const { QuoteManager } = require('./QuoteManager');
+var configGlobal = require('../config/global');
+const axios = require("axios").default;
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
 
 let tdCache = new TdCache({
     host: process.env.CACHE_REDIS_HOST,
@@ -2459,10 +2463,25 @@ class RequestService {
 
 
 
+  async getRequestParametersFromChatbot(request_id) {
 
+    return new Promise( async (resolve, reject) => {
+      await axios({
+        url: apiUrl + '/modules/tilebot/ext/reserved/parameters/requests/' + request_id,
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        method: 'GET'
+      }).then((response) => {
+        console.log("[RequestService] response: ", response);
+        resolve(response.data);
+      }).catch((err) => {
+        winston.error("get request parameter error: ", err.response.data);
+        reject(err);
+      })
+    })
 
-
-
+  }
 
 }