@tiledesk/tiledesk-server 2.4.15 → 2.4.17

package/channels/chat21/chat21WebHook.js

@@ -25,7 +25,7 @@ if (process.env.SYNC_JOIN_LEAVE_GROUP_EVENT === true || process.env.SYNC_JOIN_LE
 }
 winston.info("Chat21 Sync JoinAndLeave Support Group Event: " + syncJoinAndLeaveGroupEvent);
 
-var allowReopenChat =  false;
+var allowReopenChat =  false;   //It's work only with firebase chat engine
 if (process.env.ALLOW_REOPEN_CHAT === true || process.env.ALLOW_REOPEN_CHAT ==="true") {
   allowReopenChat = true;
 }
@@ -305,10 +305,11 @@ router.post('/', function (req, res) {
                 
                     // return requestService.incrementMessagesCountByRequestId(request.request_id, request.id_project).then(function(savedRequest) {
                       // winston.debug("savedRequest.participants.indexOf(message.sender)", savedRequest.participants.indexOf(message.sender));
-                       
+                      winston.info("before updateWaitingTimeByRequestId*******",request.participants, message.sender);
+                      winston.info("updateWaitingTimeByRequestId******* message: "+ message.sender);
                       // 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*******");
+                        winston.info("updateWaitingTimeByRequestId*******");
                         return requestService.updateWaitingTimeByRequestId(request.request_id, request.id_project, false).then(function(upRequest) {
                           return res.json(upRequest);
                         });

package/package.json

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

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

@@ -286,6 +286,32 @@
         })
     });
 
+    function invalidatRequestSimple(client, project_id, rid, request_id) {
+        var key = project_id+":requests:id:"+rid+":simple";
+        winston.verbose("Deleting cache for widgets with key: " + key);
+        client.del(key, function (err, reply) {
+            winston.debug("Deleted cache for invalidatRequestSimple",reply);
+            winston.verbose("Deleted cache for invalidatRequestSimple",{err:err});
+        });   
+
+        key = "requests:request_id:"+request_id+":simple";  //without project for chat21 webhook
+        winston.verbose("Creating cache for request.create.simple for invalidatRequestSimple without project with key : " + key);
+        client.del(key, function (err, reply) {
+            winston.debug("Deleted cache for invalidatRequestSimple",reply);
+            winston.verbose("Deleted cache for invalidatRequestSimple",{err:err});
+        });   
+
+        key = project_id+":requests:request_id:"+request_id+":simple";
+        winston.verbose("Creating cache for request.create.simple for invalidatRequestSimple with key: " + key);
+        client.del(key, function (err, reply) {
+            winston.debug("Deleted cache for invalidatRequestSimple",reply);
+            winston.verbose("Deleted cache for invalidatRequestSimple",{err:err});
+        });   
+
+
+    }
+
+
     requestEvent.on("request.create", function(request) {
         setImmediate(() => {
             var key = request.id_project+":requests:id:"+request.id;
@@ -310,6 +336,7 @@
                 winston.debug("Deleted cache for request.create",reply);
                 winston.verbose("Deleted cache for request.create",{err:err});
             });   
+
         });
     });
 
@@ -338,6 +365,9 @@
                 winston.debug("Deleted cache for request.update",reply);
                 winston.verbose("Deleted cache for request.update",{err:err});
             });   
+
+            invalidatRequestSimple(client, request.id_project, request.id, request.request_id)
+
         });
     });
 
@@ -365,6 +395,9 @@
                 winston.debug("Deleted cache for request.close",reply);
                 winston.verbose("Deleted cache for request.close",{err:err});
             });   
+
+            invalidatRequestSimple(client, request.id_project, request.id, request.request_id)
+
         });
     });
 
@@ -727,7 +760,7 @@
     }
 
     function invalidateWidgets(client, project_id) {
-        key = project_id+":widgets";
+        let key = project_id+":widgets";
         winston.verbose("Deleting cache for widgets with key: " + key);
         client.del(key, function (err, reply) {
             winston.debug("Deleted cache for widgets",reply);

package/pubmodules/queue/reconnect.js

@@ -15,7 +15,20 @@ var url = process.env.CLOUDAMQP_URL + "?heartbeat=60" || "amqp://localhost";
 // attento devi aggiornare configMap di PRE E PROD
 // var url = process.env.AMQP_URL + "?heartbeat=60" || "amqp://localhost?heartbeat=60";
 
-var exchange = 'amq.topic';
+var durable = false;
+if (process.env.ENABLE_DURABLE_QUEUE == true || process.env.ENABLE_DURABLE_QUEUE == "true") {
+  durable = true;
+}
+
+var persistent = false;
+if (process.env.ENABLE_PERSISTENT_QUEUE == true || process.env.ENABLE_PERSISTENT_QUEUE == "true") {
+  persistent = true;
+}
+
+var exchange = process.env.QUEUE_EXCHANGE_TOPIC || 'amq.topic';
+
+winston.info("Durable queue: " + durable + " Persistent queue: " + persistent + " Exchange topic: " + exchange);
+
 
 function start() {
   amqp.connect(url, function(err, conn) {
@@ -83,8 +96,8 @@ function startPublisher() {
 // method to publish a message, will queue messages internally if the connection is down and resend later
 function publish(exchange, routingKey, content) {
   try {
-    pubChannel.publish(exchange, routingKey, content, {},
-    // pubChannel.publish(exchange, routingKey, content, { persistent: true },
+    pubChannel.publish(exchange, routingKey, content, { persistent: persistent },
+      // pubChannel.publish(exchange, routingKey, content, { persistent: true },
 
                        function(err, ok) {
                          if (err) {
@@ -112,9 +125,12 @@ function startWorker() {
       });
       ch.prefetch(10);//leggila da env
       ch.assertExchange(exchange, 'topic', {
-        durable: true
+        durable: durable
+        // durable: true
       });
-      ch.assertQueue("jobs", { durable: true }, function(err, _ok) {
+
+      ch.assertQueue("jobs", { durable: durable }, function(err, _ok) {
+      // ch.assertQueue("jobs", { durable: true }, function(err, _ok) {
         if (closeOnErr(err)) return;
         ch.bindQueue(_ok.queue, exchange, "request_create", {}, function(err3, oka) {
             winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_create");
@@ -234,7 +250,7 @@ function work(msg, cb) {
   }
 
   if (topic === 'faqbot_update') {
-    winston.info("reconnect here topic faqbot_update:" + topic); 
+    winston.debug("reconnect here topic faqbot_update:" + topic); 
     // requestEvent.emit('request.update.queue',  msg.content);
     botEvent.emit('faqbot.update.queue',  JSON.parse(message_string));
   }

package/pubmodules/queue/reconnectFanout.js

@@ -268,6 +268,6 @@ if (process.env.QUEUE_ENABLED === "true") {
     botEvent.queueEnabled = true;
     listen();
     start();
-    winston.info("Queue Fanout enabled. endpint: " + url );
+    winston.info("Queue Fanout enabled. endpoint: " + url );
 } 
 

package/routes/lead.js

@@ -148,6 +148,56 @@ router.patch('/:leadid/attributes',  function (req, res) {
 });
 
 
+//.post and .patch for /properties are equals
+
+router.post('/:leadid/properties',  function (req, res) {
+  var data = req.body;
+
+  // TODO use service method
+
+  Lead.findById(req.params.leadid, function (err, lead) {
+    if (err) {
+      winston.error('--- > ERROR ', err);
+      return res.status(500).send({ success: false, msg: 'Error updating object.' });
+    }
+
+     if (!lead) {
+        return res.status(404).send({ success: false, msg: 'Object not found.' });
+      }
+      
+      if (!lead.properties) {
+        winston.debug("empty properties")
+        lead.properties = {};
+      }
+
+      winston.debug(" lead properties", lead.properties)
+        
+        Object.keys(data).forEach(function(key) {
+          var val = data[key];
+          winston.debug("data attributes "+key+" " +val)
+          lead.properties[key] = val;
+        });     
+        
+        winston.debug(" lead properties", lead.properties)
+
+        // https://stackoverflow.com/questions/24054552/mongoose-not-saving-nested-object
+        lead.markModified('properties');
+
+          //cacheinvalidation
+          lead.save(function (err, savedLead) {
+          if (err) {
+            winston.error("error saving lead properties",err)
+            return res.status(500).send({ success: false, msg: 'Error getting object.' });
+          }
+          winston.verbose(" saved lead properties",savedLead.toObject())
+          leadEvent.emit('lead.update', savedLead);
+
+            res.json(savedLead);
+        });
+  });
+  
+});
+
 
 router.patch('/:leadid/properties',  function (req, res) {
   var data = req.body;

package/services/chatbotService.js

@@ -75,7 +75,7 @@ class ChatbotService {
 
   async createBot(api_url, token, chatbot, project_id) {
 
-    winston.info("(CHATBOT SERVICE) createBot");
+    winston.debug("(CHATBOT SERVICE) createBot");
 
     return await axios({
       url: api_url + '/' + project_id + '/faq_kb/',

package/template/email/assignedEmailMessage.html

@@ -277,7 +277,7 @@
                   <span>Powered by </span>
                   <span style="display: flex;"><img
                       src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png" width="15"
-                      height="15" style="margin-left: 6px;" /></span>
+                      height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
                   <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
                 </div>
 

package/template/email/assignedRequest.html

@@ -269,7 +269,7 @@
                                     <span>Powered by </span>
                                     <span style="display: flex;"><img
                                             src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png"
-                                            width="15" height="15" style="margin-left: 6px;" /></span>
+                                            width="15" height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
                                     <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
                                 </div>
 

package/template/email/beenInvitedExistingUser.html

@@ -191,7 +191,7 @@
                   <span>Powered by </span>
                   <span style="display: flex;"><img
                       src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png" width="15"
-                      height="15" style="margin-left: 6px;" /></span>
+                      height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
                   <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
                 </div>
 

package/template/email/beenInvitedNewUser.html

@@ -190,12 +190,12 @@
                                 <hr style="width:94%;height:1px;border:none;background-color: #cacaca;">
 
                                 <div style="display: flex; padding: 20px 18px; color: #888888; align-items: center;">
-                  <span>Powered by </span>
-                  <span style="display: flex;"><img
-                      src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png" width="15"
-                      height="15" style="margin-left: 6px;" /></span>
-                  <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
-                </div>
+                                    <span>Powered by </span>
+                                    <span style="display: flex;"><img
+                                            src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png"
+                                            width="15" height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
+                                    <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
+                                </div>
 
                             </td>
                         </tr>

package/template/email/emailDirect.html

@@ -184,7 +184,7 @@
                   <span>Powered by </span>
                   <span style="display: flex;"><img
                       src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png" width="15"
-                      height="15" style="margin-left: 6px;" /></span>
+                      height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
                   <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
                 </div>
 

package/template/email/newMessage.html

@@ -244,7 +244,7 @@
                   <span>Powered by </span>
                   <span style="display: flex;"><img
                       src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png" width="15"
-                      height="15" style="margin-left: 6px;" /></span>
+                      height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
                   <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
                 </div>
 

package/template/email/newMessageFollower.html

@@ -333,7 +333,7 @@
                   <span>Powered by </span>
                   <span style="display: flex;"><img
                       src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png" width="15"
-                      height="15" style="margin-left: 6px;" /></span>
+                      height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
                   <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
                 </div>
 

package/template/email/passwordChanged.html

@@ -181,12 +181,12 @@
                                 <hr style="width:94%;height:1px;border:none;background-color: #cacaca;">
 
                                 <div style="display: flex; padding: 20px 18px; color: #888888; align-items: center;">
-                  <span>Powered by </span>
-                  <span style="display: flex;"><img
-                      src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png" width="15"
-                      height="15" style="margin-left: 6px;" /></span>
-                  <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
-                </div>
+                                    <span>Powered by </span>
+                                    <span style="display: flex;"><img
+                                            src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png"
+                                            width="15" height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
+                                    <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
+                                </div>
 
                             </td>
                         </tr>

package/template/email/pooledEmailMessage.html

@@ -272,7 +272,7 @@
                         <span>Powered by </span>
                         <span style="display: flex;"><img
                             src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png"
-                            width="15" height="15" style="margin-left: 6px;" /></span>
+                            width="15" height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
                         <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
                       </div>
 

package/template/email/pooledRequest.html

@@ -269,7 +269,7 @@
                   <span>Powered by </span>
                   <span style="display: flex;"><img
                       src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png" width="15"
-                      height="15" style="margin-left: 6px;" /></span>
+                      height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
                   <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
                 </div>
 

package/template/email/resetPassword.html

@@ -191,7 +191,7 @@
                   <span>Powered by </span>
                   <span style="display: flex;"><img
                       src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png" width="15"
-                      height="15" style="margin-left: 6px;" /></span>
+                      height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
                   <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
                 </div>
 

package/template/email/sendTranscript.html

@@ -263,7 +263,7 @@
                   <span>Powered by </span>
                   <span style="display: flex;"><img
                       src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png" width="15"
-                      height="15" style="margin-left: 6px;" /></span>
+                      height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
                   <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
                 </div>
 

package/template/email/ticket.html

@@ -268,7 +268,7 @@
                   <span>Powered by </span>
                   <span style="display: flex;"><img
                       src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png" width="15"
-                      height="15" style="margin-left: 6px;" /></span>
+                      height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
                   <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
                 </div>
 

package/template/email/verify.html

@@ -187,7 +187,7 @@
                   <span>Powered by </span>
                   <span style="display: flex;"><img
                       src="https://tiledesk.com/wp-content/uploads/2023/05/tiledesk-solo_logo_new_gray.png" width="15"
-                      height="15" style="margin-left: 6px;" /></span>
+                      height="15" style="margin-left: 6px; margin-top: 2px;" /></span>
                   <span style="font-weight: bold; margin-left: 2px;">Tiledesk</span>
                 </div>