@tiledesk/tiledesk-server 2.10.87 → 2.10.89

package/routes/faq_kb.js

@@ -18,6 +18,7 @@ const trainingService = require('../services/trainingService');
 var roleChecker = require('../middleware/has-role');
 const roleConstants = require('../models/roleConstants');
 const errorCodes = require('../errorCodes');
+const faq_kb = require('../models/faq_kb');
 
 let chatbot_templates_api_url = process.env.CHATBOT_TEMPLATES_API_URL
 
@@ -26,12 +27,12 @@ let MAX_UPLOAD_FILE_SIZE = process.env.MAX_UPLOAD_FILE_SIZE;
 let uploadlimits = undefined;
 
 if (MAX_UPLOAD_FILE_SIZE) {
-  uploadlimits = {fileSize: parseInt(MAX_UPLOAD_FILE_SIZE)} ;
+  uploadlimits = { fileSize: parseInt(MAX_UPLOAD_FILE_SIZE) };
   winston.debug("Max upload file size is : " + MAX_UPLOAD_FILE_SIZE);
 } else {
   winston.debug("Max upload file size is infinity");
 }
-var upload = multer({limits: uploadlimits});
+var upload = multer({ limits: uploadlimits });
 
 
 router.post('/', roleChecker.hasRole('admin'), async function (req, res) {
@@ -130,7 +131,7 @@ router.post('/train', roleChecker.hasRole('admin'), function (req, res) {
 });
 
 router.post('/aitrain/', roleChecker.hasRole('admin'), async (req, res) => {
-  
+
   let id_faq_kb = req.body.id_faq_kb;
   let webhook_enabled = req.body.webhook_enabled;
 
@@ -241,6 +242,17 @@ router.put('/:faq_kbid/publish', roleChecker.hasRole('admin'), async (req, res)
   let id_faq_kb = req.params.faq_kbid;
   winston.debug('id_faq_kb: ' + id_faq_kb);
 
+  let chatbot_id;
+  let release_note;
+
+  if (req.body.restore_from) {
+    chatbot_id = req.body.restore_from;
+    release_note = "Restored from " + chatbot_id;
+  } else {
+    chatbot_id = id_faq_kb;
+    release_note = req.body.release_note || "No comment";
+  }
+
   const api_url = process.env.API_URL || configGlobal.apiUrl;
   winston.debug("fork --> base_url: " + api_url); // check if correct
 
@@ -253,14 +265,15 @@ router.put('/:faq_kbid/publish', roleChecker.hasRole('admin'), async (req, res)
 
   try {
     //  fork(id_faq_kb, api_url, token, project_id)
-    let forked = await cs.fork(id_faq_kb, api_url, token, current_project_id);
+    let forked = await cs.fork(chatbot_id, api_url, token, current_project_id);
     // winston.debug("forked: ", forked)
 
     let forkedChatBotId = forked.bot_id;
-    winston.debug("forkedChatBotId: "+forkedChatBotId);
+    winston.debug("forkedChatBotId: " + forkedChatBotId);
 
-    let updatedForkedChabot = await Faq_kb.findByIdAndUpdate(forkedChatBotId, { $unset: { slug: 1 }, trashed: true, publishedBy: req.user.id, publishedAt: new Date().getTime()}, { new: true, upsert: true }).exec();
-    winston.debug("updatedForkedChabot: ",updatedForkedChabot);
+    let updatedForkedChabot = await Faq_kb.findByIdAndUpdate(forkedChatBotId, { $unset: { slug: 1 }, trashed: true, root_id: id_faq_kb, release_note: release_note, publishedBy: req.user.id, publishedAt: new Date().getTime() }, { new: true, upsert: true }).exec();
+    //let updatedForkedChabot = await Faq_kb.findByIdAndUpdate(forkedChatBotId, { $unset: { slug: 1 }, trashed: true, root_id: id_faq_kb, publishedBy: req.user.id, publishedAt: new Date().getTime() }, { new: true }).exec();
+    winston.debug("updatedForkedChabot: ", updatedForkedChabot);
     botEvent.emit('faqbot.update', updatedForkedChabot);
 
     const port = process.env.PORT || '3000';
@@ -270,20 +283,22 @@ router.put('/:faq_kbid/publish', roleChecker.hasRole('admin'), async (req, res)
     }
     winston.debug("TILEBOT_ENDPOINT: " + TILEBOT_ENDPOINT);
 
-    let updatedOriginalChabot = await Faq_kb.findByIdAndUpdate(id_faq_kb,  {url:TILEBOT_ENDPOINT+forkedChatBotId}, { new: true, upsert: true }).exec();
-    winston.debug("updatedOriginalChabot: ",updatedOriginalChabot);
+    let updatedOriginalChabot = await Faq_kb.findByIdAndUpdate(id_faq_kb, { url: TILEBOT_ENDPOINT + forkedChatBotId }, { new: true, upsert: true }).exec();
+    winston.debug("updatedOriginalChabot: ", updatedOriginalChabot);
+
+    cs.setModified(id_faq_kb, false);
 
     botEvent.emit('faqbot.update', updatedOriginalChabot);
 
     return res.status(200).send({ message: "Chatbot published successfully", bot_id: forkedChatBotId });
 
-  } catch(e) {
+  } catch (e) {
     winston.error("Error Unable publish chatbot: ", e);
     return res.status(500).send({ success: false, message: "Unable publish chatbot" });
   }
 });
 
-router.put('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot','subscription']), function (req, res) {
+router.put('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), function (req, res) {
 
   winston.debug(req.body);
 
@@ -349,6 +364,8 @@ router.put('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot','subscriptio
   if (req.body.slug != undefined) {
     update.slug = req.body.slug;
   }
+
+  update.modified = true;
   
   winston.debug("update", update);
 
@@ -366,8 +383,8 @@ router.put('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot','subscriptio
   });
 });
 
-router.put('/:faq_kbid/language/:language', roleChecker.hasRoleOrTypes('admin', ['bot','subscription']), (req, res) => {
-  
+router.put('/:faq_kbid/language/:language', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), (req, res) => {
+
   winston.debug("update language: ", req.params);
 
   let update = {};
@@ -393,7 +410,7 @@ router.put('/:faq_kbid/language/:language', roleChecker.hasRoleOrTypes('admin',
 
 })
 
-router.patch('/:faq_kbid/attributes', roleChecker.hasRoleOrTypes('admin', ['bot','subscription']), function (req, res) {   //TODO add cache_bot_here
+router.patch('/:faq_kbid/attributes', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), function (req, res) {   //TODO add cache_bot_here
   var data = req.body;
 
   // TODO use service method
@@ -403,40 +420,40 @@ router.patch('/:faq_kbid/attributes', roleChecker.hasRoleOrTypes('admin', ['bot'
       return res.status(500).send({ success: false, msg: 'Error updating object.' });
     }
 
-     if (!updatedBot) {
-        return res.status(404).send({ success: false, msg: 'Object not found.' });
-      }
-      
-      if (!updatedBot.attributes) {
-        winston.debug("empty attributes")
-        updatedBot.attributes = {};
-      }
+    if (!updatedBot) {
+      return res.status(404).send({ success: false, msg: 'Object not found.' });
+    }
 
-      winston.debug(" updatedBot attributes", updatedBot.attributes)
-        
-        Object.keys(data).forEach(function(key) {
-          var val = data[key];
-          winston.debug("data attributes "+key+" " +val)
-          updatedBot.attributes[key] = val;
-        });     
-        
-        winston.debug("updatedBot attributes", updatedBot.attributes)
-
-        // https://stackoverflow.com/questions/24054552/mongoose-not-saving-nested-object
-        updatedBot.markModified('attributes');
-
-          //cacheinvalidation
-          updatedBot.save(function (err, savedProject) {
-          if (err) {
-            winston.error("error saving bot attributes",err)
-            return res.status(500).send({ success: false, msg: 'Error getting object.' });
-          }
-          winston.verbose(" saved bot attributes",updatedBot.toObject())
-          botEvent.emit('faqbot.update', updatedBot);
-            res.json(updatedBot);
-        });
+    if (!updatedBot.attributes) {
+      winston.debug("empty attributes")
+      updatedBot.attributes = {};
+    }
+
+    winston.debug(" updatedBot attributes", updatedBot.attributes)
+
+    Object.keys(data).forEach(function (key) {
+      var val = data[key];
+      winston.debug("data attributes " + key + " " + val)
+      updatedBot.attributes[key] = val;
+    });
+
+    winston.debug("updatedBot attributes", updatedBot.attributes)
+
+    // https://stackoverflow.com/questions/24054552/mongoose-not-saving-nested-object
+    updatedBot.markModified('attributes');
+
+    //cacheinvalidation
+    updatedBot.save(function (err, savedProject) {
+      if (err) {
+        winston.error("error saving bot attributes", err)
+        return res.status(500).send({ success: false, msg: 'Error getting object.' });
+      }
+      winston.verbose(" saved bot attributes", updatedBot.toObject())
+      botEvent.emit('faqbot.update', updatedBot);
+      res.json(updatedBot);
+    });
   });
-  
+
 });
 
 router.delete('/:faq_kbid', roleChecker.hasRole('admin'), function (req, res) {
@@ -450,12 +467,12 @@ router.delete('/:faq_kbid', roleChecker.hasRole('admin'), function (req, res) {
     /**
      * WARNING: faq_kb is the operation result, not the faq_kb object. The event subscriber will not receive the object as expected.
      */
-    botEvent.emit('faqbot.delete', faq_kb); 
-    res.status(200).send({ success: true, message: "Chatbot with id " + req.params.faq_kbid + " deleted successfully"})
+    botEvent.emit('faqbot.delete', faq_kb);
+    res.status(200).send({ success: true, message: "Chatbot with id " + req.params.faq_kbid + " deleted successfully" })
   });
 });
 
-router.get('/:faq_kbid',  roleChecker.hasRoleOrTypes('admin', ['bot','subscription']), function (req, res) {
+router.get('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), function (req, res) {
 
   winston.debug(req.query);
 
@@ -500,7 +517,25 @@ router.get('/:faq_kbid',  roleChecker.hasRoleOrTypes('admin', ['bot','subscripti
   });
 });
 
-router.get('/:faq_kbid/jwt', roleChecker.hasRoleOrTypes('admin', ['bot','subscription']), function (req, res) {
+router.get('/:faq_kbid/published', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), async function (req, res) {
+
+  let id_project = req.projectid;
+  let chatbot_id = req.params.faq_kbid;
+
+  let published_chatbots = await faq_kb.find({ id_project: id_project, root_id: chatbot_id })
+    .sort({ publishedAt: -1 })
+    .limit(100)
+    .populate('publishedBy', '_id firstname lastname email')
+    .catch((err) => {
+      winston.error("Error finding published chatbots: ", err);
+      return res.status(500).send({ success: false, error: "Error finding published chatbots from root " + chatbot_id });
+    })
+
+  res.status(200).send(published_chatbots);
+
+})
+
+router.get('/:faq_kbid/jwt', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), function (req, res) {
 
   winston.debug(req.query);
 
@@ -513,10 +548,10 @@ router.get('/:faq_kbid/jwt', roleChecker.hasRoleOrTypes('admin', ['bot','subscri
     }
 
     var signOptions = {
-      issuer:  'https://tiledesk.com',
-      subject:  'bot',
-      audience:  'https://tiledesk.com/bots/'+faq_kb._id,   
-      jwtid: uuidv4()       
+      issuer: 'https://tiledesk.com',
+      subject: 'bot',
+      audience: 'https://tiledesk.com/bots/' + faq_kb._id,
+      jwtid: uuidv4()
     };
 
     // TODO metti bot_? a user._id
@@ -533,7 +568,7 @@ router.get('/:faq_kbid/jwt', roleChecker.hasRoleOrTypes('admin', ['bot','subscri
 
     var token = jwt.sign(botPayload, botSecret, signOptions);
 
-    res.json({"jwt":token});
+    res.json({ "jwt": token });
   });
 });
 
@@ -541,7 +576,7 @@ router.get('/:faq_kbid/jwt', roleChecker.hasRoleOrTypes('admin', ['bot','subscri
  * This endpoint should be the only one reachble with role agent.
  * If the role is agent the response must contain only _id, name, or other non relevant info.
  */
-router.get('/', roleChecker.hasRoleOrTypes('agent', ['bot','subscription']), function (req, res) {
+router.get('/', roleChecker.hasRoleOrTypes('agent', ['bot', 'subscription']), function (req, res) {
 
 
   winston.debug("req.query", req.query);
@@ -560,10 +595,10 @@ router.get('/', roleChecker.hasRoleOrTypes('agent', ['bot','subscription']), fun
    * the bots created before the implementation of the 'trashed' property are not returned 
    */
   let query = { "id_project": req.projectid, "trashed": { $in: [null, false] } };
-  
+
   if (restricted_mode === true) {
     query.agents_available = {
-      $in: [ null, true ]
+      $in: [null, true]
     }
   }
 
@@ -571,13 +606,13 @@ router.get('/', roleChecker.hasRoleOrTypes('agent', ['bot','subscription']), fun
     query.type = { $ne: "identity" }
   }
 
-  let search_obj = {"$search": req.query.text};
+  let search_obj = { "$search": req.query.text };
 
-  if (req.query.text) {    
+  if (req.query.text) {
     if (req.query.language) {
       search_obj["$language"] = req.query.language;
     }
-    query.$text = search_obj;    
+    query.$text = search_obj;
   }
 
   if (req.query.public) {
@@ -586,7 +621,7 @@ router.get('/', roleChecker.hasRoleOrTypes('agent', ['bot','subscription']), fun
 
   if (req.query.certified) {
     query.certified = req.query.certified;
-  }             
+  }
 
   winston.debug("query", query);
 
@@ -595,12 +630,12 @@ router.get('/', roleChecker.hasRoleOrTypes('agent', ['bot','subscription']), fun
       winston.error('GET FAQ-KB ERROR ', err)
       return res.status(500).send({ success: false, message: "Unable to get chatbots" });
     }
-  
+
     if (restricted_mode === true) {
       // Returns only: _id, name, id_project, language
       faq_kbs = faq_kbs.map(({ webhook_enabled, intentsEngine, score, url, attributes, trained, certifiedTags, createdBy, createdAt, updatedAt, __v, ...keepAttrs }) => keepAttrs)
     }
-    
+
     res.json(faq_kbs)
 
   })
@@ -642,9 +677,11 @@ router.post('/fork/:id_faq_kb', roleChecker.hasRole('admin'), async (req, res) =
       delete chatbot.attributes.globals
     }
   }
+  
+  delete chatbot.modified;
 
   chatbot.template = "empty";
-
+  
   let savedChatbot = await cs.createBot(api_url, token, chatbot, landing_project_id);
   winston.debug("savedChatbot: ", savedChatbot)
 
@@ -667,11 +704,11 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
 
   let id_faq_kb = req.params.id_faq_kb;
   winston.debug('import on id_faq_kb: ' + id_faq_kb);
-  
+
   winston.debug('import with option create: ' + req.query.create);
   winston.debug('import with option replace: ' + req.query.replace);
   winston.debug('import with option overwrite: ' + req.query.overwrite);
-  
+
   let json_string;
   let json;
   if (req.file) {
@@ -687,15 +724,16 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
   // **** CREATE TRUE option ****
   // ****************************
   if (req.query.create === 'true') {
-    if (json.subtype && (json.subtype === 'webhook' || json.subtype === 'copilot')) {
-      json.template = 'empty';
-    }
+    // if (json.subtype && (json.subtype === 'webhook' || json.subtype === 'copilot')) {
+    //   json.template = 'empty';
+    // }
+    json.template = 'empty';
     let savedChatbot = await faqService.create(req.projectid, req.user.id, json)
       .catch((err) => {
-          winston.error("Error creating new chatbot")
-          return res.status(400).send({ succes: false, message: "Error creatings new chatbot", error: err })
+        winston.error("Error creating new chatbot")
+        return res.status(400).send({ succes: false, message: "Error creatings new chatbot", error: err })
       })
-    
+
     // Edit attributes.rules
     let attributes = json.attributes;
     if (attributes &&
@@ -713,7 +751,7 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
         }
       })
     }
-    
+
     let chatbot_edited = { attributes: attributes };
 
     let updatedChatbot = await Faq_kb.findByIdAndUpdate(savedChatbot._id, chatbot_edited, { new: true }).catch((err) => {
@@ -725,8 +763,8 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
     botEvent.emit('faqbot.create', savedChatbot);
 
     if (json.intents) {
-      
-      json.intents.forEach( async (intent) => {
+
+      json.intents.forEach(async (intent) => {
 
         let new_faq = {
           id_faq_kb: savedChatbot._id,
@@ -801,7 +839,7 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
     if (json.description) {
       chatbot.description = json.description;
     }
-    
+
     if (json.attributes) {
       let attributes = json.attributes;
       if (attributes.rules &&
@@ -825,7 +863,7 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
       return res.status(400).send({ success: false, message: "Error updating chatbot", error: err })
     })
 
-    botEvent.emit('faqbot.update', updatedChatbot);    
+    botEvent.emit('faqbot.update', updatedChatbot);
 
     // *****************************
     // **** REPLACE TRUE option ****
@@ -840,7 +878,7 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
     }
 
     if (json.intents) {
-      await json.intents.forEach( async (intent) => {
+      await json.intents.forEach(async (intent) => {
 
         let new_faq = {
           id_faq_kb: updatedChatbot._id,
@@ -878,9 +916,9 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
             }
           }
 
-        // ********************************
-        // **** OVERWRITE FALSE option ****
-        // ********************************
+          // ********************************
+          // **** OVERWRITE FALSE option ****
+          // ********************************
         } else {
 
           let faq = await Faq.create(new_faq).catch((err) => {
@@ -893,7 +931,7 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
           })
 
           if (faq) {
-            winston.verbose("new intent created")
+            winston.debug("new intent created: ", faq)
             faqBotEvent.emit('faq.create', faq);
           }
         }
@@ -976,12 +1014,12 @@ router.get('/exportjson/:id_faq_kb', roleChecker.hasRole('admin'), (req, res) =>
 router.post('/:faq_kbid/training', roleChecker.hasRole('admin'), function (req, res) {
 
   winston.debug(req.body);
-  winston.info(req.params.faq_kbid + "/training called" );
+  winston.info(req.params.faq_kbid + "/training called");
 
   var update = {};
   update.trained = true;
   // update._id = req.params.faq_kbid;
-  
+
   winston.debug("update", update);
   // "$set": req.params.faq_kbid
 

package/routes/logs.js

@@ -3,8 +3,11 @@ var router = express.Router();
 var winston = require('../config/winston');
 const { MessageLog } = require('../models/whatsappLog');
 const { Transaction } = require('../models/transaction');
+const logsService = require('../services/logsService');
+const { v4: uuidv4 } = require('uuid');
+const jwt = require("jsonwebtoken")
 
-
+const jwtSecret = process.env.CHAT21_JWT_SECRET || "tokenKey";
 
 router.get('/', function (req, res, next) {
     winston.info("logs", req.body);
@@ -32,7 +35,6 @@ router.get('/whatsapp', async (req, res) => {
         res.status(200).send(transactions);
     })
 
-    // res.stats(200).send({ success: true });
 })
 
 
@@ -51,7 +53,7 @@ router.get('/whatsapp/:transaction_id', async (req, res) => {
 
         winston.verbose("Logs found: ", logs);
 
-        let clearLogs = logs.map(({_id, __v, ...keepAttrs}) => keepAttrs)
+        let clearLogs = logs.map(({ _id, __v, ...keepAttrs }) => keepAttrs)
         winston.verbose("clearLogs: ", clearLogs)
 
         res.status(200).send(clearLogs);
@@ -85,10 +87,85 @@ router.post('/whatsapp', async (req, res) => {
 })
 
 
+router.get('/flows/:request_id', async (req, res) => {
+
+    let request_id = req.params.request_id;
+    const { timestamp, direction, logLevel } = req.query;
+
+    if (!request_id) {
+        return res.status(400).send({ success: false, error: "Missing required parameter 'request_id'." });
+    }
 
+    let method;
+
+    if (!timestamp) {
+        method = logsService.getLastRows(request_id, 20, logLevel);
+    } else if (direction === 'prev') {
+        logsService.get
+        method = logsService.getOlderRows(request_id, 10, logLevel, new Date(timestamp));
+    } else if (direction === 'next') {
+        method = logsService.getNewerRows(request_id, 10, logLevel, new Date(timestamp))
+    } else {
+        return res.status(400).send({ success: false, error: "Missing or invalid 'direction' parameter. Use 'prev' or 'next'."})
+    }
+
+    method.then((logs) => {
+        res.status(200).send(logs);
+    }).catch((err) => {
+        res.status(500).send({ success: false, error: "Error fetching logs: " + err.message });
+    })
+
+})
+
+
+router.get('/flows/auth/:request_id', async (req, res) => {
+
+    const request_id = req.params.request_id;
+    const appid = "tilechat";
+
+    const scope = [
+        `rabbitmq.read:*/*/apps.${appid}.logs.${request_id}.*`,
+        `rabbitmq.write:*/*/apps.${appid}.logs.${request_id}.*`,
+        `rabbitmq.configure:*/*/*`
+    ]
+
+    const now = Math.round(new Date().getTime() / 1000);
+    const exp = now + 60 * 60 * 24 * 30;
+
+    var payload = {
+        "jti": uuidv4(),
+        "sub": request_id,
+        scope: scope,
+        "client_id": request_id,
+        "cid": request_id,
+        "azp": request_id,
+        "user_id": request_id,
+        "app_id": appid,
+        "iat": now,
+        "exp": exp,
+        "aud": [
+            "rabbitmq",
+            request_id
+        ],
+        "kid": "tiledesk-key",
+    }
+
+    var token = jwt.sign(
+        payload,
+        jwtSecret,
+        {
+            "algorithm": "HS256"
+        }
+    );
 
+    const result = {
+        request_id: request_id,
+        token: token
+    }
 
+    return res.status(200).send(result);
 
+}) 
 
 
 module.exports = router;

package/routes/request.js

@@ -23,7 +23,7 @@ var cacheEnabler = require("../services/cacheEnabler");
 var Project_user = require("../models/project_user");
 var Lead = require("../models/lead");
 var UIDGenerator = require("../utils/UIDGenerator");
-let JobManager = require("@tiledesk/tiledesk-multi-worker");
+let { Publisher } = require("@tiledesk/tiledesk-multi-worker");
 
 csv = require('csv-express');
 csv.separator = ';';
@@ -39,7 +39,7 @@ const faq_kb = require('../models/faq_kb');
 
 const AMQP_MANAGER_URL = process.env.AMQP_MANAGER_URL;
 
-let jobManager = new JobManager(AMQP_MANAGER_URL, {
+let jobManager = new Publisher(AMQP_MANAGER_URL, {
   debug: false,
   queueName: "conversation-tags_queue",
   exchange: "tiledesk-multi",

package/routes/users.js

@@ -37,6 +37,9 @@ router.put('/', function (req, res) {
   if (req.body.public_website != undefined) {
     update.public_website = req.body.public_website;
   }
+  if (req.body.phone != undefined) {
+    update.phone = req.body.phone;
+  }
  
   User.findByIdAndUpdate(req.user.id, update, { new: true, upsert: true }, function (err, updatedUser) {
     if (err) {