Merge branch 'master' of https://github.com/Tiledesk/tiledesk-server

Tiledesk · Oct 23, 2020 · d86e939 · d86e939
2 parents 74401ea + 2039aa0
commit d86e939
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Next
 - Campaign REST API (test it)
 
+# 2.1.13
+- Added Cors options pre-flight with 
+- Fix TD218 Audit log for user invitation already registered
+
 # 2.1.12
 - Chat21 engine selection with CHAT21_ENGINE=[native|firebase]
 - Schema migration tool with mongoose-migrate. Added env property DISABLE_AUTO_SHEMA_MIGRATION
@@ -19,7 +23,7 @@
 - Mongo support for Winston with: WRITE_LOG_TO_MONGODB=true 
 - Logfix
 
-# 2.1.10
+# 2.1.10 -> P
 - Tiledesk Chat21 groups syncronizer. Enable with SYNC_CHAT21_GROUPS="true"
 - Built-in faq updated  and chatbot webhook example changed
 - Return role: admin if the admin sign-in with email and password

diff --git a/channels/chat21/chat21WebHook.js b/channels/chat21/chat21WebHook.js
@@ -141,8 +141,9 @@ router.post('/', function (req, res) {
                       var isObjectId = mongoose.Types.ObjectId.isValid(message.sender);
                       winston.debug("isObjectId:"+ isObjectId);
 
+                      // RESTORE var queryProjectUser = {id_project:projectid, status: "active" };
                       var queryProjectUser = {id_project:projectid};
-                      // var queryProjectUser = {id_project:projectid,  $or:[ {uuid_user: message.sender}, {id_user:  message.sender }]};
+
                       if (isObjectId) {
                         queryProjectUser.id_user = message.sender;
                       }else {
@@ -537,8 +538,9 @@ else if (req.body.event_type == "typing-start") {
   var isObjectId = mongoose.Types.ObjectId.isValid(writer_id);
   winston.debug("isObjectId:"+ isObjectId);
 
+  // RESTORE var queryProjectUser = {id_project: request.id_project, status: "active"};
   var queryProjectUser = {id_project: request.id_project};
-  // var queryProjectUser = {id_project:projectid,  $or:[ {uuid_user: message.sender}, {id_user:  message.sender }]};
+
   if (isObjectId) {
     queryProjectUser.id_user = writer_id;
   }else {
@@ -595,8 +597,9 @@ else if (req.body.event_type == "presence-change") {
   var isObjectId = mongoose.Types.ObjectId.isValid(user_id);
   winston.debug("isObjectId:"+ isObjectId);
 
+  // RESTORE var queryProjectUser = {status: "active"};
   var queryProjectUser = {};
-  // var queryProjectUser = {id_project:projectid,  $or:[ {uuid_user: message.sender}, {id_user:  message.sender }]};
+
   if (isObjectId) {
     queryProjectUser.id_user = user_id;
   }else {
@@ -618,9 +621,8 @@ else if (req.body.event_type == "presence-change") {
     project_users.forEach(project_user => { 
       winston.debug("project_user:", project_user);
       var update = {status:presence};
-      if (presence === "offline") {
-        update.lastOnlineAt = new Date();
-      }
+      update.changedAt = new Date();
+
       project_user.presence = update
 
       project_user.save(function (err, savedProjectUser) {

diff --git a/migrations/1601628781595-project_users_presence.js b/migrations/1601628781595-project_users_presence.js
@@ -8,7 +8,7 @@ async function up () {
   // Write migration here
   await new Promise((resolve, reject) => {
     // setTimeout(()=> { resolve('ok'); }, 3000);
-    return Project_user.updateMany({}, {"$set": {presence: {status: "offline", lastOfflineAt: new Date()}}}, function (err, updates) {
+    return Project_user.updateMany({}, {"$set": {presence: {status: "offline", changedAt: new Date()}}}, function (err, updates) {
       winston.info("Schema updated for " + updates.nModified + " project_user")
        return resolve('ok'); 
     });  

diff --git a/models/presence.js b/models/presence.js
@@ -9,7 +9,7 @@ var PresenceSchema = new Schema({
     required: true,
     index: true
   },
-  lastOnlineAt: {
+  changedAt: {
     type: Date,
     default: new Date()
   },

diff --git a/routes/project_user.js b/routes/project_user.js
@@ -73,7 +73,8 @@ router.post('/invite', [passport.authenticate(['basic', 'jwt'], { session: false
       winston.debug("role", role);
 
       // winston.debug("PROJECT USER ROUTES - req projectid", req.projectid);
-      return Project_user.find({ id_project: req.projectid, role: { $in : role }  }, function (err, projectuser) {
+      return Project_user.find({ id_project: req.projectid, role: { $in : role }}, function (err, projectuser) {
+      // RESTORE 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)
         if (err) {
           winston.error("Error gettting project_user for invite", err);
@@ -413,13 +414,24 @@ router.get('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
  *     2. POPULATE THE user_id OF THE PROJECT-USER object WITH THE USER OBJECT
  */
 router.get('/', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], function (req, res) {
+
   var role = [RoleConstants.OWNER, RoleConstants.ADMIN,RoleConstants.AGENT];
+
   if (req.query.role) {
     role = req.query.role;
   }
   winston.debug("role", role);
 
-  Project_user.find({ id_project: req.projectid, role: { $in : role } }).
+  var query =  {id_project: req.projectid, role: { $in : role } };
+
+  if (req.query.presencestatus) {
+    var presence = {status: req.query.presencestatus};
+    query.presence = presence;
+  }
+
+  winston.debug("query", query);
+
+  Project_user.find(query).
     populate('id_user').
     // lean().                   
     exec(function (err, project_users) {

diff --git a/websocket/webSocketServer.js b/websocket/webSocketServer.js
@@ -27,6 +27,9 @@ var mongoose = require('mongoose');
 var lastRequestsLimit = process.env.WS_HISTORY_REQUESTS_LIMIT || 100;
 winston.debug('lastRequestsLimit:'+ lastRequestsLimit);
 
+var lastEventsLimit = process.env.WS_HISTORY_EVENTS_LIMIT || 20;
+winston.debug('lastEventsLimit:'+ lastEventsLimit);
+
 var websocketServerPath = process.env.WS_SERVER_PATH || '/';
 winston.debug('websocketServerPath:'+ websocketServerPath);
 
@@ -465,13 +468,21 @@ class WebSocketServer {
 
             var puId = urlSub[3];
             winston.debug('puId: '+puId);
-
+
+            var eventName = urlSub[4];
+            winston.debug('eventName: '+eventName);
+
             var query = { project_user: puId, id_project: projectId };
+            if (eventName) {
+              query.name = eventName;
+            }
             winston.debug(' query: ',query);
 
             EventModel.find(query)
             .cache(cacheUtil.defaultTTL, projectId+":events:"+puId)
-            .exec(function (err, events) {
+            .sort({createdAt: 'desc'})
+            .limit(lastEventsLimit)
+            .exec(function(err, events) {     
               if (err) {
                  winston.error('error getting  events', err);  
                  return reject(err);