@tiledesk/tiledesk-server 2.3.14 → 2.3.17

package/CHANGELOG.md

@@ -1,4 +1,14 @@
-# 2.3.14 -> PROD
+# 2.3.17 -> PROD
+- Webhook chat21 fix return
+
+# 2.3.16
+- Request close activity added as event
+- Log fix webhook chat21
+
+# 2.3.15
+- Endpoint Widget fix undefined project.widget
+
+# 2.3.14 
 - Added ip filter with Deny roles and ban User roles
 - Ban notifier
 - Middleware decodeJwt before passport with passport fallback

package/channels/chat21/chat21WebHook.js

@@ -210,7 +210,7 @@ router.post('/', function (req, res) {
                         departmentid:departmentid, sourcePage:sourcePage, language:language, userAgent:client, status:requestStatus, createdBy: undefined,
                         attributes:rAttributes, subject:undefined, preflight:false, channel:undefined, location:undefined,
                         lead:createdLead, requester:project_user
-                       
+                        
                       };
     
                       winston.debug("new_request", new_request);
@@ -296,18 +296,19 @@ router.post('/', function (req, res) {
                       // TODO it doesn't work for internal requests bacause participanets == message.sender⁄
                       if (request.participants && request.participants.indexOf(message.sender) > -1) { //update waiitng time if write an  agent (member of participants)
                         winston.debug("updateWaitingTimeByRequestId");
+                        
                         return requestService.updateWaitingTimeByRequestId(request.request_id, request.id_project).then(function(upRequest) {
                           return res.json(upRequest);
                         });
                       }else {
-                        return res.json(upRequest);
+                       
+                        return res.json(savedMessage);
                       }
                     // });
-                  }).catch(function(err){
-                    // console.log(err);
-                    winston.error("Error creating chat21 webhook message", {err: err, message: message});
-                    return res.status(500).send({success: false, msg: 'Error creating message', err:err });
-                  });
+              }).catch(function(err){ 
+                winston.error("Error creating chat21 webhook message: "+ JSON.stringify({err: err, message: message}));
+                return res.status(500).send({success: false, msg: 'Error creating message', err:err });
+              });
 
 
 
@@ -568,6 +569,8 @@ router.post('/', function (req, res) {
         return res.status(400).send({success: false, msg: "not a support conversation" });
       }
 
+
+
       if (user_id!="system"){
         winston.debug("not a system conversation");
         return res.status(400).send({success: false, msg: "not a system conversation" });

package/package.json

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

package/pubmodules/activities/activityArchiver.js

@@ -76,7 +76,6 @@ class ActivityArchiver {
       
        authEvent.on('project_user.update',  function(event) { 
         setImmediate(() => {         
-          // console.log("project_user.update");
          /*
          2019-11-20T10:40:52.686991+00:00 app[web.1]: TypeError: Cannot read property '_id' of undefined
 */
@@ -272,6 +271,26 @@ class ActivityArchiver {
         });
 
 
+        requestEvent.on('request.close',  function(request) {   
+          setImmediate(() => {           
+       
+              try {
+                winston.error('ActivityArchiver close');
+               
+                var activity = new Activity({actor: {type:"user", id: request.closed_by}, 
+                verb: "REQUEST_CLOSE", actionObj: request, 
+                target: {type:"request", id:request._id, object: request }, 
+                id_project: request.id_project });
+                that.save(activity);    
+              } catch(e) {
+                winston.error('ActivityArchiver error saving activity',e);
+              }
+          
+                
+          });                           
+        });
+
+
         
 
         winston.info('ActivityArchiver listening');

package/routes/widget.js

@@ -146,8 +146,12 @@ router.get('/', function(req, res, next) {
                                               //secondo me qui manca un parentesi tonda per gli or
           if (project  && project.profile && ((project.profile.type === 'free' && project.trialExpired === true) || (project.profile.type === 'payment' && project.isActiveSubscription === false))) {
             winston.debug('getProject remove poweredBy tag', project);
-            project.widget.poweredBy = undefined;
-            project.widget.baloonImage = undefined;            
+
+            if (project.widget) {
+              project.widget.poweredBy = undefined;
+              project.widget.baloonImage = undefined;            
+            }
+            
           }
 
         return resolve(project);