@tiledesk/tiledesk-server 2.17.4 → 2.18.3

package/services/departmentService.js

@@ -272,9 +272,25 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
           // console.log('OPERATORS - »»»» BOT IS DEFINED - !!! DEPT HAS NOT GROUP ID')
           // console.log('OPERATORS - »»»» BOT IS DEFINED -> ID BOT', department.id_bot);
           // console.log('OPERATORS - »»»» nobot ', nobot)
-          var role = [RoleConstants.OWNER, RoleConstants.ADMIN,RoleConstants.SUPERVISOR, RoleConstants.AGENT];
-// attento indice
-          return Project_user.find({ id_project: projectid, role: { $in : role }, status: "active" }).exec(function (err, project_users) {
+          winston.debug("main_flow_cache_2 departmentService project users");
+          
+          
+          // rolequery
+          // var role = [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT];
+          // var qpu = Project_user.find({ id_project: projectid, role: { $in : role }, status: "active" });
+          var qpu = Project_user.find({ id_project: projectid, roleType: RoleConstants.TYPE_AGENTS, status: "active" });
+
+          
+          // use this. $in doesn't use index very well
+          // var qpu = Project_user.findOne({ id_project: projectid, $or: [{ "role": RoleConstants.AGENT }, { "role": RoleConstants.SUPERVISOR }, { "role":  RoleConstants.ADMIN }, { "role": RoleConstants.OWNER }], status: "active" })
+          
+          if (cacheEnabler.project_user) {
+            qpu.cache(cacheUtil.queryTTL, projectid+":project_users:query:teammates:available") //request_cache
+            winston.debug('project_user cache enabled');
+          }
+  
+  
+          return qpu.exec(function (err, project_users) {
             if (err) {
               winston.error('-- > 2 DEPT FIND BY ID ERR ', err)
               return reject(err);
@@ -369,12 +385,12 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
         // console.log('D-2 GROUP -> [ FIND PROJECT USERS: ALL and AVAILABLE (with OH) ] -> MEMBERS LENGHT: ', group[0].members.length);
         // console.log('D-2 GROUP -> [ FIND PROJECT USERS: ALL and AVAILABLE (with OH) ] -> MEMBERS ID: ', group[0].members);
 
-        // , user_available: true
-        //Project_user.findAllProjectUsersByProjectIdWhoBelongsToMembersOfGroup(id_prject, group[0]);
-        // riprodurre su v2
-         return Project_user.find({ id_project: projectid, id_user: { $in : group[0].members}, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT]}, status: "active" }).exec(function (err, project_users) {          
-          // uni error round robin
-        //return Project_user.find({ id_project: projectid, id_user: group[0].members, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.AGENT]} }).exec(function (err, project_users) {
+   
+
+        // rolequery
+        
+         return Project_user.find({ id_project: projectid, id_user: { $in : group[0].members}, roleType: RoleConstants.TYPE_AGENTS, status: "active" }).exec(function (err, project_users) {          
+        //  return Project_user.find({ id_project: projectid, id_user: { $in : group[0].members}, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT]}, status: "active" }).exec(function (err, project_users) {         
 
           // console.log('D-2 GROUP -> [ FIND PROJECT USERS: ALL and AVAILABLE (with OH) ] -> PROJECT ID ', projectid);
           if (err) {
@@ -436,8 +452,20 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
 
   return new Promise(function (resolve, reject) {
 
-    var role = [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT];
-    return Project_user.find({ id_project: projectid , role: { $in : role }, status: "active" }).exec(function (err, project_users) {
+    // var role = [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT];
+// rolequery
+    var qpu = Project_user.find({ id_project: projectid, roleType: RoleConstants.TYPE_AGENTS, status: "active" });
+    // var qpu = Project_user.find({ id_project: projectid, role: { $in : role }, status: "active" });
+          
+    // use this. $in doesn't use index very well    
+    if (cacheEnabler.project_user) {
+      qpu.cache(cacheUtil.queryTTL, projectid+":project_users:query:teammates:available") //request_cache
+      winston.debug('project_user cache enabled');
+    }
+    // return Project_user.find({ id_project: projectid , role: { $in : role }, status: "active" }).exec(function (err, project_users) {
+    return qpu.exec(function (err, project_users) {
+
+
       if (err) {
         winston.error('D-3 NO GROUP -> [ FIND PROJECT USERS: ALL and AVAILABLE (with OH) ] -> ERR ', err)
         return reject(err);

package/services/emailService.js

@@ -282,7 +282,6 @@ class EmailService {
   // }
 
   async send(mail, quoteEnabled, project, quoteManager) {
-
     if (!this.enabled) {
       winston.info('EmailService is disabled. Not sending email');
       return 0;
@@ -339,7 +338,8 @@ class EmailService {
         if (mail.callback) {
           mail.callback(error, { info: info });
         }
-        return winston.error("Error sending email ", { error: error, mailConfig: mail.config, mailOptions: mailOptions });
+        //return winston.error("Error sending email ", { error: error, mailConfig: mail.config, mailOptions: mailOptions });
+        return winston.error("Error sending email ", { error: error, mailConfig: mail.config });
       }
       winston.verbose('Email sent:', { info: info });
       winston.debug('Email sent:', { info: info, mailOptions: mailOptions });

package/services/pendingInvitationService.js

@@ -4,6 +4,7 @@ var emailService = require("../services/emailService");
 var Project_user = require("../models/project_user");
 var mongoose = require('mongoose');
 var winston = require('../config/winston');
+var RoleConstants = require("../models/roleConstants");
 
 class Pending_Invitation {
 
@@ -91,6 +92,7 @@ class Pending_Invitation {
             id_project: invite.id_project,
             id_user: newUserId,
             role: invite.role,
+            roleType : RoleConstants.TYPE_AGENTS,   
             user_available: true,
             createdBy: invite.createdBy,
             updatedBy: invite.createdBy

package/services/projectService.js

@@ -8,6 +8,7 @@ var projectEvent = require("../event/projectEvent");
 var winston = require('../config/winston');
 const cacheEnabler = require("./cacheEnabler");
 const cacheUtil = require("../utils/cacheUtil");
+var RoleConstants = require("../models/roleConstants");
 
 class ProjectService {
 
@@ -33,7 +34,8 @@ class ProjectService {
           var newProject_user = new Project_user({
             id_project: savedProject._id,
             id_user: createdBy,
-            role: 'owner',
+            role: RoleConstants.OWNER,
+            roleType : RoleConstants.TYPE_AGENTS,   
             user_available: true,
             createdBy: createdBy,
             updatedBy: createdBy

package/services/projectUserService.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var Project = require("../models/project");
 var Project_user = require("../models/project_user");
-var mongoose = require('mongoose');
-var User = require('../models/user');
 var winston = require('../config/winston');
-var pendinginvitation = require("../services/pendingInvitationService");
+
+var Role = require('../models/role');
+var cacheUtil = require('../utils/cacheUtil');
+var cacheEnabler = require("../services/cacheEnabler");
 
 class ProjectUserService {
 
@@ -42,6 +42,69 @@ class ProjectUserService {
 
     }
 
+     async getWithPermissions(id_user, id_project, user_sub) {       
+        var project_user = await this.get(id_user, id_project, user_sub);
+        winston.debug("getWithPermissions for id_user " + id_user + " project_user ", project_user);
+
+        if (project_user) {
+            winston.debug("getWithPermissions project_user role: " + project_user.role);
+
+            var role = await this.getPermissions(project_user.role, id_project);
+
+            if (role) {
+                project_user._doc.rolePermissions = role.permissions;   //https://github.com/Automattic/mongoose/issues/4614
+                // project_user.set("rolePermissions", role);
+            }
+            
+
+        }
+        
+        return project_user;
+    }
+
+    async getPermissions(role, id_project) {
+         //               var cacheManager = require('../utils/cacheManager');
+        //               cacheManager.getClient().get("find in cache")
+        let q = Role.findOne({"name":role, "id_project": id_project});
+
+        let cache_key = id_project+":roles:"+role;
+
+        if (cacheEnabler.role) { 
+            q.cache(cacheUtil.defaultTTL, cache_key);
+            winston.debug("cacheEnabler.role enabled");
+        }
+
+        var role = await q.exec();
+
+        if (role) 
+            winston.debug("getWithPermissions role ", role.toJSON());
+
+        return role;
+
+    }
+
+    async get(id_user, id_project, user_sub) {
+        // JWT_HERE
+        var query = { id_project: id_project, id_user: id_user, status: "active"};
+        let cache_key = id_project+":project_users:iduser:"+id_user;
+
+        if (user_sub && (user_sub=="userexternal" || user_sub=="guest")) {
+            query = { id_project: id_project, uuid_user: id_user, status: "active"};
+            cache_key = id_project+":project_users:uuid_user:"+id_user;
+        }
+        winston.debug("hasRoleOrType query " + JSON.stringify(query));
+
+        let q = Project_user.findOne(query);
+        if (cacheEnabler.project_user) { 
+            q.cache(cacheUtil.defaultTTL, cache_key);
+            winston.debug("cacheEnabler.project_user enabled");
+        }
+        var project_user = await q.exec();
+        winston.debug("ProjectUserUtil project_user", project_user);
+       
+        return project_user;
+    }
+
 }
 var projectUserService = new ProjectUserService();
 

package/services/subscriptionNotifierQueued.js

@@ -111,6 +111,14 @@ class SubscriptionNotifierQueued {
         winston.debug('SubscriptionNotifier project_user.update sent');     
       });
     });
+
+
+    authEvent.on("project_user.update.agent",  function(event) {  
+      setImmediate(() => {
+        subscriptionNotifier.subscribe('project_user.update.agent', event.updatedProject_userPopulated);     
+        winston.debug('SubscriptionNotifier project_user.update.agent sent');     
+      });
+    });
     
     winston.info('SubscriptionNotifierQueued started');
   }

package/services/updateRequestSnapshotQueued.js

@@ -25,12 +25,10 @@ class UpdateRequestSnapshotQueued {
     requestEvent.on(snapshotUpdateKey, function (data) {
       setImmediate(() => {
         winston.debug("updateRequestSnapshot on request.snapshot.update ", data);
-        console.log("updateRequestSnapshot on request.snapshot.update ", data);
 
         const request = data.request;
         const snapshot = data.snapshot;
         const agentsArray = snapshot?.agents || [];
-        console.log("(queue) updateRequestSnapshot snapshot agents length: ", agentsArray.length);
 
         if (!request || !request.request_id || !request.id_project) {
           winston.error("updateRequestSnapshot: Invalid request data", data);
@@ -57,7 +55,6 @@ class UpdateRequestSnapshotQueued {
               return;
             }
             if (updatedRequest) {
-              console.log("updateRequestSnapshot updated snapshot.agents for request " + updatedRequest.request_id, new Date());
               winston.debug("updateRequestSnapshot updated snapshot.agents for request " + updatedRequest.request_id);
             } else {
               winston.warn("updateRequestSnapshot: Request not found for " + request.request_id);

package/test/departmentService.js

@@ -48,6 +48,7 @@ describe('DepartmentService()', function () {
               id_project: savedProject._id,
               id_user: savedUser2._id,
               role: roleConstants.AGENT,
+              roleType : RoleConstants.TYPE_AGENTS,   
               user_available: true,
               createdBy: savedUser2._id,
               updatedBy: savedUser2._id,
@@ -62,6 +63,7 @@ describe('DepartmentService()', function () {
                 id_project: savedProject._id,
                 id_user: savedUser3._id,
                 role: roleConstants.AGENT,
+                roleType : RoleConstants.TYPE_AGENTS,                   
                 user_available: true,
                 createdBy: savedUser3._id,
                 updatedBy: savedUser3._id,
@@ -126,6 +128,7 @@ describe('DepartmentService()', function () {
               id_project: savedProject._id,
               id_user: savedUser2._id,
               role: roleConstants.AGENT,
+              roleType : RoleConstants.TYPE_AGENTS,   
               user_available: true,
               createdBy: savedUser2._id,
               updatedBy: savedUser2._id,
@@ -247,6 +250,7 @@ describe('DepartmentService()', function () {
               id_project: savedProject._id,
               id_user: savedUser2._id,
               role: roleConstants.AGENT,
+              roleType : RoleConstants.TYPE_AGENTS,   
               user_available: false,
               createdBy: savedUser2._id,
               updatedBy: savedUser2._id,
@@ -325,6 +329,7 @@ describe('DepartmentService()', function () {
             id_project: savedProject._id,
             id_user: savedUser2._id,
             role: roleConstants.AGENT,
+            roleType : RoleConstants.TYPE_AGENTS,  
             user_available: false,
             createdBy: savedUser2._id,
             updatedBy: savedUser2._id,

package/test/messageRoute.js

@@ -9,7 +9,7 @@ var userService = require('../services/userService');
 var leadService = require('../services/leadService');
 var messageService = require('../services/messageService');
 var Project_user = require("../models/project_user");
-var roleConstants = require('../models/roleConstants');
+var RoleConstants = require('../models/roleConstants');
 const uuidv4 = require('uuid/v4');
 
 //Require the dev-dependencies
@@ -223,7 +223,8 @@ describe('MessageRoute', () => {
             // _id: new mongoose.Types.ObjectId(),
             id_project: savedProject._id,
             id_user: savedUser2._id,
-            role: roleConstants.AGENT,
+            role: RoleConstants.AGENT,
+            roleType : RoleConstants.TYPE_AGENTS,   
             user_available: true,
             createdBy: savedUser2._id,
             updatedBy: savedUser2._id,
@@ -298,7 +299,8 @@ describe('MessageRoute', () => {
           // _id: new mongoose.Types.ObjectId(),
           id_project: savedProject._id,
           uuid_user: uid,
-          role: roleConstants.USER,
+          role: RoleConstants.USER,
+          roleType : RoleConstants.TYPE_USERS,   
           user_available: true,
           createdBy: savedUser._id,
           updatedBy: savedUser._id,
@@ -875,7 +877,8 @@ describe('MessageRoute', () => {
             // _id: new mongoose.Types.ObjectId(),
             id_project: savedProject._id,
             id_user: savedUser2._id,
-            role: roleConstants.USER,
+            role: RoleConstants.USER,
+            roleType : RoleConstants.TYPE_USERS,   
             user_available: true,
             createdBy: savedUser2._id,
             updatedBy: savedUser2._id,

package/test/projectUserRoute.js

@@ -0,0 +1,116 @@
+//During the test the env variable is set to test
+process.env.NODE_ENV = 'test';
+process.env.LOG_LEVEL = 'error';
+process.env.ADMIN_EMAIL = "admin@tiledesk.com";
+
+let log = false;
+var projectService = require('../services/projectService');
+var userService = require('../services/userService');
+
+//Require the dev-dependencies
+let chai = require('chai');
+let chaiHttp = require('chai-http');
+let server = require('../app');
+let should = chai.should();
+var fs = require('fs');
+const path = require('path');
+
+// chai.config.includeStack = true;
+
+var expect = chai.expect;
+var assert = chai.assert;
+
+chai.use(chaiHttp);
+
+describe('ProjectUserRoute', () => {
+
+  describe('Delete', () => {
+
+    it('delete-project-user-and-remove-from-group', (done) => {
+
+      let email_owner = "owner-signup-" + Date.now() + "@email.com";
+      let email_agent = "agent-signup-" + Date.now() + "@email.com";
+      var pwd = "pwd";
+
+      userService.signup(email_owner, pwd, "Owner Firstname", "Owner Lastname").then((owner) => {
+        userService.signup(email_agent, pwd, "Agent Firstname", "Agent Lastname").then((agent) => {
+          projectService.create("test-project", owner._id).then((project) => {
+
+            // Invite agent on the project
+            chai.request(server)
+              .post('/' + project._id + "/project_users/invite")
+              .auth(email_owner, pwd)
+              .set('content-type', 'application/json')
+              .send({ email: email_agent, role: "agent", userAvailable: false })
+              .end((err, res) => {
+
+                if (err) { console.error("err: ", err); }
+                if (log) { console.log("Invite agent to project res.body: ", res.body) };
+
+                res.should.have.status(200);
+                res.body.should.be.a('object');
+                expect(res.body.id_user).to.equal(agent._id.toString());
+
+                let pu_id = res.body._id;
+
+                // Create group
+                chai.request(server)
+                  .post('/' + project._id + "/groups")
+                  .auth(email_owner, pwd)
+                  .set('content-type', 'application/json')
+                  .send({ name: "test-group", members: [owner._id, agent._id] })
+                  .end((err, res) => {
+
+                    if (err) { console.error("err: ", err); }
+                    if (log) { console.log("Create group res.body: ", res.body) };
+
+                    res.should.have.status(200);
+                    res.body.should.be.a('object');
+                    expect(res.body.name).to.equal("test-group");
+                    expect(res.body.members.length).to.equal(2);
+                    expect(res.body.members[0]).to.equal(owner._id.toString())
+                    expect(res.body.members[1]).to.equal(agent._id.toString())
+
+                    let group_id = res.body._id;
+
+                    // Remove project user from project
+                    chai.request(server)
+                      .delete('/' + project._id + '/project_users/' + pu_id + '?soft=true')
+                      .auth(email_owner, pwd)
+                      .set('content-type', 'application/json')
+                      .end((err, res) => {
+
+                        if (err) { console.error("err: ", err); }
+                        if (log) { console.log("Delete project user res.body: ", res.body) };
+
+                        res.should.have.status(200);
+                        res.body.should.be.a('object');
+
+                        // Check group
+                        chai.request(server)
+                          .get('/' + project._id + '/groups/' + group_id)
+                          .auth(email_owner, pwd)
+                          .set('content-type', 'application/json')
+                          .end((err, res) => {
+                            if (err) { console.error("err: ", err); }
+                            if (log) { console.log("Check group res.body: ", res.body) };
+
+                            res.should.have.status(200);
+                            res.body.should.be.a('object');
+                            expect(res.body.members.length).to.equal(1);
+                            expect(res.body.members[0]).to.equal(owner._id.toString())
+
+                            done()
+                          })
+
+                      })
+                  })
+              })
+          })
+        })
+      })
+    }).timeout(5000);
+
+  })
+
+});

package/test/requestService.js

@@ -10,6 +10,7 @@ let should = chai.should();
 var config = require('../config/database');
 var mongoose = require('mongoose');
 var winston = require('../config/winston');
+var RoleConstants = require('../models/roleConstants');
 
 let log = false;
 
@@ -991,7 +992,8 @@ describe('RequestService', function () {
             // _id: new mongoose.Types.ObjectId(),
             id_project: savedProject._id.toString(),
             id_user: savedUser2._id.toString(),
-            role: "agent",
+            role: RoleConstants.AGENT,
+            roleType : RoleConstants.TYPE_AGENTS,   
             user_available: false,
             createdBy: userid,
             updatedBy: userid
@@ -1073,7 +1075,8 @@ describe('RequestService', function () {
             // _id: new mongoose.Types.ObjectId(),
             id_project: savedProject._id.toString(),
             id_user: savedUser2._id.toString(),
-            role: "agent",
+            role: RoleConstants.AGENT,
+            roleType : RoleConstants.TYPE_AGENTS,  
             user_available: false,
             createdBy: userid,
             updatedBy: userid
@@ -1338,7 +1341,8 @@ describe('RequestService', function () {
             // _id: new mongoose.Types.ObjectId(),
             id_project: savedProject._id.toString(),
             id_user: savedUser2._id.toString(),
-            role: "agent",
+            role: RoleConstants.AGENT,
+            roleType : RoleConstants.TYPE_AGENTS,  
             user_available: true,
             createdBy: userid,
             updatedBy: userid

package/test-int/bot.js

@@ -16,7 +16,7 @@ var Department = require('../models/department');
 var Faq = require('../models/faq');
 var faqBotSupport = require('../services/faqBotSupport');
 var Project_user = require("../models/project_user");
-
+var RoleConstants = require('../models/roleConstants');
 var expect = chai.expect;
 var assert = chai.assert;
 
@@ -255,7 +255,8 @@ describe('bot', () => {
                 // _id: new mongoose.Types.ObjectId(),
                 id_project: savedProject._id.toString(),
                 id_user: savedUser2._id.toString(),
-                role: "agent",           
+                role: RoleConstants.AGENT,
+                roleType : RoleConstants.TYPE_AGENTS,     
                 user_available: true, 
                 createdBy: savedUser._id,
                 updatedBy: savedUser._id