@tiledesk/tiledesk-server 2.17.4 → 2.18.1

package/models/role.js

@@ -0,0 +1,31 @@
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+var winston = require('../config/winston');
+
+
+var RoleSchema = new Schema({
+  name: { 
+    type: String,
+    required: true,
+    index:true
+  },
+  permissions: [String],
+//   permissions: {
+//     type: String,
+//     required: true
+// },
+  id_project: {
+    type: String,
+    required: true,
+    index: true
+  },
+
+});
+var role = mongoose.model('role', RoleSchema);
+
+if (process.env.MONGOOSE_SYNCINDEX) {
+  role.syncIndexes();
+  winston.verbose("role syncIndexes")
+}
+
+module.exports = role;

package/models/roleConstants.js

@@ -1,4 +1,6 @@
 module.exports = {
+        TYPE_AGENTS : 1,
+        TYPE_USERS : 2,
         // SUPERADMIN : 'superadmin',
         OWNER : 'owner',
         ADMIN : 'admin',

package/package.json

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

package/pubmodules/analytics/analytics.js

@@ -1780,7 +1780,7 @@ router.get('/tags/:type', async (req, res) => {
     date: { $gte: startDate, $lte: endDate }
   }
 
-  console.log("analytics tags query: ", query)
+  winston.debug("analytics tags query: ", query)
 
   let result = await Analytics.find(query).catch((err) => {
     winston.error("Error finding Analytics: ", err);
@@ -1821,7 +1821,7 @@ router.get('/tags/:type', async (req, res) => {
   
   // Assembly final result
   let data = { dates, series };
-  console.log(data);
+  
 
   return res.status(200).send(data);
   

package/pubmodules/cache/mongoose-cachegoose-fn.js

@@ -10,6 +10,7 @@
 
  var triggerEventEmitter = require("../trigger/event/triggerEventEmitter");
  var subscriptionEvent = require("../../event/subscriptionEvent");   
+ var roleEvent = require("../../event/roleEvent");   
 
  var winston = require('../../config/winston');
 
@@ -837,7 +838,43 @@
                 });   
             });
         });
+
+
+        roleEvent.on('role.create', function(role) {   
+            setImmediate(() => {    
+                var key =role.id_project+":roles:"+role.name;
+                winston.verbose("Deleting cache for role.create with key: " + key);
+                winston.verbose("Creating cache for department.create with key: " + key);
+                client.set(key, role, cacheUtil.defaultTTL, (err, reply) => {
+                    winston.debug("Created cache for role.create",reply);
+                    winston.verbose("Created cache for role.create",{err:err});
+                });
+            
+            });
+        });
+
+         roleEvent.on('role.update', function(role) {   
+            setImmediate(() => {    
+                var key =role.id_project+":roles:"+role.name;
+                winston.verbose("Deleting cache for role.update with key: " + key);
+                client.set(key, role, cacheUtil.defaultTTL, (err, reply) => {
+                    winston.debug("Updated cache for role.update",reply);
+                    winston.verbose("Updated cache for role.update",{err:err});
+                });
+            });
+        });
     
+         roleEvent.on("role.delete", function(role) {     
+            setImmediate(() => {      
+                var key =role.id_project+":roles:"+role.name;
+                winston.verbose("Deleting cache for role.delete with key: " + key);
+                del(client._cache._engine.client, key, function (err, reply) {  
+                    winston.debug("Deleted cache for role.delete",reply);
+                    winston.verbose("Deleted cache for role.delete",{err:err});
+                });   
+            });
+        });
+        
     }
     
 

package/pubmodules/canned/cannedResponseRoute.js

@@ -3,6 +3,7 @@ var router = express.Router();
 var CannedResponse = require("./cannedResponse");
 var winston = require('../../config/winston');
 const RoleConstants = require('../../models/roleConstants');
+const roleConstants = require('../../models/roleConstants');
 // const CannedResponseEvent = require('../event/CannedResponseEvent');
 
 
@@ -16,13 +17,18 @@ router.post('/', function (req, res) {
     text: req.body.text,
     id_project: req.projectid,
     createdBy: req.user.id,
-    updatedBy: req.user.id
+    updatedBy: req.user.id,
+    shared: false
   });
 
   if (req.projectuser.role == 'owner' || req.projectuser.role == 'admin') {
     newCannedResponse.shared = true;
   } else {
-    newCannedResponse.shared = false;
+    if (req.projectuser.roleType === roleConstants.TYPE_AGENTS) {
+      if (req.body.shared && req.body.shared === true) {
+        newCannedResponse.shared = true;
+      }
+    }
   }
 
   newCannedResponse.save(function (err, savedCannedResponse) {
@@ -40,8 +46,8 @@ router.put('/:cannedResponseid', async function (req, res) {
   winston.debug(req.body);
   const canned_id = req.params.cannedResponseid;
   const id_project = req.projectid;
-  let user_role = req.projectuser.role;
-  
+  let user_role = req.projectuser?.role;
+  let roleType = req.projectuser?.roleType || null;
   var update = {};
 
   const allowedFields = ['title', 'text', 'attributes']
@@ -79,6 +85,12 @@ router.put('/:cannedResponseid', async function (req, res) {
       winston.warn("Not allowed. User " + req.user.id + " can't modify a canned response of user " + canned.createdBy);
       return res.status(403).send({ success: false, error: "Not allowed to modify a non administration canned response"})
     }
+  }
+  else if (roleType === RoleConstants.TYPE_AGENTS) {
+    if (canned.hasOwnProperty('shared') && canned.shared === false && canned.createdBy !== req.user.id) {
+      winston.warn("Not allowed. User " + req.user.id + " can't modify a canned response of user " + canned.createdBy);
+      return res.status(403).send({ success: false, error: "Not allowed to modify a non administration canned response"})
+    }
   } else {
     winston.warn("User " + req.user.id + "trying to modify canned with role " + user_role);
     return res.status(401).send({ success: false, error: "Unauthorized"})
@@ -100,6 +112,7 @@ router.delete('/:cannedResponseid', async function (req, res) {
   const canned_id = req.params.cannedResponseid;
   const id_project = req.projectid;
   let user_role = req.projectuser.role;
+  let roleType = req.projectuser?.roleType || null;
 
   let canned = await CannedResponse.findOne({ _id: canned_id, id_project: id_project }).catch((err) => {
     winston.error("Error finding canned response: ", err);
@@ -128,7 +141,14 @@ router.delete('/:cannedResponseid', async function (req, res) {
       winston.warn("Not allowed. User " + req.user.id + " can't delete a canned response of user " + canned.createdBy);
       return res.status(403).send({ success: false, error: "Not allowed to delete a non administration canned response"})
     }
-  } else {
+  } 
+  else if (roleType === RoleConstants.TYPE_AGENTS) {
+    if (canned.hasOwnProperty('shared') && canned.shared === false && canned.createdBy !== req.user.id) {
+      winston.warn("Not allowed. User " + req.user.id + " can't delete a canned response of user " + canned.createdBy);
+      return res.status(403).send({ success: false, error: "Not allowed to delete a non administration canned response"})
+    }
+  }
+  else {
     winston.warn("User " + req.user.id + "trying to delete canned with role " + user_role);
     return res.status(401).send({ success: false, error: "Unauthorized"})
   }
@@ -149,6 +169,7 @@ router.delete('/:cannedResponseid/physical', async function (req, res) {
   const canned_id = req.params.cannedResponseid;
   const id_project = req.projectid;
   let user_role = req.projectuser.role;
+  let roleType = req.projectuser?.roleType || null;
 
   let canned = await CannedResponse.findOne({ _id: canned_id, id_project: id_project }).catch((err) => {
     winston.error("Error finding canned response: ", err);
@@ -177,7 +198,14 @@ router.delete('/:cannedResponseid/physical', async function (req, res) {
       winston.warn("Not allowed. User " + req.user.id + " can't delete a canned response of user " + canned.createdBy);
       return res.status(403).send({ success: false, error: "Not allowed to delete a non administration canned response"})
     }
-  } else {
+  } 
+  else if (roleType === RoleConstants.TYPE_AGENTS) {
+    if (canned.hasOwnProperty('shared') && canned.shared === false && canned.createdBy !== req.user.id) {
+      winston.warn("Not allowed. User " + req.user.id + " can't delete a canned response of user " + canned.createdBy);
+      return res.status(403).send({ success: false, error: "Not allowed to delete a non administration canned response"})
+    }
+  }
+  else {
     winston.warn("User " + req.user.id + "trying to delete canned with role " + user_role);
     return res.status(401).send({ success: false, error: "Unauthorized"})
   }

package/pubmodules/routing-queue/listener.js

@@ -110,7 +110,13 @@ class Listener {
               var query = {id_project: operatorsResult.id_project, status: {$lt:1000}};      
               // asyncForEach(operatorsResult.available_agents, async (aa) => {
               for (const aa of operatorsResult.available_agents) {
-                query.participants = aa.id_user._id.toString();// attento qui
+                let user_id;
+                if (aa.id_user._id) {
+                  user_id = aa.id_user._id.toString();// attento qui
+                } else {
+                  user_id = aa.id_user;// attento qui
+                }
+                query.participants = user_id;
                 winston.debug("department operators query:" , query);
 
 

package/pubmodules/trigger/rulesTrigger.js

@@ -1164,11 +1164,8 @@ class RulesTrigger {
                       lead: createdLead, requester: puser
                     };
       
-                    //let t1 = Date.now();
+
                     return requestService.create(new_request).then(function (savedRequest) {                   
-                      //console.log("[Performance] (rulesTrigger) requestService.create time: " + (Date.now() - t1));
-                      // performance console log
-                      // console.log("************* request created trigger: "+new Date().toISOString());
 
                         if (attributes) {
                           attributes.sendnotification = false; //  sembra nn funzionae
@@ -1177,9 +1174,7 @@ class RulesTrigger {
                         var senderFullname = fullname || 'Guest'; // guest_here
 
                         // create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language) {
-                        //let t2 = Date.now();
                         return messageService.create( id_user, senderFullname , savedRequest.request_id, text, id_project, id_user,  MessageConstants.CHAT_MESSAGE_STATUS.SENDING, attributes, type, eventTrigger.event.metadata, language).then(function(savedMessage) {
-                          //console.log("[Performance] (rulesTrigger) messageService.create time: " + (Date.now() - t2));
                           return savedMessage;
                         });
                       }).catch(function (err) {

package/routes/auth.js

@@ -197,6 +197,7 @@ function (req, res) {
       id_project: req.body.id_project, //attentoqui
       uuid_user: req.user._id,
       role: RoleConstants.GUEST,
+      roleType : RoleConstants.TYPE_USERS,
       user_available: true,
       createdBy: req.user._id,
       updatedBy: req.user._id
@@ -408,6 +409,7 @@ router.post('/signinWithCustomToken', [
               uuid_user: req.user._id,
               // id_user: req.user._id,
               role: role,
+              roleType : RoleConstants.TYPE_USERS, //RICONtROLLA QUIA 
               user_available: true,
               createdBy: req.user._id, //oppure req.user.id attento problema
               updatedBy: req.user._id
@@ -486,7 +488,7 @@ router.post('/signinWithCustomToken', [
              } else {
                winston.debug('different role : '+role + " " + project_user.role);
              }
-
+            // rolecheck
             if (req.user.role && (req.user.role === RoleConstants.OWNER || req.user.role === RoleConstants.ADMIN || req.user.role === RoleConstants.AGENT)) {
               let userFromDB = await User.findOne({email: req.user.email.toLowerCase(), status: 100}).exec();
 

package/routes/department.js

@@ -24,6 +24,7 @@ router.post('/', [passport.authenticate(['basic', 'jwt'], { session: false }), v
       default: req.body.default,
       status: req.body.status,
       id_group: req.body.id_group,
+      groups: req.body.groups,
       id_project: req.projectid,
       createdBy: req.user.id,
       updatedBy: req.user.id
@@ -79,7 +80,9 @@ router.put('/:departmentid', [passport.authenticate(['basic', 'jwt'], { session:
   if (req.body.status!=undefined) {
       update.status = req.body.status;
   }
-  
+  if (req.body.groups!=undefined) {
+    update.groups = req.body.groups;
+  }      
 
 
   Department.findByIdAndUpdate(req.params.departmentid, update, { new: true, upsert: true }, function (err, updatedDepartment) {
@@ -121,6 +124,9 @@ router.put('/:departmentid', [passport.authenticate(['basic', 'jwt'], { session:
     if (req.body.id_group!=undefined) {
         update.id_group = req.body.id_group;
     }    
+    if (req.body.groups!=undefined) {
+      update.groups = req.body.groups;
+    }      
   
   
     Department.findByIdAndUpdate(req.params.departmentid, update, { new: true, upsert: true }, function (err, updatedDepartment) {

package/routes/message.js

@@ -268,7 +268,10 @@ async (req, res)  => {
 
           // TOOD update also request attributes and sourcePage
           // return requestService.incrementMessagesCountByRequestId(request.request_id, request.id_project).then(function(savedRequest) {
-          // console.log("savedRequest.participants.indexOf(message.sender)", savedRequest.participants.indexOf(message.sender));
+          Request.findOneAndUpdate({request_id: request.request_id, id_project: request.id_project}, { "attributes.last_message": savedMessage}).catch((err) => {
+            winston.error("Create message - saved last message in request error: ", error);
+          })
+
               
           if (request.participants && request.participants.indexOf(sender) > -1) { //update waiitng time if write an  agent (member of participants)
             winston.debug("updateWaitingTimeByRequestId");

package/routes/project.js

@@ -900,8 +900,10 @@ router.get('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
   var sortQuery={};
   sortQuery[sortField] = direction;
 
+// rolequery
 
-  Project_user.find({ id_user: req.user._id , role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT]}, status: "active"}).
+  Project_user.find({ id_user: req.user._id , roleType: RoleConstants.TYPE_AGENTS, status: "active"}).
+  // Project_user.find({ id_user: req.user._id , role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT]}, status: "active"}).
     // populate('id_project').
     populate({
       path: 'id_project',
@@ -1037,8 +1039,10 @@ router.get('/:projectid/users/availables', async  (req, res) => {
   if (isOpen === false) {
     return res.json(available_agents_array);
   }
+// rolequery
+  let query = { id_project: projectid, user_available: true, roleType: RoleConstants.TYPE_AGENTS };
+  // let query = { id_project: projectid, user_available: true, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT]} };
 
-  let query = { id_project: projectid, user_available: true, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT]} };
 
   if (dep_id) {
     let department = await Department.findById(dep_id).catch((err) => {
@@ -1052,7 +1056,41 @@ router.get('/:projectid/users/availables', async  (req, res) => {
     }
 
     let group_id = department.id_group;
-    if (group_id) {
+    let groups = department.groups;
+
+    if (groups && Array.isArray(groups) && groups.length > 0) {
+      // Converti i group_id in ObjectId per la query
+      const groupIds = groups
+        .map(g => g.group_id)
+        .filter(id => !!id)
+        .map(id => mongoose.Types.ObjectId(id));
+    
+      if (groupIds.length > 0) {
+        const dbGroups = await Group.find({ _id: { $in: groupIds } }).catch((err) => {
+          winston.error("(Users Availables) find groups error: ", err);
+          return res.status(500).send({ success: false, error: err });
+        });
+    
+        if (!dbGroups || dbGroups.length === 0) {
+          winston.error("(Users Availables) no valid groups found");
+          return res.status(404).send({ success: false, error: "No valid groups found" });
+        }
+    
+        // Filtra i gruppi abilitati
+        const enabledGroups = dbGroups.filter(g => g.enabled !== false);
+    
+        if (enabledGroups.length === 0) {
+          winston.error("(Users Availables) all groups are disabled");
+          return res.status(403).send({ success: false, error: "All groups are currently disabled" });
+        }
+    
+        // Raccogli tutti i membri (stringhe) e rimuovi duplicati
+        const members = [...new Set(enabledGroups.flatMap(g => g.members))];
+    
+        query.id_user = { $in: members };
+      }
+    }
+    else if (group_id) {
       let group = await Group.findById(group_id).catch((err) => {
         winston.error("(Users Availables) find group error: ", err)
         return res.status(500).send({ success: false, error: err })

package/routes/project_user.js

@@ -16,6 +16,7 @@ var passport = require('passport');
 require('../middleware/passport')(passport);
 var validtoken = require('../middleware/valid-token')
 var roleChecker = require('../middleware/has-role');
+const puEvent = require('../event/projectUserEvent');
 
 
 router.post('/invite', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], function (req, res) {
@@ -56,18 +57,30 @@ router.post('/invite', [passport.authenticate(['basic', 'jwt'], { session: false
 
     } else {
 
-      let roles = [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT];
-
-      Project_user.findOne({ id_project: id_project, id_user: user._id, role: { $in: roles }}, (err, puser) => {
+      /**
+       * *** IT IS NOT ALLOWED TO INVITE A USER WHO IS ALREADY A MEMBER OF THE PROJECT *** 
+       * FIND THE PROJECT USERS FOR THE PROJECT ID PASSED BY THE CLIENT IN THE BODY OF THE REQUEST
+       * IF THE ID OF THE USER FOUND FOR THE EMAIL (PASSED IN THE BODY OF THE REQUEST - see above)
+       * MATCHES ONE OF THE USER ID CONTENTS IN THE PROJECTS USER OBJECT STOP THE WORKFLOW AND RETURN AN ERROR */
+      
+      // rolequery
+      // var role = [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT];     
+      // winston.debug("role", role);
+    
+      // winston.debug("PROJECT USER ROUTES - req projectid", req.projectid);
+      return Project_user.findOne({ id_project: req.projectid, id_user: user._id, roleType: RoleConstants.TYPE_AGENTS, status: "active"}, function (err, puser) {
+      // return Project_user.find({ id_project: req.projectid, role: { $in : role }, status: "active"}, function (err, projectuser) {
+        //puser = projectuser
+      
+        winston.debug('PRJCT-USERS FOUND (FILTERED FOR THE PROJECT ID) ', puser )
         if (err) {
           winston.error("Error inviting an already existing user: ", err);
           return res.status(500).send({ success: false, msg: "An error occurred on inviting user " + email + " on project " + id_project })
         }
 
-        if (!roles.includes(req.body.role)) {
-          return res.status(400).send({ success: false, msg: 'Invalid role specified: ' + req.body.role });
-        }
-        
+        // if (!roles.includes(req.body.role)) {
+        //   return res.status(400).send({ success: false, msg: 'Invalid role specified: ' + req.body.role });
+        // }
         let user_available = typeof req.body.user_available === 'boolean' ? req.body.user_available : true
 
         if (puser) {
@@ -76,7 +89,20 @@ router.post('/invite', [passport.authenticate(['basic', 'jwt'], { session: false
             return res.status(403).send({ success: false, msg: 'Forbidden. User is already a member', code: 4001 });
           }
 
-          Project_user.findByIdAndUpdate(puser._id, { role: req.body.role, user_available: user_available, trashed: false, status: 'active' }, { new: true}, (err, updatedPuser) => {
+          winston.debug('NO ERROR, SO CREATE AND SAVE A NEW PROJECT USER ')
+
+          var newProject_user = new Project_user({
+            // _id: new mongoose.Types.ObjectId(),
+            id_project: req.projectid,
+            id_user: user._id,
+            role: req.body.role,         
+            roleType : RoleConstants.TYPE_AGENTS,   
+            user_available: user_available, 
+            createdBy: req.user.id,
+            updatedBy: req.user.id
+          });
+
+          return newProject_user.save(function (err, savedProject_user) {
             if (err) {
               winston.error("Error update existing project user before inviting it ", err)
               return res.status(500).send({ success: false, msg: "An error occurred on inviting user " + email + " on project " + id_project })
@@ -101,6 +127,7 @@ router.post('/invite', [passport.authenticate(['basic', 'jwt'], { session: false
             id_project: id_project,
             id_user: user._id,
             role: req.body.role,
+            roleType : RoleConstants.TYPE_AGENTS,   
             user_available: user_available,
             createdBy: req.user.id,
             updatedBy: req.user.id
@@ -138,6 +165,7 @@ router.post('/', [passport.authenticate(['basic', 'jwt'], { session: false }), v
     // role: RoleConstants.USER,   
     // - Create project_user endpoint by agent (Ticketing) now is with Guest Role      
     role: RoleConstants.GUEST,
+    roleType : RoleConstants.TYPE_USERS,   
     user_available: false,
     tags: req.body.tags, 
     createdBy: req.user.id,
@@ -298,6 +326,7 @@ router.delete('/:project_userid', [passport.authenticate(['basic', 'jwt'], { ses
         return res.status(404).send({ success: false, error: 'Project user not found with id ' + pu_id });
       }
 
+      puEvent.emit('project_user.deleted', project_user);
       // Event 'project_user.delete' not working - Check it and improve it to manage soft/hard delete
       return res.status(200).send(project_user);
 
@@ -324,6 +353,7 @@ router.delete('/:project_userid', [passport.authenticate(['basic', 'jwt'], { ses
         });
       }
 
+      puEvent.emit('project_user.deleted', project_user);
       return res.status(200).send(project_user);
     });
   }
@@ -387,6 +417,20 @@ router.put('/:project_userid/restore', [passport.authenticate(['basic', 'jwt'],
   });
 });
 
+router.get('/me', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], function (req, res, next) {
+  if (!req.project) {
+    return res.status(404).send({ success: false, msg: 'Project not found.' });
+  }
+  var project_user = req.projectuser;
+
+  var pu = project_user.toJSON();
+   
+  pu.isBusy = ProjectUserUtil.isBusy(project_user, req.project.settings && req.project.settings.max_agent_assigned_chat);
+  res.json([pu]);
+
+
+});
+
 router.get('/:project_userid', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], function (req, res) {
   // router.get('/details/:project_userid', function (req, res) {
   // winston.debug("PROJECT USER ROUTES - req projectid", req.projectid);
@@ -513,18 +557,25 @@ router.get('/users/:user_id', [passport.authenticate(['basic', 'jwt'], { session
  */                                                                                       
 router.get('/', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot', 'subscription'])], function (req, res) {
 
-  var role = [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT];
+  // rolequery
+  // var role = [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT];
 
+  var query;
   if (req.query.role) {
     role = req.query.role;
+    winston.debug("role", role);
+    query =  {id_project: req.projectid, role: { $in : role } };
+  } else {
+     query =  {id_project: req.projectid, roleType: RoleConstants.TYPE_AGENTS };
   }
-  winston.debug("role", role);
 
-  var query = { id_project: req.projectid, role: { $in : role } };
   if (!req.query.trashed || req.query.trashed === 'false' || req.query.trashed === false) {
     query.trashed = { $ne: true };
   }
 
+  // var query =  {id_project: req.projectid, role: { $in : role } };
+  
+
   if (req.query.presencestatus) {
     query["presence.status"] = req.query.presencestatus;
   }