@tiledesk/tiledesk-server 2.4.1 → 2.4.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -30,7 +30,7 @@
   },
   "optionalDependencies": {
     "@tiledesk-ent/tiledesk-server-jwthistory": "^1.1.9",
-    "@tiledesk-ent/tiledesk-server-payments": "^1.1.10",
+    "@tiledesk-ent/tiledesk-server-payments": "^1.1.11",
     "@tiledesk-ent/tiledesk-server-request-history": "^1.1.5",
     "@tiledesk-ent/tiledesk-server-visitorcounter": "^1.1.1",
     "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"
@@ -45,7 +45,7 @@
     "@tiledesk/tiledesk-messenger-connector": "0.1.9",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-tybot-connector": "^0.1.77",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.44",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.45",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/pubmodules/trigger/rulesTrigger.js

@@ -23,7 +23,18 @@ var cacheUtil = require("../../utils/cacheUtil");
 var cacheEnabler = require("../../services/cacheEnabler");
 var UIDGenerator = require("../../utils/UIDGenerator");
 const RequestConstants = require('../../models/requestConstants');
+var Bot = require("../../models/faq_kb");
 
+var request = require('retry-request', {
+  request: require('request')
+});
+const uuidv4 = require('uuid/v4');
+
+var jwt = require('jsonwebtoken');
+
+const port = process.env.PORT || '3000';
+const TILEBOT_ENDPOINT = process.env.TILEBOT_ENDPOINT || "http://localhost:" + port+ "/modules/tilebot/ext/";
+winston.debug("TILEBOT_ENDPOINT: " + TILEBOT_ENDPOINT);
 
 class RulesTrigger {
 
@@ -285,7 +296,7 @@ class RulesTrigger {
               var to = eventTrigger.event.request.lead.email;
               winston.debug('to ' + to);
   
-              // sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage) {
+              // sendEmailDirect(to, text, id_project, recipient, subject, message)
               sendEmailUtil.sendEmailDirect(to, text, id_project, recipient, subject, message);              
             } else {
               winston.info('email.send trigger. Lead email is undefined ');
@@ -302,6 +313,130 @@ class RulesTrigger {
 
 
 
+      triggerEventEmitter.on('bot.calling', async (eventTrigger) => {
+
+        try {
+
+          winston.debug('runAction eventTrigger.eventSuccess:', eventTrigger.eventSuccess);
+          var trigger = eventTrigger.trigger;         
+          winston.debug('runAction trigger', trigger.toObject());
+
+
+          var action = eventTrigger.action;
+          winston.debug('runAction action', action.toObject());
+
+
+          var intentName = action.parameters.intentName;
+          winston.debug('runAction action intentName: ' + intentName);
+
+          var botId = action.parameters.botId;
+          winston.debug('runAction action botId: ' + botId);
+
+
+          var url = TILEBOT_ENDPOINT+botId;
+          if (action.parameters.url) {
+            url = action.parameters.url;
+          }
+          winston.debug('runAction action url: ' + url);
+
+
+          var message = action.parameters.message;
+          winston.debug('runAction action message: ' + message);
+
+          
+
+        
+          if (eventTrigger.eventKey=="request.create" || eventTrigger.eventKey=="request.participants.join") {
+            // recipient = eventTrigger.event.request_id;
+          }
+          if (eventTrigger.eventKey=="message.create.from.requester" || eventTrigger.eventKey=="message.received") {
+            // recipient = eventTrigger.event.recipient;
+          }
+          if (eventTrigger.eventKey=="event.emit") {
+            winston.debug('runAction action event.emit: ', eventTrigger.event.toObject());            
+            // recipient = eventTrigger.event.project_user.id_user;
+          }
+
+          // console.log("eventTrigger.event", eventTrigger.event);
+          
+          var id_project = eventTrigger.event.id_project;
+          winston.debug('runAction action id_project: ' + id_project);
+
+
+          var payload = Object.assign({}, eventTrigger.event);;
+          winston.debug('runAction action payload: ', payload);
+          
+
+          delete payload.request.snapshot
+      
+          var json = {timestamp: Date.now(), payload: payload};
+    
+
+          json["hook"] = trigger;
+
+
+
+
+          var bot = await Bot.findById(botId).select("+secret").exec();
+          winston.debug("bot: ", bot);
+
+          var signOptions = {
+            issuer:  'https://tiledesk.com',
+            subject:  'bot',
+            audience:  'https://tiledesk.com/bots/'+bot._id,   
+            jwtid: uuidv4()       
+          };
+
+
+          let botPayload = bot.toObject();    
+          
+          let botSecret = botPayload.secret;
+
+          delete botPayload.secret;
+          delete botPayload.description;
+          delete botPayload.attributes;
+
+          var token = jwt.sign(botPayload, botSecret, signOptions);
+          json["token"] = token;
+
+
+          var webhook_origin = process.env.WEBHOOK_ORIGIN || "http://localhost:3000";
+          winston.debug("webhook_origin: "+webhook_origin);
+
+          winston.debug("Rules trigger notify json ", json );
+
+          request({
+            url: url,
+            headers: {
+             'Content-Type' : 'application/json', 
+             'User-Agent': 'tiledesk-bot',
+             'Origin': webhook_origin
+              //'x-hook-secret': s.secret
+            },
+            json: json,
+            method: 'POST'
+
+          }, function(err, result, json){            
+            winston.verbose("SENT notify for bot with url " + url +  " with err " + err);
+            winston.debug("SENT notify for bot with url ", result);
+            if (err) {
+              winston.error("Error sending notify for bot with url " + url + " with err " + err);
+              //TODO Reply with error
+              // next(err, json);
+            }
+          });
+    
+            
+
+        } catch(e) {
+          winston.error("Error runAction", e);
+        }
+
+        });
+        
+  
+
+
         triggerEventEmitter.on('request.department.route', function(eventTrigger) {
 
           try {

package/routes/faq_kb.js

@@ -13,6 +13,8 @@ var multer = require('multer')
 var upload = multer()
 var configGlobal = require('../config/global');
 const faq = require('../models/faq');
+var jwt = require('jsonwebtoken');
+const uuidv4 = require('uuid/v4');
 
 let chatbot_templates_api_url = process.env.CHATBOT_TEMPLATES_API_URL
 
@@ -311,7 +313,7 @@ router.put('/:faq_kbid', function (req, res) {
   }
 
 
-  Faq_kb.findByIdAndUpdate(req.params.faq_kbid, update, { new: true, upsert: true }, function (err, updatedFaq_kb) {
+  Faq_kb.findByIdAndUpdate(req.params.faq_kbid, update, { new: true, upsert: true }, function (err, updatedFaq_kb) {   //TODO add cache_bot_here
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error updating object.' });
     }
@@ -322,7 +324,7 @@ router.put('/:faq_kbid', function (req, res) {
 });
 
 
-router.patch('/:faq_kbid/attributes', function (req, res) {
+router.patch('/:faq_kbid/attributes', function (req, res) {   //TODO add cache_bot_here
   var data = req.body;
 
   // TODO use service method
@@ -388,7 +390,7 @@ router.get('/:faq_kbid', function (req, res) {
 
   winston.debug(req.query);
 
-  Faq_kb.findById(req.params.faq_kbid, function (err, faq_kb) {
+  Faq_kb.findById(req.params.faq_kbid, function (err, faq_kb) {   //TODO add cache_bot_here
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error getting object.' });
     }
@@ -430,6 +432,48 @@ router.get('/:faq_kbid', function (req, res) {
 });
 
 
+
+router.get('/:faq_kbid/jwt', function (req, res) {
+
+  winston.debug(req.query);
+
+  Faq_kb.findById(req.params.faq_kbid).select("+secret").exec(function (err, faq_kb) {   //TODO add cache_bot_here
+    if (err) {
+      return res.status(500).send({ success: false, msg: 'Error getting object.' });
+    }
+    if (!faq_kb) {
+      return res.status(404).send({ success: false, msg: 'Object not found.' });
+    }
+
+
+    var signOptions = {
+      issuer:  'https://tiledesk.com',
+      subject:  'bot',
+      audience:  'https://tiledesk.com/bots/'+faq_kb._id,   
+      jwtid: uuidv4()       
+    };
+
+    // TODO metti bot_? a user._id
+
+    // tolgo description, attributes
+    let botPayload = faq_kb.toObject();
+
+    let botSecret = botPayload.secret;
+    // winston.info("botSecret: " + botSecret);
+
+    delete botPayload.secret;
+    delete botPayload.description;
+    delete botPayload.attributes;
+
+    var token = jwt.sign(botPayload, botSecret, signOptions);
+
+
+    res.json({"jwt":token});
+
+  });
+});
+
+
 // NEW - GET ALL FAQKB WITH THE PASSED PROJECT ID
 router.get('/', function (req, res) {
 
@@ -467,7 +511,7 @@ router.get('/', function (req, res) {
 
   winston.debug("query", query);
 
-  Faq_kb.find(query, function (err, faq_kb) {
+  Faq_kb.find(query, function (err, faq_kb) {  //TODO add cache_bot_here
     if (err) {
       winston.error('GET FAQ-KB ERROR ', err)
       return res.status(500).send({ success: false, message: "Unable to get chatbots" });
@@ -749,7 +793,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), async (req, r
         // }
   
 
-        Faq_kb.findByIdAndUpdate(id_faq_kb, faq_kb, { new: true }, async (err, updatedFaq_kb) => {
+        Faq_kb.findByIdAndUpdate(id_faq_kb, faq_kb, { new: true }, async (err, updatedFaq_kb) => {  //TODO add cache_bot_here
           if (err) {
             return res.status(500).send({ success: false, msg: "Error updating bot." });
           }

package/services/modulesManager.js

@@ -148,11 +148,11 @@ class ModulesManager {
             this.stripe = require('@tiledesk-ent/tiledesk-server-payments').stripeRoute;
             winston.info("ModulesManager stripe initialized");
         } catch(err) {
-           if (err.code == 'MODULE_NOT_FOUND') {
-               winston.info("ModulesManager init stripe module not found");
-           }else {
+        //    if (err.code == 'MODULE_NOT_FOUND') {
+        //        winston.info("ModulesManager init stripe module not found");
+        //    }else {
                 winston.error("ModulesManager error initializing init stripe module", err);
-           }
+        //    }
         }