@tiledesk/tiledesk-server 2.11.8 → 2.11.9

package/CHANGELOG.md

@@ -5,6 +5,10 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.11.9
+- Changed: oauth2 endpoints in auth route
+- Updated: improved project users management (soft delete)
+
 # 2.11.8
 - Added: migration file to migrate namespace engine
 

package/middleware/recaptcha.js

@@ -1,11 +1,17 @@
 var winston = require('../config/winston');
 
-var Recaptcha = require('express-recaptcha').RecaptchaV3
-var recaptcha = new Recaptcha('6Lf1khcpAAAAABMNHJfnJm43vVTxFzXM7ADqDAp5', '6Lf1khcpAAAAAG6t7LuOfl9vThGPFOOJIiAoMIhs')
+var Recaptcha = require('express-recaptcha').RecaptchaV3;
 
-const RECAPTCHA_ENABLED =  false;
+const recaptcha_key = process.env.RECAPTCHA_KEY;
+const recaptcha_secret = process.env.RECAPTCHA_SECRET;
+
+winston.info("Recaptcha key: " + recaptcha_key + " and secret: " + recaptcha_secret );
+let recaptcha;
+
+let RECAPTCHA_ENABLED =  false;
 
 if (process.env.RECAPTCHA_ENABLED === true || process.env.RECAPTCHA_ENABLED ==="true") {
+    recaptcha = new Recaptcha(recaptcha_key, recaptcha_secret);
     RECAPTCHA_ENABLED = true;
 }
 
@@ -21,7 +27,7 @@ module.exports =
               next();
                 // success code
             } else {
-              winston.error("Signup recaptcha ko");
+              winston.error("Signup recaptcha ko: "+ error);
             //   next({status:"Signup recaptcha ko"});
                 res.status(403).send({success: false, msg: 'Recaptcha error.'});
 
@@ -29,4 +35,4 @@ module.exports =
             }
         })
        
-}
+}

package/models/project_user.js

@@ -74,6 +74,11 @@ var TagSchema = require("../models/tag");
       index: true,
       required: true
     },
+    trashed: {
+      type: Boolean,
+      default: false,
+      required: false
+    }
   }, {
       timestamps: true,
       toJSON: { virtuals: true } //used to polulate messages in toJSON// https://mongoosejs.com/docs/populate.html
@@ -116,7 +121,24 @@ Project_userSchema.virtual('isAuthenticated').get(function () {
   Project_userSchema.index({ id_project: 1, role: 1, status: 1, createdAt: 1  }); 
 
 
-
+  Project_userSchema.pre('findOneAndUpdate', async function(next) {
+    // Get the update object
+    const update = this.getUpdate();
+
+    // Check if 'trashed' is being set to true
+    if (update && (
+        (update.trashed === true) ||
+        (update.$set && update.$set.trashed === true)
+      )) {
+      // Set status to "disabled"
+      if (!update.$set) {
+        update.$set = {};
+      }
+      update.$set.status = "disabled";
+      this.setUpdate(update);
+    }
+    next();
+  });
 
 
   module.exports = mongoose.model('project_user', Project_userSchema);;

package/package.json

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

package/routes/auth.js

@@ -773,78 +773,72 @@ router.get("/google/callback", passport.authenticate("google", { session: false
 
 
 
-router.get("/oauth2", function(req,res,next){
-  winston.debug("redirect_url: "+ req.query.redirect_url );
+router.get("/oauth2", function (req, res, next) {
+  winston.debug("(oauth2) redirect_url: " + req.query.redirect_url);
   req.session.redirect_url = req.query.redirect_url;
 
-  winston.debug("forced_redirect_url: "+ req.query.forced_redirect_url );
+  winston.debug("(oauth2) forced_redirect_url: " + req.query.forced_redirect_url);
   req.session.forced_redirect_url = req.query.forced_redirect_url;
 
   passport.authenticate(
     'oauth2'
-  )(req,res,next);
+  )(req, res, next);
 });
 
 // router.get('/oauth2',
 //   passport.authenticate('oauth2'));
 
-router.get('/oauth2/callback',
-  passport.authenticate('oauth2', { session: false}),
-  function(req, res) {
-    winston.debug("'/oauth2/callback: ", req.query);
-    winston.debug("/oauth2/callback --> req.session.redirect_url", req.session.redirect_url);
-    winston.debug("/oauth2/callback --> req.session.forced_redirect_url", req.session.forced_redirect_url);
-
-    var user = req.user;
-    winston.debug("user", user);
-    winston.debug("req.session.redirect_url: "+ req.session.redirect_url); 
-    var userJson = user.toObject();
-    
-    delete userJson.password;
-  
-  
-      var signOptions = {     
-        issuer:  'https://tiledesk.com',       
-        subject:  'user',
-        audience:  'https://tiledesk.com',
-        jwtid: uuidv4()
-  
-      };
-  
-      var alg = process.env.GLOBAL_SECRET_ALGORITHM;
-      if (alg) {
-        signOptions.algorithm = alg;
-      }
-  
-  
-    var token = jwt.sign(userJson, configSecret, signOptions); //priv_jwt pp_jwt              
-  
-  
-    // return the information including token as JSON
-    // res.json(returnObject);
-  
-    let dashboard_base_url = process.env.EMAIL_BASEURL || config.baseUrl;
-    winston.debug("Google Redirect dashboard_base_url: ", dashboard_base_url);
-  
-    let homeurl = "/#/";
-  
-    if (req.session.redirect_url) {
-      homeurl = req.session.redirect_url;
-    }
-  
-    var url = dashboard_base_url+homeurl+"?token=JWT "+token;
-  
-    if (req.session.forced_redirect_url) {
-      url = req.session.forced_redirect_url+"?jwt=JWT "+token;  //attention we use jwt= (ionic) instead token=(dashboard) for ionic 
-    }
-  
-    winston.debug("Google Redirect: "+ url);
-  
-    res.redirect(url);
-  
+router.get('/oauth2/callback', passport.authenticate('oauth2', { session: false }), function (req, res) {
+  winston.debug("'/oauth2/callback: ", req.query);
+  winston.debug("/oauth2/callback --> req.session.redirect_url", req.session.redirect_url);
+  winston.debug("/oauth2/callback --> req.session.forced_redirect_url", req.session.forced_redirect_url);
 
-    
-  });
+  var user = req.user;
+  winston.debug("(/oauth2/callback) user", user);
+  winston.debug("(/oauth2/callback) req.session.redirect_url: " + req.session.redirect_url);
+  var userJson = user.toObject();
+
+  delete userJson.password;
+
+  var signOptions = {
+    issuer: 'https://tiledesk.com',
+    subject: 'user',
+    audience: 'https://tiledesk.com',
+    jwtid: uuidv4()
+
+  };
+
+  var alg = process.env.GLOBAL_SECRET_ALGORITHM;
+  if (alg) {
+    signOptions.algorithm = alg;
+  }
+
+  var token = jwt.sign(userJson, configSecret, signOptions); //priv_jwt pp_jwt              
+
+  // return the information including token as JSON
+  // res.json(returnObject);
+
+  let dashboard_base_url = process.env.EMAIL_BASEURL || config.baseUrl;
+  winston.debug("(/oauth2/callback) Google Redirect dashboard_base_url: ", dashboard_base_url);
+
+  let homeurl = "/#/";
+
+  if (req.session.redirect_url) {
+    homeurl = req.session.redirect_url;
+  }
+
+  const separator = homeurl.includes('?') ? '&' : '?';
+  var url = dashboard_base_url + homeurl + separator + "token=JWT " + token;
+
+  if (req.session.forced_redirect_url) {
+    const separator = req.session.forced_redirect_url.includes('?') ? '&' : '?';
+    url = req.session.forced_redirect_url + separator + "jwt=JWT " + token;  //attention we use jwt= (ionic) instead token=(dashboard) for ionic 
+  }
+
+  winston.debug("(/oauth2/callback) Google Redirect: " + url);
+
+  res.redirect(url);
+});
 
 router.get(
   "/keycloak",

package/routes/kb.js

@@ -1538,10 +1538,12 @@ router.post('/sitemap', async (req, res) => {
 
   const sitemap = new Sitemapper({
     url: sitemap_url,
-    timeout: 15000
+    timeout: 15000,
+    debug: true
   });
 
   sitemap.fetch().then((data) => {
+    // TODO - check on data.errors to catch error
     winston.debug("data: ", data);
     res.status(200).send(data);
   }).catch((err) => {

package/routes/project_user.js

@@ -12,176 +12,118 @@ var RoleConstants = require("../models/roleConstants");
 var ProjectUserUtil = require("../utils/project_userUtil");
 const uuidv4 = require('uuid/v4');
 
-
 var passport = require('passport');
 require('../middleware/passport')(passport);
 var validtoken = require('../middleware/valid-token')
 var roleChecker = require('../middleware/has-role');
 
 
-
-// NEW: INVITE A USER
 router.post('/invite', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], function (req, res) {
 
-  winston.debug('-> INVITE USER ', req.body);
+  winston.debug('Invite ProjectUser body ', req.body);
 
-  var email = req.body.email;
+  let id_project = req.projectid;
+  let email = req.body.email;
   if (email) {
     email = email.toLowerCase();
   }
 
-  winston.debug('»»» INVITE USER EMAIL', email);
-  winston.debug('»»» CURRENT USER ID', req.user._id);
-  winston.debug('»»» PROJECT ID', req.projectid);
-// authType
-  User.findOne({ email: email, status: 100
-    // , authType: 'email_password' 
-  }, function (err, user) {
-    if (err) throw err;
+  winston.debug('Invite ProjectUser with email ' + email + ' on project ' + req.projectid);
+  
+  User.findOne({ email: email, status: 100 }, (err, user) => {
+    
+    if (err) {
+      winston.error("Error in searching for a possible existing project user with email " + email);
+      return res.status(500).send({ success: false, error: "An error occurred during the invite process" });
+    }
 
     if (!user) {
-      /*
-       * *** USER NOT FOUND > SAVE EMAIL AND PROJECT ID IN PENDING INVITATION *** */
+      // User not registered on Tiledesk Platform -> Save email and project_id in pending invitation
       // TODO req.user.firstname is null for bot visitor
-      return pendinginvitation.saveInPendingInvitation(req.projectid, req.project.name, email, req.body.role, req.user._id, req.user.firstname, req.user.lastname)
-        .then(function (savedPendingInvitation) {      
-           
-            var eventData = {req: req, savedPendingInvitation: savedPendingInvitation};
-            winston.debug("eventData",eventData);
-            authEvent.emit('project_user.invite.pending', eventData);
-     
-          return res.json({ msg: "User not found, save invite in pending ", pendingInvitation: savedPendingInvitation });
-        })
-        .catch(function (err) {
-          return res.send(err);
-          // return res.status(500).send(err);
-        });
-      // return res.status(404).send({ success: false, msg: 'User not found.' });
+      return pendinginvitation.saveInPendingInvitation(req.projectid, req.project.name, email, req.body.role, req.user._id, req.user.firstname, req.user.lastname).then(function (savedPendingInvitation) {
+        var eventData = { req: req, savedPendingInvitation: savedPendingInvitation };
+        winston.debug("eventData", eventData);
+        authEvent.emit('project_user.invite.pending', eventData);
+        return res.json({ msg: "User not found, save invite in pending ", pendingInvitation: savedPendingInvitation });
+      }).catch(function (err) {
+        return res.send(err);
+      });
 
     } else if (req.user.id == user._id) {
-      winston.debug('-> -> FOUND USER ID', user._id)
-      winston.debug('-> -> CURRENT USER ID', req.user.id);
-      // if the current user id is = to the id of found user return an error:
-      // (to a user is not allowed to invite oneself) 
-
-      winston.debug('XXX XXX FORBIDDEN')
+      // If the current user id is = to the id of found user return an error. To a user is not allowed to invite oneself.
+      winston.debug('Invite User: found user ' + user._id + ' is equal to current user ' + req.user.id + '. Is not allowed to invite oneself.')
       return res.status(403).send({ success: false, msg: 'Forbidden. It is not allowed to invite oneself', code: 4000 });
 
     } else {
 
-      /**
-       * *** 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 */
-
-      var role = [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT];     
-      winston.debug("role", role);
-    
-      // winston.debug("PROJECT USER ROUTES - req projectid", req.projectid);
+      let roles = [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT];
 
-        return Project_user.find({ id_project: req.projectid, role: { $in : role }, status: "active"}, function (err, projectuser) {
-
-      
-        winston.debug('PRJCT-USERS FOUND (FILTERED FOR THE PROJECT ID) ', projectuser)
+      Project_user.findOne({ id_project: id_project, id_user: user._id, role: { $in: roles }}, (err, puser) => {
         if (err) {
-          winston.error("Error gettting project_user for invite", err);
-          return res.status(500).send(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 (!projectuser) {
-          // winston.debug('*** PRJCT-USER NOT FOUND ***')
-          return res.status(404).send({ success: false, msg: 'Project user not found.' });
+        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 (projectuser) {
-          try {
-            projectuser.forEach(p_user => {
-              if (p_user) {
-                // winston.debug('»»»» FOUND USER ID: ', user._id, ' TYPE OF ', typeof (user._id))
-                // winston.debug('»»»» PRJCT USER > USER ID: ', p_user.id_user, ' TYPE OF ', typeof (p_user.id_user));
-                var projectUserId = p_user.id_user.toString();
-                var foundUserId = user._id.toString()
-
-                winston.debug('»»»» FOUND USER ID: ', foundUserId, ' TYPE OF ', typeof (foundUserId))
-                winston.debug('»»»» PRJCT USER > USER ID: ', projectUserId, ' TYPE OF ', typeof (projectUserId));
-
-                // var n = projectuser.includes('5ae6c62c61c7d54bf119ac73');
-                // winston.debug('USER IS ALREADY A MEMBER OF THE PROJECT ', n)
-                if (projectUserId == foundUserId) {
-                  // if ('5ae6c62c61c7d54bf119ac73' == '5ae6c62c61c7d54bf119ac73') {
-
-                    winston.debug('»»»» THE PRJCT-USER ID ', p_user.id_user, ' MATCHES THE FOUND USER-ID', user._id)
-                    winston.warn("User " + projectUserId+ " is already a member of the project: " + req.projectid)
-
-                  // cannot use continue or break inside a JavaScript Array.prototype.forEach loop. However, there are other options:
-                  throw new Error('User is already a member'); // break
-                  // return res.status(403).send({ success: false, msg: 'Forbidden. User is already a member' });
-                }
-              }
-            });
-          }
-          catch (e) {
-            winston.error('»»» ERROR ', e)
+        if (puser) {
+          if (puser.trashed !== true) {
+            winston.warn("Trying to invite an already project member user")
             return res.status(403).send({ success: false, msg: 'Forbidden. User is already a member', code: 4001 });
           }
 
-          winston.debug('NO ERROR, SO CREATE AND SAVE A NEW PROJECT USER ')
-
-          var user_available = true;
-          if (req.body.user_available!=undefined) {
-            user_available = req.body.user_available;
-          }
-          var newProject_user = new Project_user({
-            // _id: new mongoose.Types.ObjectId(),
-            id_project: req.projectid,
-            id_user: user._id,
-            role: req.body.role,           
-            user_available: user_available, 
-            createdBy: req.user.id,
-            updatedBy: req.user.id
-          });
-
-          return newProject_user.save(function (err, savedProject_user) {
+          Project_user.findByIdAndUpdate(puser._id, { role: req.body.role, user_available: user_available, trashed: false, status: 'active' }, { new: true}, (err, updatedPuser) => {
             if (err) {
-              winston.error('--- > ERROR ', err)
-              return res.status(500).send({ success: false, msg: 'Error saving object.' });
+              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 })
             }
 
+            emailService.sendYouHaveBeenInvited(email, req.user.firstname, req.user.lastname, req.project.name, id_project, user.firstname, user.lastname, req.body.role)
 
+            updatedPuser.populate({path:'id_user', select:{'firstname':1, 'lastname':1}},function (err, updatedPuserPopulated){
+              var pu = updatedPuserPopulated.toJSON();
+              pu.isBusy = ProjectUserUtil.isBusy(savedProject_userPopulated, req.project.settings && req.project.settings.max_agent_assigned_chat);
+              var eventData = {req:req, updatedPuserPopulated: pu};
+              winston.debug("eventData",eventData);
+              authEvent.emit('project_user.invite', eventData);
+            });
 
-            winston.debug('INVITED USER (IS THE USER FOUND BY EMAIL) ', user);
-            winston.debug('EMAIL of THE INVITED USER ', email);
-            winston.debug('ROLE of THE INVITED USER ', req.body.role);
-            winston.debug('PROJECT NAME ', req.body.role);
-            winston.debug('LOGGED USER ID ', req.user.id);
-            winston.debug('LOGGED USER NAME ', req.user.firstname);
-            winston.debug('LOGGED USER NAME ', req.user.lastname);
+            return res.status(200).send(updatedPuser);
+          })
 
+        } else {
 
-            var invitedUserFirstname = user.firstname
-            var invitedUserLastname = user.lastname
+          let newProject_user = new Project_user({
+            id_project: id_project,
+            id_user: user._id,
+            role: req.body.role,
+            user_available: user_available,
+            createdBy: req.user.id,
+            updatedBy: req.user.id
+          })
 
-            emailService.sendYouHaveBeenInvited(email, req.user.firstname, req.user.lastname, req.project.name, req.projectid, invitedUserFirstname, invitedUserLastname, req.body.role)
-            
-            // try {
-              //test it
-              savedProject_user.populate({path:'id_user', select:{'firstname':1, 'lastname':1}},function (err, savedProject_userPopulated){
-                var pu = savedProject_userPopulated.toJSON();
-                pu.isBusy = ProjectUserUtil.isBusy(savedProject_userPopulated, req.project.settings && req.project.settings.max_agent_assigned_chat);
-        
-                
-                  var eventData = {req:req, savedProject_userPopulated: pu};
-                  winston.debug("eventData",eventData);
-                  authEvent.emit('project_user.invite', eventData);
-              });
-            // } catch(e) {winston.error('Error emitting activity');}
-            
-            return res.json(savedProject_user);
+          newProject_user.save((err, savedProject_user) => {
+            if (err) {
+              winston.error("Error saving new project user: ", err)
+              return res.status(500).send({ success: false, msg: "An error occurred on inviting user " + email + " on project " + id_project })
+            }
 
-  
-          });
+            emailService.sendYouHaveBeenInvited(email, req.user.firstname, req.user.lastname, req.project.name, id_project, user.firstname, user.lastname, req.body.role)
+
+            savedProject_user.populate({path:'id_user', select:{'firstname':1, 'lastname':1}},function (err, savedProject_userPopulated){
+              var pu = savedProject_userPopulated.toJSON();
+              pu.isBusy = ProjectUserUtil.isBusy(savedProject_userPopulated, req.project.settings && req.project.settings.max_agent_assigned_chat);
+              var eventData = {req:req, savedProject_userPopulated: pu};
+              winston.debug("eventData",eventData);
+              authEvent.emit('project_user.invite', eventData);
+            });
 
+            return res.status(200).send(savedProject_user);
+          })
         }
       })
     }
@@ -264,7 +206,6 @@ router.put('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
   });
 });
 
-
 router.put('/:project_userid', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('admin', ['subscription'])], function (req, res) {
 
   winston.debug("project_userid update", req.body);
@@ -334,23 +275,48 @@ router.put('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
   });
 });
 
-
-
 // TODO fai servizio di patch degli attributi come request
 // TODO  blocca cancellazione owner?
 router.delete('/:project_userid', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], function (req, res) {
 
+  const { hard, soft } = req.query;
+  const pu_id = req.params.project_userid;
+
   winston.debug(req.body);
-  
-  if (req.query.force === "true") {
 
-    Project_user.findByIdAndRemove(req.params.project_userid, { new: false }, function (err, project_user) {
+  if (soft === "true") {
+    // Soft Delete
+    Project_user.findByIdAndUpdate(pu_id, { trashed: true }, { new: true }, (err, project_user) => {
       if (err) {
-        winston.error("Error gettting project_user for delete", err);
-        return res.status(500).send({ success: false, msg: 'Error deleting object.' });
+        winston.error("Error gettting project_user for soft delete", err);
+        return res.status(500).send({ success: false, msg: 'Error deleting Project User with id ' + pu_id });
       }
 
-      winston.debug("Physically removed project_user", project_user);
+      winston.debug("Soft deleted project_user", project_user);
+      if (!project_user) {
+        winston.warn("Project user not found for soft delete with id " + pu_id);
+        return res.status(404).send({ success: false, error: 'Project user not found with id ' + pu_id });
+      }
+
+      // Event 'project_user.delete' not working - Check it and improve it to manage soft/hard delete
+      return res.status(200).send(project_user);
+
+    })
+  }
+  else if (hard === "true") {
+    // Hard Delete
+    Project_user.findByIdAndRemove(pu_id, { new: false }, (err, project_user) => {
+      if (err) {
+        winston.error("Error gettting project_user for hard delete", err);
+        return res.status(500).send({ success: false, msg: 'Error deleting Project user with id ' + pu_id });
+      }
+
+      if (!project_user) {
+        winston.warn("Project user not found for soft delete with id " + pu_id);
+        return res.status(404).send({ success: false, error: 'Project user not found with id ' + pu_id });
+      }
+
+      winston.debug("Hard deleted project_user", project_user);
 
       if (project_user) {
         project_user.populate({ path: 'id_user', select: { 'firstname': 1, 'lastname': 1 } }, function (err, project_userPopulated) {
@@ -358,25 +324,26 @@ router.delete('/:project_userid', [passport.authenticate(['basic', 'jwt'], { ses
         });
       }
 
-      res.json(project_user);
+      return res.status(200).send(project_user);
     });
-  } else {
-
-    Project_user.findByIdAndUpdate(req.params.project_userid, { status: "disabled", user_available: false }, { new: true }, function (err, project_user) {
+  }
+  else {
+    // Disable
+    Project_user.findByIdAndUpdate(pu_id, { status: "disabled", user_available: false }, { new: true }, (err, project_user) => {
         if (err) {
-          winston.error("Error gettting project_user for logical delete", err);
-          return res.status(500).send({ success: false, msg: 'Error disabling object.' });
+          winston.error("Error gettting project_user for disable user", err);
+          return res.status(500).send({ success: false, msg: 'Error disabling Project User with id ' + pu_id });
         }
 
-        winston.debug("Logically disabled project_user", project_user);
-
-        if (project_user) {
-          project_user.populate({ path: 'id_user', select: { 'firstname': 1, 'lastname': 1 } }, function (err, project_userPopulated) {
-            authEvent.emit('project_user.delete', { req: req, project_userPopulated: project_userPopulated });
-          });
+        if (!project_user) {
+          winston.warn("Project user not found for soft delete with id " + pu_id);
+          return res.status(404).send({ success: false, error: 'Project user not found with id ' + pu_id });
         }
 
-        res.json(project_user);
+        winston.debug("Disabled project_user", project_user);
+
+        // Event 'project_user.delete' not working - Check it and improve it to manage disable project user
+        return res.status(200).send(project_user);
       }
     );
   }
@@ -403,7 +370,6 @@ router.get('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
 
 });
 
-
 router.get('/users/search', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('user', ['subscription'])], async (req, res, next) => { //changed for smtp 
   // router.get('/users/search', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], async (req, res, next) => {
   winston.debug("--> users search  ");
@@ -440,8 +406,6 @@ router.get('/users/search', [passport.authenticate(['basic', 'jwt'], { session:
 /**
  * GET PROJECT-USER BY PROJECT ID AND CURRENT USER ID 
 //  */
- 
-
 router.get('/users/:user_id', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], function (req, res, next) {
   winston.debug("--> users USER ID ", req.params.user_id);
 
@@ -518,7 +482,7 @@ router.get('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
   }
   winston.debug("role", role);
 
-  var query = { id_project: req.projectid, role: { $in : role } }; //, status: 'active'
+  var query = { id_project: req.projectid, role: { $in : role }, trashed: { $ne: true } };
 
   if (req.query.presencestatus) {
     query["presence.status"] = req.query.presencestatus;

package/test/kbRoute.js

@@ -3,9 +3,9 @@ process.env.NODE_ENV = 'test';
 process.env.GPTKEY = "fakegptkey";
 process.env.LOG_LEVEL = 'critical'
 process.env.KB_WEBHOOK_TOKEN = "testtoken"
-process.env.PINECONE_INDEX = "test_index";
+process.env.PINECONE_INDEX = "test-index";
 process.env.PINECONE_TYPE = "pod";
-process.env.PINECONE_INDEX_HYBRID = "test_index_hybrid";
+process.env.PINECONE_INDEX_HYBRID = "test-index-hybrid";
 process.env.PINECONE_TYPE_HYBRID = "serverless";
 process.env.ADMIN_EMAIL = "admin@tiledesk.com";
 
@@ -69,7 +69,7 @@ describe('KbRoute', () => {
 
                             res.should.have.status(200);
                             expect(res.body.length).to.equal(1);
-                            expect(res.body[0].engine.index_name).to.equal('test_index')
+                            expect(res.body[0].engine.index_name).to.equal('test-index')
 
                             let namespace_id = res.body[0].id;
 
@@ -1149,7 +1149,7 @@ describe('KbRoute', () => {
                         expect(res.body.name).to.equal('MyCustomNamespace');
                         should.exist(res.body.engine)
                         expect(res.body.engine.name).to.equal('pinecone');
-                        expect(res.body.engine.type).to.equal('pod');
+                        expect(res.body.engine.type).to.equal('serverless');
 
                         // Get again all namespace. A new default namespace should not be created.
                         chai.request(server)