@tiledesk/tiledesk-server 2.10.4 → 2.10.5

package/CHANGELOG.md

@@ -5,6 +5,10 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.10.5
+- Fix bug on access chatbot route rules
+- Fix bug update chatbot avatar
+
 # 2.10.4
 - Removed temporary conversation from default query to get all requests
 - Removed draft conversation from requests count

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.10.4",
+  "version": "2.10.5",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/routes/faq_kb.js

@@ -21,8 +21,6 @@ const roleConstants = require('../models/roleConstants');
 
 let chatbot_templates_api_url = process.env.CHATBOT_TEMPLATES_API_URL
 
-
-// Eliminare ? ['bot','subscription']
 router.post('/', roleChecker.hasRole('admin'), async function (req, res) {
   winston.debug('create BOT ', req.body);
 
@@ -45,7 +43,7 @@ router.post('/', roleChecker.hasRole('admin'), async function (req, res) {
 
 });
 
-router.post('/train', roleChecker.hasRoleOrTypes('admin', ['bot','subscription']), function (req, res) {
+router.post('/train', roleChecker.hasRole('admin'), function (req, res) {
 
   winston.info('train BOT ', req.body);
 
@@ -116,7 +114,7 @@ router.post('/train', roleChecker.hasRoleOrTypes('admin', ['bot','subscription']
   });
 });
 
-router.post('/aitrain/', roleChecker.hasRoleOrTypes('admin', ['bot','subscription']), async (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;
@@ -156,7 +154,7 @@ router.post('/aitrain/', roleChecker.hasRoleOrTypes('admin', ['bot','subscriptio
   })
 })
 
-router.post('/askbot', roleChecker.hasRoleOrTypes('admin', ['bot','subscription']), function (req, res) {
+router.post('/askbot', roleChecker.hasRole('admin'), function (req, res) {
 
   winston.debug('ASK BOT ', req.body);
 
@@ -223,7 +221,6 @@ router.post('/askbot', roleChecker.hasRoleOrTypes('admin', ['bot','subscription'
   });
 });
 
-// Eliminare ? ['bot','subscription']
 router.put('/:faq_kbid/publish', roleChecker.hasRole('admin'), async (req, res) => {
 
   let id_faq_kb = req.params.faq_kbid;
@@ -268,8 +265,7 @@ router.put('/:faq_kbid/publish', roleChecker.hasRole('admin'), async (req, res)
   }
 });
 
-// Eliminare ? ['bot','subscription']
-router.put('/:faq_kbid', roleChecker.hasRole('admin'), function (req, res) {
+router.put('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot','subscription']), function (req, res) {
 
   winston.debug(req.body);
 
@@ -344,8 +340,7 @@ router.put('/:faq_kbid', roleChecker.hasRole('admin'), function (req, res) {
   });
 });
 
-// Eliminare ? ['bot','subscription']
-router.put('/:faq_kbid/language/:language', roleChecker.hasRole('admin'), (req, res) => {
+router.put('/:faq_kbid/language/:language', roleChecker.hasRoleOrTypes('admin', ['bot','subscription']), (req, res) => {
   
   winston.debug("update language: ", req.params);
 
@@ -372,8 +367,7 @@ router.put('/:faq_kbid/language/:language', roleChecker.hasRole('admin'), (req,
 
 })
 
-// Eliminare ? ['bot','subscription']
-router.patch('/:faq_kbid/attributes', roleChecker.hasRole('admin'), 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
@@ -419,7 +413,6 @@ router.patch('/:faq_kbid/attributes', roleChecker.hasRole('admin'), function (re
   
 });
 
-// Eliminare ? ['bot','subscription']
 router.delete('/:faq_kbid', roleChecker.hasRole('admin'), function (req, res) {
 
   winston.debug(req.body);
@@ -436,7 +429,7 @@ router.delete('/:faq_kbid', roleChecker.hasRole('admin'), function (req, res) {
   });
 });
 
-router.get('/:faq_kbid',  roleChecker.hasRole('admin'), function (req, res) {
+router.get('/:faq_kbid',  roleChecker.hasRoleOrTypes('admin', ['bot','subscription']), function (req, res) {
 
   winston.debug(req.query);
 
@@ -481,7 +474,7 @@ router.get('/:faq_kbid',  roleChecker.hasRole('admin'), function (req, res) {
   });
 });
 
-router.get('/:faq_kbid/jwt', roleChecker.hasRole('admin'), function (req, res) {
+router.get('/:faq_kbid/jwt', roleChecker.hasRoleOrTypes('admin', ['bot','subscription']), function (req, res) {
 
   winston.debug(req.query);
 
@@ -522,7 +515,7 @@ router.get('/:faq_kbid/jwt', roleChecker.hasRole('admin'), function (req, res) {
  * 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.hasRole('agent'), function (req, res) {
+router.get('/', roleChecker.hasRoleOrTypes('agent', ['bot','subscription']), function (req, res) {
 
 
   winston.debug("req.query", req.query);
@@ -531,7 +524,7 @@ router.get('/', roleChecker.hasRole('agent'), function (req, res) {
   let restricted_mode = false;
 
   let project_user = req.projectuser;
-  if (project_user.role === roleConstants.AGENT) {
+  if (project_user && project_user.role === roleConstants.AGENT) {
     restricted_mode = true;
   }
 

package/routes/images.js

@@ -198,11 +198,11 @@ uploadAvatar.single('file'), async (req, res, next) => {
 
       let chatbot = await faq_kb.findById(bot_id).catch((err) => {
         winston.error("Error finding bot ", err);
-        res.status(500).send({ success: false, error: "Unable to find chatbot with id " + bot_id });
+        return res.status(500).send({ success: false, error: "Unable to find chatbot with id " + bot_id });
       })
 
       if (!chatbot) {
-        res.status(404).send({ success: false, error: "Chatbot not found" })
+        return res.status(404).send({ success: false, error: "Chatbot not found" })
       }
 
       let id_project = chatbot.id_project;

package/services/fileGridFsService.js

@@ -295,7 +295,7 @@ class FileGridFsService extends FileService {
                 if (req.user && req.user.id) {
                   var userid = req.user.id;
 
-                  if (req.query.user_id) {
+                  if (req.query.bot_id) {
                     winston.debug("req.query.user_id: "+ req.query.user_id);
                     // winston.info("req.projectuser ",req.projectuser);
 
@@ -303,7 +303,7 @@ class FileGridFsService extends FileService {
                     // if (req.project_user && req.project_user.role === ) {
 
                     // }
-                    userid = req.query.user_id;
+                    userid = req.query.bot_id;
                   }
                   subfolder = "/users/"+userid;
                 }