@tiledesk/tiledesk-server 2.1.41 → 2.2.4

package/pubmodules/messageActions/messageActionsInterceptor.js

@@ -18,9 +18,11 @@ class MessageActionsInterceptor {
 
         var that = this;
         winston.info("MessageActionsInterceptor listener start ");
-        
-
-        messageEvent.on('message.create',  function(message) {          
+                    
+            //use .received to be sure for \close the message is sent to chat21 and after that you can archive the conversation. otherwise a race condition occurs with message.create if \close is sent by the bot      
+            messageEvent.on('message.received',  function(message) {          
+        // messageEvent.on('message.create',  function(message) {          
+            winston.debug("message.received ", message);
 
                 setImmediate(() => {
                   
@@ -78,6 +80,7 @@ class MessageActionsInterceptor {
              
              var request = message.request;
              
+
              if (request) {
                     //var botId = botEvent.getBotId(message);
                 var botId =  BotFromParticipant.getBotId(message);
@@ -144,14 +147,24 @@ class MessageActionsInterceptor {
             var request = message.request;
             
             if (request) {
-                // closeRequestByRequestId(request_id, id_project, notify) {
-                requestService.closeRequestByRequestId(request.request_id, request.id_project );
+                // setTimeout(function() {
+                    // winston.info("delayed")
+                     // closeRequestByRequestId(request_id, id_project, notify) {
+                    requestService.closeRequestByRequestId(request.request_id, request.id_project );
+                //   }, 1500);
+
+               
             }
                                                                                                                                                         
        });
         
-        
-
+        /*
+       messageActionEvent.on("actions", function(message) {
+        //    esegui custom action--->
+       });
+       messageActionEvent.on("events", function(message) {
+        // lancia event
+    });*/
 
        
 

package/pubmodules/messageTransformer/index.js

@@ -1,5 +1,5 @@
 const messageTransformerInterceptor = require("./messageTransformerInterceptor");
-const microLanguageTransformerInterceptor = require("./microLanguageTransformerInterceptor");
+const microLanguageTransformerInterceptor = require("./microLanguageAttributesTransformerInterceptor");
 
 
 

package/pubmodules/messageTransformer/microLanguageAttributesTransformerInterceptor.js

@@ -0,0 +1,67 @@
+
+const messagePromiseEvent = require('../../event/messagePromiseEvent');
+
+var winston = require('../../config/winston');
+const { TiledeskChatbotUtil } = require('@tiledesk/tiledesk-chatbot-util');
+
+
+class MicroLanguageTransformerInterceptor {
+
+ 
+
+
+    listen() {
+
+        var that = this;
+        winston.info("MicroLanguageTransformerInterceptor listener start ");
+        
+        messagePromiseEvent.on('message.create.simple.before', async (data) => {
+            winston.debug('MicroLanguageTransformerInterceptor message.create.simple.before', data); 
+
+            var message = data.beforeMessage;
+            
+            if (!message.text) { //for image i think
+                return data;
+            }
+
+            if (message.attributes && message.attributes.microlanguage == true) { 
+                var reply = TiledeskChatbotUtil.parseReply(message.text);
+                winston.debug('parseReply: ' + JSON.stringify(reply) );
+                var messageReply = reply.message;
+
+                 
+                var msg_attributes = {"_raw_message": message.text};
+
+                if (messageReply && messageReply.attributes) {
+                    for(const [key, value] of Object.entries(messageReply.attributes)) {
+                        msg_attributes[key] = value
+                    }
+                }
+
+                messageReply.attributes = msg_attributes;
+              
+        
+                //data.beforeMessage = messageReply; //https://stackoverflow.com/questions/518000/is-javascript-a-pass-by-reference-or-pass-by-value-language
+                // message = messageReply;
+                message.text = messageReply.text;                  //ATTENTION Changes is made by reference
+                message.attributes = messageReply.attributes;      //ATTENTION Changes is made by reference
+                message.type = messageReply.type;                  //ATTENTION Changes is made by reference
+                message.metadata = messageReply.metadata;          //ATTENTION Changes is made by reference
+                // message.metadata = messageReply.metadata;
+
+                //data.beforeMessage = messageReply;
+               
+             }
+             winston.debug('data: ' + JSON.stringify(data) );
+             return data;
+            
+        });
+
+
+    }
+
+    
+}
+
+var microLanguageTransformerInterceptor = new MicroLanguageTransformerInterceptor();
+module.exports = microLanguageTransformerInterceptor;

package/pubmodules/pubModulesManager.js

@@ -45,8 +45,8 @@ class PubModulesManager {
 
         try {
             this.appRules = require('./rules/appRules');
-            this.appRules.start();
-            winston.info("PubModulesManager init rules loaded.");
+            // this.appRules.start();
+            winston.info("PubModulesManager initialized rules.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init rules module not found");
@@ -58,8 +58,8 @@ class PubModulesManager {
         try {
             this.messageActions = require('./messageActions');
             winston.debug("this.messageActions:"+ this.messageActions);
-            this.messageActions.messageActionsInterceptor.listen();
-            winston.info("PubModulesManager init messageActions loaded.");
+            // this.messageActions.messageActionsInterceptor.listen();
+            winston.info("PubModulesManager initialized messageActions.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init messageActions module not found");
@@ -71,9 +71,9 @@ class PubModulesManager {
         try {
             this.messageTransformer = require('./messageTransformer');
             winston.debug("this.messageTransformer:"+ this.messageTransformer);
-            this.messageTransformer.messageTransformerInterceptor.listen();
-            this.messageTransformer.microLanguageTransformerInterceptor.listen();
-            winston.info("PubModulesManager init messageTransformer loaded.");
+            // this.messageTransformer.messageTransformerInterceptor.listen();
+            // this.messageTransformer.microLanguageTransformerInterceptor.listen();
+            winston.info("PubModulesManager initialized messageTransformer.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init messageTransformer module not found");
@@ -87,8 +87,8 @@ class PubModulesManager {
          try {
             this.emailNotification = require('./emailNotification');
             winston.debug("this.emailNotification:"+ this.emailNotification);
-            this.emailNotification.requestNotification.listen();
-            winston.info("PubModulesManager init requestNotification loaded.");
+            // this.emailNotification.requestNotification.listen();
+            winston.info("PubModulesManager initialized requestNotification loaded.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init emailNotification module not found");
@@ -101,7 +101,7 @@ class PubModulesManager {
         try {           
             this.eventsRoute = require('./events/eventRoute');
             winston.debug("this.eventRoute:"+ this.eventsRoute);          
-            winston.info("PubModulesManager init eventsRoute loaded.");
+            winston.info("PubModulesManager initialized eventsRoute.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init eventsRoute module not found");
@@ -114,8 +114,8 @@ class PubModulesManager {
         try {
             this.entityEraser = require('./entityEraser');
             winston.debug("this.entityEraser:"+ this.entityEraser);
-            this.entityEraser.eraserInterceptor.listen();
-            winston.info("PubModulesManager init entityEraser loaded.");
+            // this.entityEraser.eraserInterceptor.listen();
+            winston.info("PubModulesManager initialized entityEraser.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init entityEraser module not found");
@@ -129,8 +129,8 @@ class PubModulesManager {
         try {
             this.scheduler = require('./scheduler');
             winston.debug("this.scheduler:"+ this.scheduler);    
-            this.scheduler.taskRunner.start();        
-            winston.info("PubModulesManager init scheduler loaded.");
+            // this.scheduler.taskRunner.start();        
+            winston.info("PubModulesManager initialized scheduler.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') { 
                 winston.info("PubModulesManager init scheduler module not found");
@@ -144,6 +144,58 @@ class PubModulesManager {
         
     }
 
+    start() {
+        if (this.appRules) {
+            try {
+                this.appRules.start();
+                winston.info("PubModulesManager appRules started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting appRules module", err);            
+            }
+        }
+        
+        if (this.messageActions) {
+            try {
+                this.messageActions.messageActionsInterceptor.listen();
+                winston.info("PubModulesManager messageActions started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting messageActions module", err);            
+            }
+        }
+        
+
+        if (this.messageTransformer) {
+            try {
+                this.messageTransformer.messageTransformerInterceptor.listen();
+                this.messageTransformer.microLanguageTransformerInterceptor.listen();    
+                winston.info("PubModulesManager messageTransformer started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting messageTransformer module", err);            
+            }
+            
+        }
+        
+        if (this.emailNotification) {
+            try {
+                this.emailNotification.requestNotification.listen();
+                winston.info("PubModulesManager emailNotification started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting requestNotification module", err);            
+            }
+        }
+        
+        if (this.scheduler) {
+            try {
+                this.scheduler.taskRunner.start();     
+                winston.info("PubModulesManager scheduler started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting scheduler module", err);            
+            }
+        } 
+
+
+    }
+
 
     
 }

package/pubmodules/rules/conciergeBot.js

@@ -43,21 +43,41 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
                 // winston.debug(" ConciergeBot message.request.first_text: "+message.request.first_text);
 
                 // lead_id used. Change it?
-                if (message.request && message.request.preflight === true  && message.sender == message.request.lead.lead_id && message.text != message.request.first_text ) {
+                
+                if (message.request && message.request.preflight === true  && message.sender == message.request.lead.lead_id && message.text != message.request.first_text) {
+                    winston.debug("conciergebot: " + message.request.first_text );
+                // if (message.request && message.request.preflight === true  && message.sender == message.request.lead.lead_id && message.text != message.request.first_text ) {
                     // if (message.request.status < 100 && message.sender == message.request.lead.lead_id && message.text != message.request.first_text ) {
                     // if (message.request.status < 100 && message.sender == message.request.lead.lead_id && message.text != message.request.first_text && !botId) {
                 
                     winston.debug("message send from lead with preflight on");
 
                         // changeFirstTextAndPreflightByRequestId(request_id, id_project, first_text, preflight) {
-                        requestService.changeFirstTextAndPreflightByRequestId(message.request.request_id, message.request.id_project, message.text, false).then(function (reqChanged) {
-                        
-                            // requestService.changeFirstTextByRequestId(message.request.request_id, message.request.id_project, message.text).then(function (reqChanged) {
-                            // requestService.changePreflightByRequestId(message.request.request_id, message.request.id_project, false).then(function (reqChanged) {
 
+                        let first_text =  message.text;
+                        if (message.type === MessageConstants.MESSAGE_TYPE.IMAGE)  {
+                            first_text = "Image";
+                            winston.debug("setting first_text to image");
+                        }      
+
+                        if (message.type === MessageConstants.MESSAGE_TYPE.FRAME)  {
+                            first_text = "Frame";
+                            winston.debug("setting first_text to frame");
+                        }
+
+
+                        requestService.changeFirstTextAndPreflightByRequestId(message.request.request_id, message.request.id_project, first_text, false).then(function (reqChanged) {
+                        //TESTA QUESTO
 
-                                // reroute(request_id, id_project, nobot)
-                                requestService.reroute(message.request.request_id, message.request.id_project, false );     
+                                winston.debug("message.request.status: "+message.request.status);
+                                winston.debug("message.request.department.id_bot: "+message.request.department.id_bot);
+                                if (message.request.status === 50 &&  message.request.department.id_bot == undefined) { 
+                                    //apply only if the status is temp and no bot is available. with agent you must reroute to assign temp request to an agent 
+                                    winston.debug("rerouting");
+                                    // reroute(request_id, id_project, nobot)
+                                    requestService.reroute(message.request.request_id, message.request.id_project, false );     
+                                }
+                                
                                 // updateStatusWitId(lead_id, id_project, status)
                                 // lead_id used. Change it?
                                 leadService.updateStatusWitId(message.request.lead.lead_id, message.request.id_project, LeadConstants.NORMAL);
@@ -229,58 +249,58 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
 
 
     // unused
-    welcomeOnJoin(request) {
-        var botId = BotFromParticipant.getBotFromParticipants(request.participants);
-        if (!botId) {                        
-        // if (!request.department.id_bot) {
+    // welcomeOnJoin(request) {
+    //     var botId = BotFromParticipant.getBotFromParticipants(request.participants);
+    //     if (!botId) {                        
+    //     // if (!request.department.id_bot) {
             
-            winston.debug("ConciergeBot send welcome bot message");     
+    //         winston.debug("ConciergeBot send welcome bot message");     
           
-              // TODO if (request is assigned allora manda we are putting inn touch )
-            // controlla dopo reassing
-            if (request.status == RequestConstants.ASSIGNED) {
-                if (request.participants.length==0) {
-                    // if (request.availableAgents.length==0) {
+    //           // TODO if (request is assigned allora manda we are putting inn touch )
+    //         // controlla dopo reassing
+    //         if (request.status == RequestConstants.ASSIGNED) {
+    //             if (request.participants.length==0) {
+    //                 // if (request.availableAgents.length==0) {
                        
-                        // messageService.send(sender, senderFullname, recipient, text, id_project, createdBy, attributes, type);
-                        messageService.send(
-                            'system', 
-                            'Bot',                                     
-                            request.request_id,
-                            i8nUtil.getMessage("NO_AVAILABLE_OPERATOR_MESSAGE", request.language, MessageConstants.LABELS), 
-                            request.id_project,
-                            'system', 
-                            //{"updateconversation" : false, messagelabel: {key: "NO_AVAILABLE_OPERATOR_MESSAGE"}}
-                            {messagelabel: {key: "NO_AVAILABLE_OPERATOR_MESSAGE"}},
-                            undefined,
-                            request.language
+    //                     // messageService.send(sender, senderFullname, recipient, text, id_project, createdBy, attributes, type);
+    //                     messageService.send(
+    //                         'system', 
+    //                         'Bot',                                     
+    //                         request.request_id,
+    //                         i8nUtil.getMessage("NO_AVAILABLE_OPERATOR_MESSAGE", request.language, MessageConstants.LABELS), 
+    //                         request.id_project,
+    //                         'system', 
+    //                         //{"updateconversation" : false, messagelabel: {key: "NO_AVAILABLE_OPERATOR_MESSAGE"}}
+    //                         {messagelabel: {key: "NO_AVAILABLE_OPERATOR_MESSAGE"}},
+    //                         undefined,
+    //                         request.language
                            
 
-                        );
+    //                     );
                     
                         
-                    }else {
+    //                 }else {
         
-                        messageService.send(
-                            'system', 
-                            'Bot',                                     
-                            request.request_id,
-                            i8nUtil.getMessage("JOIN_OPERATOR_MESSAGE", request.language, MessageConstants.LABELS), 
-                            request.id_project,
-                            'system', 
-                            {messagelabel: {key: "JOIN_OPERATOR_MESSAGE"}},
-                            // {"updateconversation" : false, messagelabel: {key: "JOIN_OPERATOR_MESSAGE"}}
-                            undefined,
-                            request.language
-
-                        );
+    //                     messageService.send(
+    //                         'system', 
+    //                         'Bot',                                     
+    //                         request.request_id,
+    //                         i8nUtil.getMessage("JOIN_OPERATOR_MESSAGE", request.language, MessageConstants.LABELS), 
+    //                         request.id_project,
+    //                         'system', 
+    //                         {messagelabel: {key: "JOIN_OPERATOR_MESSAGE"}},
+    //                         // {"updateconversation" : false, messagelabel: {key: "JOIN_OPERATOR_MESSAGE"}}
+    //                         undefined,
+    //                         request.language
+
+    //                     );
         
                        
-                    }
-            }
+    //                 }
+    //         }
             
-        } 
-    }
+    //     } 
+    // }
 
 
 
@@ -304,12 +324,24 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
                     if (member) {
                         updateconversationfor = [member];
                     }
+
+                    let touchText = request.first_text;
+                    if (touchText) {  //first_text can be empty for type image
+                        touchText = touchText.replace(/[\n\r]+/g, ' '); //replace new line with space
+                    }
+                    if (touchText.length > 30) {
+                        touchText = touchText.substring(0,30);
+                    }
+                    if (request.subject) {
+                        touchText = request.subject;
+                    }
+
                         // messageService.send(sender, senderFullname, recipient, text, id_project, createdBy, attributes, type);
                         messageService.send(
                             'system', 
                             'Bot',                                     
                             request.request_id,
-                            i8nUtil.getMessage("TOUCHING_OPERATOR", request.language, MessageConstants.LABELS)+": " + request.first_text, 
+                            i8nUtil.getMessage("TOUCHING_OPERATOR", request.language, MessageConstants.LABELS)+": " + touchText, 
                             request.id_project,
                             'system',                             
                             {subtype:"info", "updateconversation" : true, "updateconversationfor":updateconversationfor, forcenotification: true,  messagelabel: {key: "TOUCHING_OPERATOR"}},

package/routes/auth.js

@@ -24,6 +24,7 @@ var validtoken = require('../middleware/valid-token');
 var PendingInvitation = require("../models/pending-invitation");
 const { check, validationResult } = require('express-validator');
 var UserUtil = require('../utils/userUtil');
+let configSecret = process.env.GLOBAL_SECRET || config.secret;
 
 
 router.post('/signup',
@@ -144,7 +145,7 @@ function (req, res) {
             jwtid: uuidv4()        
           };
 
-          var token = jwt.sign(userAnonym, config.secret, signOptions);
+          var token = jwt.sign(userAnonym, configSecret, signOptions);
 
 
           authEvent.emit("user.signin", {user:userAnonym, req:req, jti:signOptions.jwtid, token: 'JWT ' + token});       
@@ -188,6 +189,9 @@ router.post('/signinWithCustomToken', [
     winston.debug("audUrl AudienceType: " + AudienceType );
 
     var id_project;
+     
+
+    var role = RoleConstants.USER;
 
     //problema wp da testare
     if (AudienceType === "subscriptions") {
@@ -216,9 +220,7 @@ router.post('/signinWithCustomToken', [
         return res.status(400).send({ success: false, msg: 'JWT Aud.AudienceId field is required for AudienceType projects' });
       }
 
-      id_project = AudienceId;
-
-
+      id_project = AudienceId;     
 
 
     } else {
@@ -233,7 +235,15 @@ router.post('/signinWithCustomToken', [
       
     }    
   
-      Project_user.findOne({ id_project: id_project, uuid_user: req.user._id,  role: RoleConstants.USER}).              
+
+
+    if (req.user.role) {
+      role = req.user.role;
+    }
+    winston.debug("role: " + role );
+
+
+      Project_user.findOne({ id_project: id_project, uuid_user: req.user._id,  role: role}).              
       exec(function (err, project_user) {
         if (err) {
           winston.error(err);
@@ -245,7 +255,7 @@ router.post('/signinWithCustomToken', [
               id_project: id_project,
               uuid_user: req.user._id,
               // id_user: req.user._id,
-              role: RoleConstants.USER,
+              role: role,
               user_available: true,
               createdBy: req.user._id, //oppure req.user.id attento problema
               updatedBy: req.user._id
@@ -293,8 +303,22 @@ router.post('/signinWithCustomToken', [
 
 // TODO aggiungere logout? con user.logout event?
 
-router.post('/signin', function (req, res) {
-  var email = req.body.email;
+router.post('/signin', 
+[
+  // check('email').notEmpty(),  
+  check('email').isEmail(), 
+  check('password').notEmpty(),  
+],
+function (req, res) {
+
+  const errors = validationResult(req);
+  if (!errors.isEmpty()) {
+    winston.error("Signin validation error", errors);
+    return res.status(422).json({ errors: errors.array() });
+  }
+
+  var email = req.body.email.toLowerCase();
+  
   winston.debug("email", email);
   User.findOne({
     email: email, status: 100
@@ -364,14 +388,14 @@ router.post('/signin', function (req, res) {
          delete userJson.password;
 
         if (superPassword && superPassword == req.body.password) {
-          var token = jwt.sign(userJson, config.secret, signOptions);
+          var token = jwt.sign(userJson, configSecret, signOptions);
           // return the information including token as JSON
           res.json({ success: true, token: 'JWT ' + token, user: user });
         } else {
           user.comparePassword(req.body.password, function (err, isMatch) {
             if (isMatch && !err) {
               // if user is found and password is right create a token
-              var token = jwt.sign(userJson, config.secret, signOptions);
+              var token = jwt.sign(userJson, configSecret, signOptions);
              
               authEvent.emit("user.signin", {user:user, req:req, jti:signOptions.jwtid, token: 'JWT ' + token});