@tiledesk/tiledesk-server 2.10.50 → 2.10.52

package/CHANGELOG.md

@@ -5,6 +5,13 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.10.52
+- updated tybot-connector to 0.2.148
+- updated faqRoute /get endpoint with restricted mode
+
+# 2.10.51
+- updated /replace endpoint adding trashed: false inside query
+
 # 2.10.50
 - updated tybot-connector to 0.2.147
 - removed logs

package/app.js

@@ -557,8 +557,8 @@ app.use('/:projectid/tags', [passport.authenticate(['basic', 'jwt'], { session:
 app.use('/:projectid/subscriptions', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], resthook);
 
 //deprecated
-app.use('/:projectid/faq', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], faq);
-app.use('/:projectid/intents', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], faq);
+app.use('/:projectid/faq', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], faq);
+app.use('/:projectid/intents', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], faq);
 
 //Deprecated??
 app.use('/:projectid/faqpub', faqpub);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.10.50",
+  "version": "2.10.52",
   "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.14",
     "@tiledesk/tiledesk-train-jobworker": "^0.0.11",
-    "@tiledesk/tiledesk-tybot-connector": "^0.2.147",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.148",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.76",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.11",
     "@tiledesk/tiledesk-sms-connector": "^0.1.11",

package/routes/faq.js

@@ -16,11 +16,12 @@ csv.separator = ';';
 const axios = require("axios").default;
 var configGlobal = require('../config/global');
 const roleConstants = require('../models/roleConstants');
+const roleChecker = require('../middleware/has-role');
 
 const apiUrl = process.env.API_URL || configGlobal.apiUrl;
 
 // POST CSV FILE UPLOAD FROM CLIENT
-router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next) {
+router.post('/uploadcsv', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), upload.single('uploadFile'), function (req, res, next) {
   winston.debug(' -> -> REQ BODY ', req.body);
   winston.debug(' -> ID FAQ-KB  ', req.body.id_faq_kb);
   winston.debug(' -> DELIMITER ', req.body.delimiter);
@@ -138,7 +139,7 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
 });
 
 
-router.post('/', function (req, res) {
+router.post('/', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), function (req, res) {
 
   winston.debug(req.body);
 
@@ -205,7 +206,7 @@ router.post('/', function (req, res) {
   });
 });
 
-router.post('/ops_update', async (req, res) => {
+router.post('/ops_update', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), async (req, res) => {
 
   let id_faq_kb = req.body.id_faq_kb;
   let operations = req.body.operations;
@@ -321,7 +322,7 @@ router.post('/ops_update', async (req, res) => {
 
 })
 
-router.patch('/:faqid/attributes', function (req, res) {
+router.patch('/:faqid/attributes', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), function (req, res) {
   let data = req.body;
   winston.debug("data: ", data);
 
@@ -374,7 +375,7 @@ router.patch('/:faqid/attributes', function (req, res) {
   })
 })
 
-router.put('/:faqid', function (req, res) {
+router.put('/:faqid', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), function (req, res) {
 
   winston.debug('UPDATE FAQ ', req.body);
   let faqid = req.params.faqid;
@@ -470,7 +471,7 @@ router.put('/:faqid', function (req, res) {
 
 
 // DELETE REMOTE AND LOCAL FAQ
-router.delete('/:faqid', function (req, res) {
+router.delete('/:faqid', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), function (req, res) {
 
   winston.debug('DELETE FAQ - FAQ ID ', req.params.faqid);
 
@@ -521,7 +522,7 @@ router.delete('/:faqid', function (req, res) {
 });
 
 // EXPORT FAQ TO CSV
-router.get('/csv', function (req, res) {
+router.get('/csv', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), function (req, res) {
   var query = {};
 
   winston.debug('req.query', req.query);
@@ -554,7 +555,7 @@ router.get('/csv', function (req, res) {
 });
 
 
-router.get('/:faqid', function (req, res) {
+router.get('/:faqid', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), function (req, res) {
 
   winston.debug(req.body);
 
@@ -570,12 +571,18 @@ router.get('/:faqid', function (req, res) {
 });
 
 
-
-router.get('/', function (req, res, next) {
+router.get('/', roleChecker.hasRoleOrTypes('agent', ['bot', 'subscription']), function (req, res, next) {
   var query = {};
 
   winston.debug("GET ALL FAQ OF THE BOT ID (req.query): ", req.query);
 
+  let restricted_mode;
+
+  let project_user = req.projectuser;
+  if (project_user && project_user.role === roleConstants.AGENT) {
+    restricted_mode = true;
+  }
+
   if (req.query.id_faq_kb) {
     query.id_faq_kb = req.query.id_faq_kb;
   }
@@ -610,8 +617,7 @@ router.get('/', function (req, res, next) {
     query.intent_display_name = req.query.intent_display_name
   }
 
-  let project_user = req.projectuser;
-  if (project_user && project_user.role === roleConstants.AGENT) {
+  if (restricted_mode) {
     query.agents_available = {
       $in: [ null, true ]
     }
@@ -631,21 +637,26 @@ router.get('/', function (req, res, next) {
   //   console.log("result: ", result);
   // })
 
-  return Faq.find(query).
-    skip(skip).limit(limit).
-    populate({ path: 'faq_kb' })//, match: { trashed: { $in: [null, false] } }}).
-    .exec(function (err, faq) {
-      winston.debug("GET FAQ ", faq);
+  return Faq.find(query)
+    .skip(skip).limit(limit)
+    .populate({ path: 'faq_kb' })
+    .lean()
+    .exec(function (err, faqs) {
+
+      winston.debug("GET FAQ ", faqs);
 
       if (err) {
         winston.debug('GET FAQ err ', err)
         return next(err)
       };
-      winston.debug('GET FAQ  ', faq)
-      res.json(faq);
 
-    });
+      if (restricted_mode === true) {
+        faqs = faqs.map(({ webhook_enabled, faq_kb, actions, attributes, createdBy, createdAt, updatedAt, __v, ...keepAttrs }) => keepAttrs)
+        faqs = faqs.filter(f => (f.intent_display_name !== "start" && f.intent_display_name !== 'defaultFallback'));
+      }
 
+      res.status(200).send(faqs);
+    });
 
 });
 

package/routes/request.js

@@ -454,7 +454,7 @@ router.put('/:requestid/replace', async (req, res) => {
   }
 
   if (name) {
-    let chatbot = await faq_kb.findOne({ id_project: req.projectid, name: name }).catch((err) => {
+    let chatbot = await faq_kb.findOne({ id_project: req.projectid, name: name, trashed: false }).catch((err) => {
       winston.error("Error finding bot ", err);
       return res.status(500).send({ success: false, error: "An error occurred getting chatbot with name " + name })
     })
@@ -464,7 +464,7 @@ router.put('/:requestid/replace', async (req, res) => {
     }
 
     id = "bot_" + chatbot._id;
-    winston.info("Chatbot found: ", id);
+    winston.verbose("Chatbot found: ", id);
   }
 
   if (slug) {