@tiledesk/tiledesk-server 2.13.19 → 2.13.21

package/CHANGELOG.md

@@ -5,6 +5,12 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.13.21
+- Updated whatsapp-connector to 1.0.8
+
+# 2.13.20
+- Minor bug fix on email channel
+
 # 2.13.19
 - Improved: llm preview to support openai models
 - Updated: 2.0.30

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.13.19",
+  "version": "2.13.21",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -52,7 +52,7 @@
     "@tiledesk/tiledesk-tybot-connector": "^2.0.31",
     "@tiledesk/tiledesk-voice-twilio-connector": "^0.1.22",
     "@tiledesk/tiledesk-vxml-connector": "^0.1.78",
-    "@tiledesk/tiledesk-whatsapp-connector": "1.0.7",
+    "@tiledesk/tiledesk-whatsapp-connector": "1.0.8",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.13",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",

package/pubmodules/canned/cannedResponseRoute.js

@@ -38,29 +38,28 @@ router.post('/', function (req, res) {
 
 router.put('/:cannedResponseid', async function (req, res) {
   winston.debug(req.body);
-  let canned_id = req.params.cannedResponseid;
+  const canned_id = req.params.cannedResponseid;
+  const id_project = req.projectid;
   let user_role = req.projectuser.role;
   
   var update = {};
-  
-  if (req.body.title!=undefined) {
-    update.title = req.body.title; 
-  }  
-  if (req.body.text!=undefined) {
-    update.text = req.body.text;   
-  }
-  if (req.body.attributes!=undefined) {
-    update.attributes = req.body.attributes;
-  }
 
-  let canned = await CannedResponse.findById(canned_id).catch((err) => {
+  const allowedFields = ['title', 'text', 'attributes']
+
+  allowedFields.forEach(f => {
+    if (req.body[f] !== undefined) {
+      update[f] = req.body[f];
+    }
+  })
+  
+  let canned = await CannedResponse.findOne({ _id: canned_id, id_project: id_project }).catch((err) => {
     winston.error("Error finding canned response: ", err);
     return res.status(500).send({ success: false, error: "General error: cannot find the canned response with id " + canned_id })
   })
 
   if (!canned) {
     winston.verbose("Canned response with id " + canned_id + " not found.");
-    return res.status(404).send({ success: false, error: "Canned response with id " + canned_id + " not found." })
+    return res.status(404).send({ success: false, error: "Canned response not found with id " + canned_id + " for project " + id_project })
   }
 
   /**
@@ -98,17 +97,18 @@ router.put('/:cannedResponseid', async function (req, res) {
 
 router.delete('/:cannedResponseid', async function (req, res) {
   winston.debug(req.body);
-  let canned_id = req.params.cannedResponseid;
+  const canned_id = req.params.cannedResponseid;
+  const id_project = req.projectid;
   let user_role = req.projectuser.role;
 
-  let canned = await CannedResponse.findById(canned_id).catch((err) => {
+  let canned = await CannedResponse.findOne({ _id: canned_id, id_project: id_project }).catch((err) => {
     winston.error("Error finding canned response: ", err);
     return res.status(500).send({ success: false, error: "General error: cannot find the canned response with id " + canned_id })
   })
 
   if (!canned) {
     winston.verbose("Canned response with id " + canned_id + " not found.");
-    return res.status(404).send({ success: false, error: "Canned response with id " + canned_id + " not found." })
+    return res.status(404).send({ success: false, error: "Canned response not found with id " + canned_id + " for project " + id_project })
   }
 
   /**
@@ -133,7 +133,7 @@ router.delete('/:cannedResponseid', async function (req, res) {
     return res.status(401).send({ success: false, error: "Unauthorized"})
   }
 
-  CannedResponse.findByIdAndUpdate(req.params.cannedResponseid, {status: 1000}, { new: true, upsert: true }, function (err, updatedCannedResponse) {
+  CannedResponse.findByIdAndUpdate(canned_id, {status: 1000}, { new: true, upsert: true }, function (err, updatedCannedResponse) {
     if (err) {
       winston.error('--- > ERROR ', err);
       return res.status(500).send({ success: false, msg: 'Error updating object.' });
@@ -146,16 +146,18 @@ router.delete('/:cannedResponseid', async function (req, res) {
 
 router.delete('/:cannedResponseid/physical', async function (req, res) {
   winston.debug(req.body);
-  let canned_id = req.params.cannedResponseid;
+  const canned_id = req.params.cannedResponseid;
+  const id_project = req.projectid;
+  let user_role = req.projectuser.role;
 
-  let canned = await CannedResponse.findById(canned_id).catch((err) => {
+  let canned = await CannedResponse.findOne({ _id: canned_id, id_project: id_project }).catch((err) => {
     winston.error("Error finding canned response: ", err);
     return res.status(500).send({ success: false, error: "General error: cannot find the canned response with id " + canned_id })
   })
 
   if (!canned) {
     winston.verbose("Canned response with id " + canned_id + " not found.");
-    return res.status(404).send({ success: false, error: "Canned response with id " + canned_id + " not found." })
+    return res.status(404).send({ success: false, error: "Canned response not found with id " + canned_id + " for project " + id_project })
   }
 
   /**
@@ -180,7 +182,7 @@ router.delete('/:cannedResponseid/physical', async function (req, res) {
     return res.status(401).send({ success: false, error: "Unauthorized"})
   }
 
-  CannedResponse.remove({ _id: req.params.cannedResponseid }, function (err, cannedResponse) {
+  CannedResponse.remove({ _id: canned_id }, function (err, cannedResponse) {
     if (err) {
       winston.error('--- > ERROR ', err);
       return res.status(500).send({ success: false, msg: 'Error deleting object.' });

package/routes/faq_kb.js

@@ -132,10 +132,11 @@ 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;
+  const chatbot_id = req.body.id_faq_kb;
+  const id_project = req.projectid;
   let webhook_enabled = req.body.webhook_enabled;
 
-  Faq_kb.findById(id_faq_kb, async (err, chatbot) => {
+  Faq_kb.findOne({ _id: chatbot_id, id_project: id_project}, async (err, chatbot) => {
     if (err) {
       return res.status(400).send({ success: false, error: err })
     }
@@ -145,10 +146,10 @@ router.post('/aitrain/', roleChecker.hasRole('admin'), async (req, res) => {
     if (chatbot.intentsEngine === 'tiledesk-ai') {
 
       // Option 1: emit event
-      //faqBotEvent.emit('faq_train.train', id_faq_kb, webhook_enabled);
+      //faqBotEvent.emit('faq_train.train', chatbot_id, webhook_enabled);
 
       // Option 2: call service directly
-      trainingService.train(null, id_faq_kb, webhook_enabled).then((training_result) => {
+      trainingService.train(null, chatbot_id, webhook_enabled).then((training_result) => {
         winston.info("training result: ", training_result);
         let response = {
           succes: true,
@@ -174,7 +175,10 @@ router.post('/askbot', roleChecker.hasRole('admin'), function (req, res) {
 
   winston.debug('ASK BOT ', req.body);
 
-  Faq_kb.findById(req.body.id_faq_kb).exec(function (err, faq_kb) {
+  const chatbot_id = req.body.id_faq_kb;
+  const id_project = req.projectid;
+
+  Faq_kb.findOne({ _id: chatbot_id, id_project: id_project }).exec(function (err, faq_kb) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error getting object.' });
     }
@@ -185,7 +189,7 @@ router.post('/askbot', roleChecker.hasRole('admin'), function (req, res) {
     winston.debug('faq_kb.type :' + faq_kb.type);
     if (faq_kb.type == "internal" || faq_kb.type == "tilebot") {
 
-      var query = { "id_project": req.projectid, "id_faq_kb": req.body.id_faq_kb, "question": req.body.question };
+      var query = { "id_project": id_project, "id_faq_kb": chatbot_id, "question": req.body.question };
 
       Faq.find(query)
         .lean().
@@ -302,74 +306,42 @@ router.put('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscripti
 
   winston.debug(req.body);
 
-  var update = {};
-  if (req.body.name != undefined) {
-    update.name = req.body.name;
-  }
-  if (req.body.description != undefined) {
-    update.description = req.body.description;
-  }
-  if (req.body.url != undefined) {
-    update.url = req.body.url;
-  }
-  if (req.body.webhook_url != undefined) {
-    update.webhook_url = req.body.webhook_url;
-  }
-  if (req.body.webhook_enabled != undefined) {
-    update.webhook_enabled = req.body.webhook_enabled;
-  }
-  if (req.body.type != undefined) {
-    update.type = req.body.type;
-  }
-  if (req.body.trashed != undefined) {
-    update.trashed = req.body.trashed;
-  }
-  if (req.body.public != undefined) {
-    update.public = req.body.public;
-  }
-  if (req.body.certified != undefined) {
-    update.certified = req.body.certified;
-  }
-  if (req.body.mainCategory != undefined) {
-    update.mainCategory = req.body.mainCategory;
-  }
-  if (req.body.intentsEngine != undefined) {
-    update.intentsEngine = req.body.intentsEngine;
-  }
-
-  if (req.body.tags != undefined) {
-    update.tags = req.body.tags;
-  }
-
-  if (req.body.trained != undefined) {
-    update.trained = req.body.trained;
-  }
-
-  if (req.body.short_description != undefined) {
-    update.short_description = req.body.short_description
-  }
-
-  if (req.body.title != undefined) {
-    update.title = req.body.title
-  }
+  const chatbot_id = req.params.faq_kbid;
+  const id_project = req.projectid;
 
-  if (req.body.certifiedTags != undefined) {
-    update.certifiedTags = req.body.certifiedTags
-  }
-
-  if (req.body.agents_available != undefined) {
-    update.agents_available = req.body.agents_available
-  }
-
-  if (req.body.slug != undefined) {
-    update.slug = req.body.slug;
-  }
+  var update = {};
+  const allowedFields = [
+    'name',
+    'description',
+    'url',
+    'webhook_url',
+    'webhook_enabled',
+    'type',
+    'trashed',
+    'public',
+    'certified',
+    'mainCategory',
+    'intentsEngine',
+    'tags',
+    'trained',
+    'short_description',
+    'title',
+    'certifiedTags',
+    'agents_available',
+    'slug'
+  ];
+
+  allowedFields.forEach(f => {
+    if (req.body[f] !== undefined) {
+      update[f] = req.body[f];
+    }
+  });
 
   update.modified = true;
   
   winston.debug("update", update);
 
-  Faq_kb.findByIdAndUpdate(req.params.faq_kbid, update, { new: true, upsert: true }, function (err, updatedFaq_kb) {   //TODO add cache_bot_here
+  Faq_kb.findOneAndUpdate({ _id: chatbot_id, id_project: id_project }, update, { new: true }, function (err, updatedFaq_kb) {   //TODO add cache_bot_here
     if (err) {
       if (err.code === 11000 && err.keyValue.slug) {
         return res.status(500).send({ success: false, msg: 'Error updating object.', error: 'Slug already exists: ' + err.keyValue.slug, error_code: errorCodes.CHATBOT.ERRORS.DUPLICATE_SLUG })
@@ -378,6 +350,10 @@ router.put('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscripti
       }
     }
 
+    if (!updatedFaq_kb) {
+      return res.status(404).send({ success: false, msg: "Chatbot not found with id " + chatbot_id + " for project " + id_project });
+    }
+
     botEvent.emit('faqbot.update', updatedFaq_kb);
     res.json(updatedFaq_kb);
   });
@@ -386,6 +362,8 @@ router.put('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscripti
 router.put('/:faq_kbid/language/:language', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), (req, res) => {
 
   winston.debug("update language: ", req.params);
+  const chatbot_id = req.params.faq_kbid;
+  const id_project = req.projectid;
 
   let update = {};
   if (req.params.language != undefined) {
@@ -393,11 +371,15 @@ router.put('/:faq_kbid/language/:language', roleChecker.hasRoleOrTypes('admin',
   }
 
   winston.debug("update", update);
-  Faq_kb.findByIdAndUpdate(req.params.faq_kbid, update, { new: true }, (err, updatedFaq_kb) => {
+  Faq_kb.findOneAndUpdate({ _id: chatbot_id, id_project: id_project }, update, { new: true }, (err, updatedFaq_kb) => {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error updating object.' });
     }
 
+    if (!updatedFaq_kb) {
+      return res.status(404).send({ success: false, msg: "Chatbot not found with id " + chatbot_id + " for project " + id_project });
+    }
+
     Faq.updateMany({ id_faq_kb: req.params.faq_kbid }, update, (err, result) => {
       if (err) {
         botEvent.emit('faqbot.update', updatedFaq_kb);
@@ -413,17 +395,20 @@ 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
   var data = req.body;
 
+  const chatbot_id = req.params.faq_kbid;
+  const id_project = req.projectid;
+
   // TODO use service method
-  Faq_kb.findById(req.params.faq_kbid, function (err, updatedBot) {
+  Faq_kb.findOne({ _id: chatbot_id, id_project: id_project }, function (err, updatedBot) {
     if (err) {
       winston.error('--- > ERROR ', err);
       return res.status(500).send({ success: false, msg: 'Error updating object.' });
     }
 
     if (!updatedBot) {
-      return res.status(404).send({ success: false, msg: 'Object not found.' });
+      return res.status(404).send({ success: false, msg: "Chatbot not found with id " + chatbot_id + " for project " + id_project });
     }
-
+    
     if (!updatedBot.attributes) {
       winston.debug("empty attributes")
       updatedBot.attributes = {};
@@ -460,10 +445,17 @@ router.delete('/:faq_kbid', roleChecker.hasRole('admin'), function (req, res) {
 
   winston.debug(req.body);
 
-  Faq_kb.remove({ _id: req.params.faq_kbid }, function (err, faq_kb) {
+  const chatbot_id = req.params.faq_kbid;
+  const id_project = req.projectid;
+
+  Faq_kb.findOneAndDelete({ _id: chatbot_id, id_project: id_project }, function (err, faq_kb) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error deleting object.' });
     }
+
+    if (!faq_kb) {
+      return res.status(404).send({ success: false, msg: "Chatbot not found with id " + chatbot_id + " for project " + id_project });
+    }
     /**
      * WARNING: faq_kb is the operation result, not the faq_kb object. The event subscriber will not receive the object as expected.
      */
@@ -476,12 +468,15 @@ router.get('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscripti
 
   winston.debug(req.query);
 
-  Faq_kb.findById(req.params.faq_kbid, function (err, faq_kb) {   //TODO add cache_bot_here
+  const chatbot_id = req.params.faq_kbid;
+  const id_project = req.projectid;
+
+  Faq_kb.findOne({ _id: chatbot_id, id_project: id_project }, 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.' });
+      return res.status(404).send({ success: false, msg: "Chatbot not found with id " + chatbot_id + " for project " + id_project });
     }
 
     if (req.query.departmentid) {
@@ -519,8 +514,8 @@ router.get('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscripti
 
 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;
+  const id_project = req.projectid;
+  const chatbot_id = req.params.faq_kbid;
 
   let published_chatbots = await faq_kb.find({ id_project: id_project, root_id: chatbot_id })
     .sort({ publishedAt: -1 })
@@ -539,12 +534,15 @@ router.get('/:faq_kbid/jwt', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscr
 
   winston.debug(req.query);
 
-  Faq_kb.findById(req.params.faq_kbid).select("+secret").exec(function (err, faq_kb) {   //TODO add cache_bot_here
+  const chatbot_id = req.params.faq_kbid;
+  const id_project = req.projectid;
+
+  Faq_kb.findOne({ _id: chatbot_id, id_project: id_project }).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.' });
+      return res.status(404).send({ success: false, msg: "Chatbot not found with id " + chatbot_id + " for project " + id_project });
     }
 
     var signOptions = {
@@ -578,9 +576,11 @@ router.get('/:faq_kbid/jwt', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscr
  */
 router.get('/', roleChecker.hasRoleOrTypes('agent', ['bot', 'subscription']), function (req, res) {
 
-
   winston.debug("req.query", req.query);
-  winston.debug("GET FAQ-KB req projectid", req.projectid);
+
+  const id_project = req.projectid;
+  winston.debug("GET FAQ-KB req projectid " + id_project);
+
 
   let restricted_mode = false;
 
@@ -594,7 +594,7 @@ router.get('/', roleChecker.hasRoleOrTypes('agent', ['bot', 'subscription']), fu
    * if filter only for 'trashed = false', 
    * the bots created before the implementation of the 'trashed' property are not returned 
    */
-  let query = { "id_project": req.projectid, "trashed": { $in: [null, false] } };
+  let query = { id_project: id_project, trashed: { $in: [null, false] } };
 
   if (restricted_mode === true) {
     query.agents_available = {
@@ -606,22 +606,18 @@ router.get('/', roleChecker.hasRoleOrTypes('agent', ['bot', 'subscription']), fu
     query.type = { $ne: "identity" }
   }
 
-  let search_obj = { "$search": req.query.text };
-
   if (req.query.text) {
-    if (req.query.language) {
-      search_obj["$language"] = req.query.language;
-    }
+    const search_obj = { $search: req.query.text };
+    if (req.query.language) search_obj.$language = req.query.language;
     query.$text = search_obj;
   }
 
-  if (req.query.public) {
-    query.public = req.query.public;
-  }
-
-  if (req.query.certified) {
-    query.certified = req.query.certified;
-  }
+  const allowedFilters = ["public", "certified"];
+  allowedFilters.forEach(f => {
+    if (req.query[f] !== undefined) {
+      query[f] = req.query[f];
+    }
+  });
 
   winston.debug("query", query);
 
@@ -664,12 +660,15 @@ router.post('/fork/:id_faq_kb', roleChecker.hasRole('admin'), async (req, res) =
   let token = req.headers.authorization;
 
   let cs = req.app.get('chatbot_service')
-
-  let chatbot = await cs.getBotById(id_faq_kb, public, api_url, chatbot_templates_api_url, token, current_project_id, globals);
-  winston.debug("chatbot: ", chatbot)
+  let chatbot;
+  try {
+    chatbot = await cs.getBotById(id_faq_kb, public, api_url, chatbot_templates_api_url, token, current_project_id, globals);
+  } catch (err) {
+    return res.status(500).send({ success: false, error: "Unable to get chatbot to be forked"});
+  }
 
   if (!chatbot) {
-    return res.status(500).send({ success: false, message: "Unable to get chatbot" });
+    return res.status(500).send({ success: false, message: "Unable to get chatbot to be forked" });
   }
 
   if (!globals) {
@@ -702,8 +701,10 @@ router.post('/fork/:id_faq_kb', roleChecker.hasRole('admin'), async (req, res) =
 
 router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.single('uploadFile'), async (req, res) => {
 
-  let id_faq_kb = req.params.id_faq_kb;
-  winston.debug('import on id_faq_kb: ' + id_faq_kb);
+  let chatbot_id = req.params.id_faq_kb;
+  let id_project = req.projectid;
+
+  winston.debug('import on id_faq_kb: ' + chatbot_id);
 
   winston.debug('import with option create: ' + req.query.create);
   winston.debug('import with option replace: ' + req.query.replace);
@@ -810,18 +811,18 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
   // *****************************
   else {
 
-    if (!id_faq_kb) {
+    if (!chatbot_id) {
       return res.status(400).send({ success: false, message: "With replace or overwrite option a id_faq_kb must be provided" })
     }
 
-    let chatbot = Faq_kb.findById(id_faq_kb).catch((err) => {
-      winston.error("Error finding chatbot with id " + id_faq_kb);
-      return res.status(404).send({ success: false, message: "Error finding chatbot with id " + id_faq_kb, error: err });
+    let chatbot = await Faq_kb.findOne({ _id: chatbot_id, id_project: id_project }).catch((err) => {
+      winston.error("Error finding chatbot with id " + chatbot_id);
+      return res.status(404).send({ success: false, message: "Error finding chatbot with id " + chatbot_id, error: err });
     })
 
     if (!chatbot) {
-      winston.error("Chatbot not found with id " + id_faq_kb);
-      return res.status(404).send({ success: false, message: "Chatbot not found with id " + id_faq_kb });
+      winston.error("Chatbot not found with id " + chatbot_id + " for project " + id_project);
+      return res.status(404).send({ success: false, message: "Chatbot not found with id " + chatbot_id + " for project " + id_project });
     }
 
     if (json.webhook_enabled) {
@@ -858,7 +859,7 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
       }
     }
 
-    let updatedChatbot = await Faq_kb.findByIdAndUpdate(id_faq_kb, chatbot, { new: true }).catch((err) => {
+    let updatedChatbot = await Faq_kb.findByIdAndUpdate(chatbot._id, chatbot, { new: true }).catch((err) => {
       winston.error("Error updating chatbot");
       return res.status(400).send({ success: false, message: "Error updating chatbot", error: err })
     })
@@ -869,11 +870,11 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
     // **** REPLACE TRUE option ****
     // *****************************
     if (req.query.replace === 'true') {
-      let result = await Faq.deleteMany({ id_faq_kb: id_faq_kb }).catch((err) => {
-        winston.error("Unable to delete all existing faqs with id_faq_kb " + id_faq_kb);
+      let result = await Faq.deleteMany({ id_faq_kb: chatbot._id }).catch((err) => {
+        winston.error("Unable to delete all existing faqs with id_faq_kb " + chatbot._id);
       })
 
-      winston.verbose("All faq for chatbot " + id_faq_kb + " deleted successfully")
+      winston.verbose("All faq for chatbot " + chatbot._id + " deleted successfully")
       winston.debug("DeleteMany faqs result ", result);
     }
 
@@ -902,7 +903,7 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
         // *******************************
         if (req.query.overwrite == "true") {
 
-          let savingResult = await Faq.findOneAndUpdate({ id_faq_kb: id_faq_kb, intent_display_name: intent.intent_display_name }, new_faq, { new: true, upsert: true, rawResult: true }).catch((err) => {
+          let savingResult = await Faq.findOneAndUpdate({ id_faq_kb: chatbot._id, intent_display_name: intent.intent_display_name }, new_faq, { new: true, upsert: true, rawResult: true }).catch((err) => {
             winston.error("Unable to create faq: ", err);
           })
 
@@ -950,65 +951,69 @@ router.get('/exportjson/:id_faq_kb', roleChecker.hasRole('admin'), (req, res) =>
 
   winston.debug("exporting bot...")
 
-  let id_faq_kb = req.params.id_faq_kb;
+  const chatbot_id = req.params.id_faq_kb;
+  const id_project = req.projectid;
 
-  Faq_kb.findById(id_faq_kb, (err, faq_kb) => {
+  Faq_kb.findOne({ _id: chatbot_id, id_project: id_project }, (err, faq_kb) => {
     if (err) {
       winston.error('GET FAQ-KB ERROR ', err)
       return res.status(500).send({ success: false, msg: 'Error getting bot.' });
-    } else {
-      winston.debug('FAQ-KB: ', faq_kb)
+    }
+    
+    if (!faq_kb) {
+      return res.status(404).send({ success: false, msg: "Chatbot not found with id " + chatbot_id + " for project " + id_project });
+    }
 
-      faqService.getAll(id_faq_kb).then((faqs) => {
+    winston.debug('FAQ-KB: ', faq_kb)
 
-        // delete from exclude map intent_id
-        const intents = faqs.map(({ _id, id_project, topic, status, id_faq_kb, createdBy, createdAt, updatedAt, __v, ...keepAttrs }) => keepAttrs)
+    faqService.getAll(chatbot_id).then((faqs) => {
 
-        if (!req.query.globals) {
-          winston.verbose("Delete globals from attributes!")
-          if (faq_kb.attributes) {
-            delete faq_kb.attributes.globals;
-          }
+      // delete from exclude map intent_id
+      const intents = faqs.map(({ _id, id_project, topic, status, chatbot_id, createdBy, createdAt, updatedAt, __v, ...keepAttrs }) => keepAttrs)
+
+      if (!req.query.globals) {
+        winston.verbose("Delete globals from attributes!")
+        if (faq_kb.attributes) {
+          delete faq_kb.attributes.globals;
         }
+      }
 
-        let json = {
-          webhook_enabled: faq_kb.webhook_enabled,
-          webhook_url: faq_kb.webhook_url,
-          language: faq_kb.language,
-          name: faq_kb.name,
-          slug: faq_kb.slug,
-          type: faq_kb.type,
-          subtype: faq_kb.subtype,
-          description: faq_kb.description,
-          attributes: faq_kb.attributes,
+      let json = {
+        webhook_enabled: faq_kb.webhook_enabled,
+        webhook_url: faq_kb.webhook_url,
+        language: faq_kb.language,
+        name: faq_kb.name,
+        slug: faq_kb.slug,
+        type: faq_kb.type,
+        subtype: faq_kb.subtype,
+        description: faq_kb.description,
+        attributes: faq_kb.attributes,
+        intents: intents
+      }
+
+      if (req.query.intentsOnly == 'true') {
+        let intents_obj = {
           intents: intents
         }
+        let intents_string = JSON.stringify(intents_obj);
+        res.set({ "Content-Disposition": "attachment; filename=\"intents.json\"" });
+        return res.send(intents_string);
 
-        if (req.query.intentsOnly == 'true') {
-          let intents_obj = {
-            intents: intents
-          }
-          let intents_string = JSON.stringify(intents_obj);
-          res.set({ "Content-Disposition": "attachment; filename=\"intents.json\"" });
-          return res.send(intents_string);
-
-        } else {
+      } else {
 
-          // if (req.query.file == "false") {
-          //   return res.status(200).send(json);
-          // }
-          let json_string = JSON.stringify(json);
-          res.set({ "Content-Disposition": "attachment; filename=\"bot.json\"" });
-          return res.send(json_string);
-        }
+        // if (req.query.file == "false") {
+        //   return res.status(200).send(json);
+        // }
+        let json_string = JSON.stringify(json);
+        res.set({ "Content-Disposition": "attachment; filename=\"bot.json\"" });
+        return res.send(json_string);
+      }
 
-      }).catch((err) => {
-        winston.error('GET FAQ ERROR: ', err)
-        return res.status(500).send({ success: false, msg: 'Error getting faqs.' });
-      })
-    }
+    }).catch((err) => {
+      winston.error('GET FAQ ERROR: ', err)
+      return res.status(500).send({ success: false, msg: 'Error getting faqs.' });
+    })
   })
-
 })
 
 router.post('/:faq_kbid/training', roleChecker.hasRole('admin'), function (req, res) {