@tiledesk/tiledesk-server 2.2.6 → 2.2.13

package/CHANGELOG.md

@@ -1,7 +1,23 @@
-# 2.2.5
+# 2.2.13
+- Send message validation with empty text
+
+# 2.2.12
+- Add /bot endpoint
+- Bot and subscription can manage bots
+
+# 2.2.11 
+- Logfix
+
+# 2.2.10
+- Native mqtt auth fix
+
+# 2.2.8
+- Public trigger module
+
+# 2.2.6
 - Quota license fix
 
-# 2.2.4
+# 2.2.4  -> PROD
 - email invitation fix
 
 # 2.2.3
@@ -92,8 +108,10 @@
 - Added email notification for new message and new request for email and form channel (ticket) 
 - Added microLanguageTransformationInterceptor enabled when message.attributes.microlanguage==true
 
+# 2.1.40.35
+- Quota license fix
 
-# 2.1.40.34 -> PROD
+# 2.1.40.34
 - logfix
 
 # 2.1.40.33
@@ -106,7 +124,7 @@
 # 2.1.40.31
 - Concierge bot fix to reroute only for temp conversation without a bot. Race condition issue when you try manually route a request for example inside a chatbot webhook 
 
-# 2.1.40.30 -> PROD
+# 2.1.40.30
 - logfix
 
 # 2.1.40.29

package/app.js

@@ -339,7 +339,9 @@ app.use('/:projectid/faq', [passport.authenticate(['basic', 'jwt'], { session: f
 //Deprecated??
 app.use('/:projectid/faqpub', faqpub);
 
-app.use('/:projectid/faq_kb', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], faq_kb);
+//deprecated
+app.use('/:projectid/faq_kb', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], faq_kb);
+app.use('/:projectid/bot', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], faq_kb);
 
 
 

package/channels/chat21/nativeauth.js

@@ -42,6 +42,7 @@ router.post('/createCustomToken', function (req, res) {
         const scope = [
             `rabbitmq.read:*/*/apps.${appid}.users.${userid}.*`,
             `rabbitmq.write:*/*/apps.${appid}.users.${userid}.*`,
+            `rabbitmq.write:*/*/apps.${appid}.outgoing.users.${userid}.*`,
             'rabbitmq.configure:*/*/*'
         ]
     

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.2.6",
+  "version": "2.2.13",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -41,10 +41,10 @@
     "@tiledesk-ent/tiledesk-server-payments": "^1.1.5",
     "@tiledesk-ent/tiledesk-server-queue": "^1.1.10",
     "@tiledesk-ent/tiledesk-server-request-history": "^1.1.5",
-    "@tiledesk-ent/tiledesk-server-resthook": "^1.1.50",
+    "@tiledesk-ent/tiledesk-server-resthook": "^1.1.51",
     "@tiledesk-ent/tiledesk-server-routing-queue": "^1.1.11",
     "@tiledesk-ent/tiledesk-server-tags": "^1.1.1",
-    "@tiledesk-ent/tiledesk-server-triggers": "^1.1.77",
+    "@tiledesk-ent/tiledesk-server-triggers": "^1.1.79",
     "@tiledesk-ent/tiledesk-server-visitorcounter": "^1.1.1"
   },
   "dependencies": {

package/routes/message.js

@@ -26,13 +26,21 @@ csv.separator = ';';
 // var roleChecker = require('../middleware/has-role');
 
 router.post('/', 
-// se type image text può essere empty validare meglio.
 // [
-//   check('text').notEmpty(),  
+//   check('text').custom(value => {
+//     console.log("value",value);
+//     console.log("req.body.type",this.type);
+//     if (this.type === "text" && (value == undefined || value == "" ) ) {    
+//       // if (this.type === "text" && ( (!value) || (value === "") ) ) {    
+//       console.log("sono qui ",value);
+//       return Promise.reject('Text field is required for text message');
+//     }else {
+//       console.log("sono qua ",value);
+//       return Promise.resolve();
+//     }
+//   })
 // ],
-// 
 async (req, res)  => {
-// function(req, res) {
 
   winston.debug('req.body post message', req.body);
   winston.debug('req.params: ', req.params);
@@ -95,7 +103,7 @@ async (req, res)  => {
                 winston.debug("queryProjectUser", queryProjectUser);
                 
                 project_user = await Project_user.findOne(queryProjectUser).populate({path:'id_user', select:{'firstname':1, 'lastname':1, 'email':1}})
-                winston.debug("queryProjectUser", queryProjectUser);
+                winston.info("project_user", project_user);
             
                 if (!project_user) {
                   return res.status(403).send({success: false, msg: 'Unauthorized. Project_user not found with user id  : '+ sender });
@@ -130,14 +138,25 @@ async (req, res)  => {
               return leadService.createIfNotExistsWithLeadId(sender || req.user._id, fullname, email, req.projectid, null, req.body.attributes || req.user.attributes)
               .then(function(createdLead) {
 
-
-
+               
               
-                var new_request = {                                     // problema
-                  request_id: req.params.request_id, project_user_id: project_user._id, lead_id: createdLead._id, id_project:req.projectid,
-                  first_text: req.body.text, departmentid: req.body.departmentid, sourcePage:req.body.sourcePage, 
-                  language: req.body.language, userAgent:req.body.userAgent, status:null, createdBy: req.user._id,
-                  attributes: req.body.attributes, subject: req.body.subject, preflight:undefined, channel: req.body.channel, location: req.body.location,
+                var new_request = {                                     
+                  request_id: req.params.request_id, 
+                  project_user_id: project_user._id, 
+                  lead_id: createdLead._id, 
+                  id_project:req.projectid,
+                  first_text: req.body.text, 
+                  departmentid: req.body.departmentid, 
+                  sourcePage:req.body.sourcePage, 
+                  language: req.body.language, 
+                  userAgent:req.body.userAgent, 
+                  status:null, 
+                  createdBy: req.user._id,
+                  attributes: req.body.attributes, 
+                  subject: req.body.subject, 
+                  preflight:undefined, 
+                  channel: req.body.channel, 
+                  location: req.body.location,
                   participants: req.body.participants,
                   lead: createdLead, requester: project_user,
                   priority: req.body.priority
@@ -183,7 +202,15 @@ async (req, res)  => {
                             return res.json(message);
                           });
                         });
-                    });                           
+                    }).catch(function(err){    //pubblica questo
+                      winston.log({
+                        level: 'error',
+                        message: 'Error creating request: '+ JSON.stringify(err) + " " + JSON.stringify(req.body) ,
+                        label: req.projectid
+                      });
+                      // winston.error("Error creating message", err);
+                      return res.status(500).send({success: false, msg: 'Error creating request', err:err });
+                    });                                
                       
                   });
                             

package/services/emailService.js

@@ -519,13 +519,13 @@ class EmailService {
 
     let inReplyTo;
     let references;
-    if (message.attributes) {
-      if (message.attributes.email_messageId) {
-        inReplyTo = message.attributes.email_messageId;
-        }
-        if (message.attributes.email_references) {
-        references = message.attributes.email_references;
-        }
+    if (message.request.attributes) {
+      if (message.request.attributes.email_messageId) {
+        inReplyTo = message.request.attributes.email_messageId;
+      }
+      if (message.request.attributes.email_references) {
+        references = message.request.attributes.email_references;
+      }
     }
     winston.verbose("sendNewAssignedAgentMessageEmailNotification email inReplyTo: "+ inReplyTo);
     winston.verbose("sendNewAssignedAgentMessageEmailNotification email references: "+ references);
@@ -804,13 +804,13 @@ class EmailService {
 
     let inReplyTo;
     let references;
-    if (message.attributes) {
-      if (message.attributes.email_messageId) {
-        inReplyTo = message.attributes.email_messageId;
-        }
-        if (message.attributes.email_references) {
-        references = message.attributes.email_references;
-        }
+    if (message.request.attributes) {
+      if (message.request.attributes.email_messageId) {
+        inReplyTo = message.request.attributes.email_messageId;
+      }
+      if (message.request.attributes.email_references) {
+        references = message.request.attributes.email_references;
+      }
     }
     winston.verbose("sendNewPooledMessageEmailNotification email inReplyTo: "+ inReplyTo);
     winston.verbose("sendNewPooledMessageEmailNotification email references: "+ references);
@@ -947,13 +947,13 @@ class EmailService {
 
     let inReplyTo;
     let references;
-    if (message.attributes) {
-      if (message.attributes.email_messageId) {
-        inReplyTo = message.attributes.email_messageId;
-        }
-        if (message.attributes.email_references) {
-        references = message.attributes.email_references;
-        }
+    if (message.request.attributes) {
+      if (message.request.attributes.email_messageId) {
+        inReplyTo = message.request.attributes.email_messageId;
+      }
+      if (message.attributes.email_references) {
+        references = message.request.attributes.email_references;
+      }
     }
     winston.verbose("email inReplyTo: "+ inReplyTo);
     winston.verbose("email references: "+ references);
@@ -1086,24 +1086,24 @@ class EmailService {
     let cc;
     let ccString;
 
-    if (message.attributes) {
+    if (message.request && message.request.attributes) {
+      winston.debug("email message.request.attributes: ", message.request.attributes);
 
-      winston.verbose("email message.attributes: ", message.attributes);
-      // per email touching manca
-        if (message.attributes.email_messageId) {
-          inReplyTo = message.attributes.email_messageId;
-        }
-        if (message.attributes.email_references) {
-          references = message.attributes.email_references;
-        }
-        if (message.attributes.email_cc) {
-          cc = message.attributes.email_cc;       
-        }
-        winston.verbose("email message.attributes.email_ccStr: "+ message.attributes.email_ccStr);
-        if (message.attributes.email_ccStr!=undefined) {
-          ccString = message.attributes.email_ccStr;
-          winston.verbose("email set ccString");
-        }
+      if (message.request.attributes.email_messageId) {
+        inReplyTo = message.request.attributes.email_messageId;
+      }
+      if (message.request.attributes.email_references) {
+        references = message.request.attributes.email_references;
+      }        
+
+      if (message.request.attributes.email_cc) {
+        cc = message.request.attributes.email_cc;       
+      }
+      winston.debug("email message.request.attributes.email_ccStr: "+ message.request.attributes.email_ccStr);
+      if (message.request.attributes.email_ccStr!=undefined) {
+        ccString = message.request.attributes.email_ccStr;
+        winston.debug("email set ccString");
+      }
     }
     winston.verbose("email inReplyTo: "+ inReplyTo);
     winston.verbose("email references: "+ references);

package/services/messageService.js

@@ -121,7 +121,7 @@ class MessageService {
         
                     return newMessage.save(function(err, savedMessage) {
                         if (err) {
-                            winston.error(err);
+                            winston.error("Error savig the message", {err:err, message: message, newMessage: newMessage});
                             return reject(err);
                         }
                         winston.verbose("Message created", savedMessage.toObject());

package/test/messageRoute.js

@@ -91,7 +91,66 @@ describe('MessageRoute', () => {
 });
 
 
+// mocha test/messageRoute.js  --grep 'createSimpleEmptyText'
 
+  it('createSimpleEmptyText', function (done) {
+    // this.timeout(10000);
+
+    var email = "test-message-create-" + Date.now() + "@email.com";
+    var pwd = "pwd";
+
+    userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
+     projectService.createAndReturnProjectAndProjectUser("message-create", savedUser._id).then(function(savedProjectAndPU) {
+     
+      var savedProject = savedProjectAndPU.project;
+
+          chai.request(server)
+            .post('/'+ savedProject._id + '/requests/req123/messages')
+            .auth(email, pwd)
+            .set('content-type', 'application/json')
+            .send({"text":""})
+            .end(function(err, res) {
+                //console.log("res",  res);
+                console.log("res.body",  res.body);
+                res.should.have.status(500);                                
+          
+               done();
+            });
+    });
+  });
+});
+
+
+
+
+// mocha test/messageRoute.js  --grep 'createSimpleNoText'
+
+it('createSimpleNoText', function (done) {
+  // this.timeout(10000);
+
+  var email = "test-message-create-" + Date.now() + "@email.com";
+  var pwd = "pwd";
+
+  userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
+   projectService.createAndReturnProjectAndProjectUser("message-create", savedUser._id).then(function(savedProjectAndPU) {
+   
+    var savedProject = savedProjectAndPU.project;
+
+        chai.request(server)
+          .post('/'+ savedProject._id + '/requests/req123/messages')
+          .auth(email, pwd)
+          .set('content-type', 'application/json')
+          .send({})
+          .end(function(err, res) {
+              //console.log("res",  res);
+              console.log("res.body",  res.body);
+              res.should.have.status(500);                                
+        
+             done();
+          });
+  });
+});
+});
 
 
 

package/test/requestRoute.js

@@ -205,7 +205,6 @@ it('createUpperCaseEmail', function (done) {
 });
 // mocha test/requestRoute.js  --grep 'getbyidWithPartecipatingBots'
 
-
 it('getbyidWithPartecipatingBots', function (done) {
   // this.timeout(10000);
 

package/websocket/webSocketServer.js

@@ -710,7 +710,7 @@ class WebSocketServer {
       winston.debug('projectuserUpdateKey: ' + projectuserUpdateKey);
       authEvent.on(projectuserUpdateKey,function(data) {
         var pu = data.updatedProject_userPopulated;
-        winston.debug('pu', pu);
+        winston.debug('ws pu', pu);
         
         //TODO pubSubServer.handlePublishMessage ('/'+pu.id_project+'/project_users/', pu, undefined, true, "UPDATE");