@tiledesk/tiledesk-server 2.4.78 → 2.4.79-rc1

package/CHANGELOG.md

@@ -5,6 +5,16 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.4.79
+- update whatsapp-connector to 0.1.55
+- update whatsapp-jobworker to 0.0.4
+- added support for whatsapp broadcast queue
+
+# 2.4.78
+- update whatsapp-connector to 0.1.53
+- update messenger-connector to 0.1.13
+- update telegram-connector to 0.1.10
+
 # 2.4.77
 - update tybot-connector to 0.2.26
 

package/app.js

@@ -181,6 +181,11 @@ pubModulesManager.init({express:express, mongoose:mongoose, passport:passport, d
   
 jobsManager.listen(); //listen after pubmodules to enabled queued *.queueEnabled events
 
+let whatsappQueue = require('@tiledesk/tiledesk-whatsapp-jobworker');
+winston.info("whatsappQueue");
+jobsManager.listenWhatsappQueue(whatsappQueue);
+
+
 var channelManager = require('./channels/channelManager');
 channelManager.listen(); 
 

package/deploy.sh

@@ -1,5 +1,5 @@
 git pull
-npm version patch
+#npm version patch
 version=`node -e 'console.log(require("./package.json").version)'`
 echo "version $version"
 

package/jobs.js

@@ -97,7 +97,9 @@ async function main()
     winston.debug("routingQueueQueued"); 
     jobsManager.listenRoutingQueue(routingQueueQueued);
 
-
+    let whatsappQueue = require('@tiledesk/tiledesk-whatsapp-jobworker');
+    winston.info("whatsappQueue");
+    jobsManager.listenWhatsappQueue(whatsappQueue);
 
     let scheduler = require('./pubmodules/scheduler');    
     jobsManager.listenScheduler(scheduler);

package/jobsManager.js

@@ -11,6 +11,7 @@ class JobsManager {
 
         this.emailNotificatio = undefined;
         this.activityArchiver = undefined;
+        this.whatsappWorker = undefined;
      
         this.jobWorkerEnabled = jobWorkerEnabled;
         // this.jobWorkerEnabled = false;
@@ -71,6 +72,16 @@ class JobsManager {
         this.activityArchiver = activityArchiver;
         this.activityArchiver.listen();
     }
+
+    listenWhatsappQueue(whatsappQueue) {
+        console.log("JobsManager listenWhatsappQueue started");
+        console.log("whatsappQueue is: ", whatsappQueue)
+        if ( this.jobWorkerEnabled == true) {
+            return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listener for Whatsapp Queue");  
+        }
+        // this.whatsappWorker = whatsappQueue;
+        // this.whatsappQueue.listen(); // oppure codice
+    }
 }
 
 

package/middleware/recaptcha.js

@@ -0,0 +1,32 @@
+var winston = require('../config/winston');
+
+var Recaptcha = require('express-recaptcha').RecaptchaV3
+var recaptcha = new Recaptcha('6Lf1khcpAAAAABMNHJfnJm43vVTxFzXM7ADqDAp5', '6Lf1khcpAAAAAG6t7LuOfl9vThGPFOOJIiAoMIhs')
+
+const RECAPTCHA_ENABLED =  false;
+
+if (process.env.RECAPTCHA_ENABLED === true || process.env.RECAPTCHA_ENABLED ==="true") {
+    RECAPTCHA_ENABLED = true;
+}
+
+module.exports = 
+    function(req,res,next){ 
+        if (RECAPTCHA_ENABLED==false) {
+            return next();
+        } 
+
+        recaptcha.verify(req, function (error, data) {
+            if (!error) {
+              winston.debug("Signup recaptcha ok");
+              next();
+                // success code
+            } else {
+              winston.error("Signup recaptcha ko");
+            //   next({status:"Signup recaptcha ko"});
+                res.status(403).send({success: false, msg: 'Recaptcha error.'});
+
+                // error code
+            }
+        })
+       
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.78",
+  "version": "2.4.79-rc1",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -42,11 +42,12 @@
     "@tiledesk/tiledesk-dialogflow-connector": "^1.8.4",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
-    "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.2.26",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.53",
     "@tiledesk/tiledesk-messenger-connector": "^0.1.13",
+    "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.10",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.30",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.55",
+    "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.4",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",
@@ -62,6 +63,7 @@
     "eventemitter2": "^6.4.4",
     "express": "^4.17.3",
     "express-ipfilter": "^1.2.0",
+    "express-recaptcha": "^5.1.0",
     "express-session": "^1.17.3",
     "express-validator": "^6.14.2",
     "fast-csv": "^4.3.6",

package/pubmodules/whatsapp/listener.js

@@ -27,6 +27,12 @@ class Listener {
 
         let baseFileUrl = process.env.BASE_FILE_URL || apiUrl || "http://localhost:3000"
 
+        let job_topic = process.env.JOB_TOPIC_EXCHANGE;
+        winston.debug("Whatsapp job topic " + job_topic);
+
+        let amqp_manager_url = process.env.AMQP_MANAGER_URL;
+        winston.debug("amqp_manager_url " + amqp_manager_url);
+
         let log = process.env.WHATSAPP_LOG || false
         winston.debug("Whatsapp log: "+ log);
 
@@ -40,6 +46,8 @@ class Listener {
             REDIS_HOST: host,
             REDIS_PORT: port,
             REDIS_PASSWORD: password,
+            AMQP_MANAGER_URL: amqp_manager_url,
+            JOB_TOPIC_EXCHANGE: job_topic,
             log: log
         }, (err) => {
             if (!err) {

package/routes/auth.js

@@ -33,18 +33,33 @@ if (pKey) {
   configSecret = pKey.replace(/\\n/g, '\n');
 }
 
+var recaptcha = require('../middleware/recaptcha');
+
+
+
 // const fs  = require('fs');
 // var configSecret = fs.readFileSync('private.key');
 
 
 router.post('/signup',
-[
-  check('email').isEmail(),  
-  check('firstname').notEmpty(),  
-  check('lastname').notEmpty()
-]
+  [
+    check('email').isEmail(),  
+    check('firstname').notEmpty(),  
+    check('lastname').notEmpty(),
+    recaptcha
+
+  ]
+  // recaptcha.middleware.verify
+
 , function (req, res) {
 
+  // if (!req.recaptcha.error) {
+  //   winston.error("Signup recaptcha ok");
+  // } else {
+  //   // error code
+  //   winston.error("Signup recaptcha ko");
+  // }
+
   const errors = validationResult(req);
   if (!errors.isEmpty()) {
     winston.error("Signup validation error", errors);
@@ -210,6 +225,7 @@ router.post('/signinWithCustomToken', [
 
     var id_project;
      
+    let userToReturn = req.user;
 
     var role = RoleConstants.USER;
 
@@ -264,12 +280,41 @@ router.post('/signinWithCustomToken', [
 
 
       Project_user.findOne({ id_project: id_project, uuid_user: req.user._id,  role: role}).              
-      exec(function (err, project_user) {
+      exec(async (err, project_user) => {
         if (err) {
           winston.error(err);
           return res.json({ success: true, token: req.headers["authorization"], user: req.user });
         }
         if (!project_user) {
+
+          let createNewUser = false;
+          winston.debug('role: '+ role)
+
+          
+          if (role === RoleConstants.OWNER || role === RoleConstants.ADMIN || role === RoleConstants.AGENT) {            
+           createNewUser = true;
+
+           var newUser;
+           try {
+            newUser = await userService.signup(req.user.email, uuidv4(), req.user.firstname, req.user.lastname, false);
+           } catch(e) {
+            winston.debug('error signup already exists??: ')
+
+            if (e.code = "E11000") {
+              newUser = await User.findOne({email: req.user.email , status: 100}).exec();
+              winston.debug('signup found')
+
+            } 
+           }
+           
+           if (!newUser) {
+            return res.status(401).send({ success: false, msg: 'User not found.' });
+           }
+
+           winston.debug('userToReturn forced to newUser.', newUser)
+           userToReturn=newUser;
+          }
+
             var newProject_user = new Project_user({
 
               id_project: id_project,
@@ -281,29 +326,60 @@ router.post('/signinWithCustomToken', [
               updatedBy: req.user._id
             });
 
+            // testtare qiestp cpm dpcker dev partemdp da ui
+            if (createNewUser===true) {
+              newProject_user.id_user = newUser._id;
+              // delete newProject_user.uuid_user;
+              winston.debug('newProject_user.', newProject_user)
+            }
+
             return newProject_user.save(function (err, savedProject_user) {
               if (err) {
                 winston.error('Error saving object.', err)
                 // return res.status(500).send({ success: false, msg: 'Error saving object.' });
-                return res.json({ success: true, token: req.headers["authorization"], user: req.user });
+                return res.json({ success: true, token: req.headers["authorization"], user: userToReturn});
               }
 
             
               authEvent.emit("projectuser.create", savedProject_user);         
 
-              authEvent.emit("user.signin", {user:req.user, req:req, token: req.headers["authorization"]});      
+              authEvent.emit("user.signin", {user:userToReturn, req:req, token: req.headers["authorization"]});      
 
               winston.debug('project user created ', savedProject_user.toObject());
 
+
+              let returnToken = req.headers["authorization"];
+              if (createNewUser===true) {       
+
+
+
+                var signOptions = {         
+                  issuer:  'https://tiledesk.com',   
+                  subject:  'user',
+                  audience:  'https://tiledesk.com',
+                  jwtid: uuidv4()
+                };
+
+                var alg = process.env.GLOBAL_SECRET_ALGORITHM;
+                if (alg) {
+                  signOptions.algorithm = alg;
+                }
+
+                //remove password //test it              
+                let userJson = userToReturn.toObject();
+                delete userJson.password;
+       
+                returnToken = jwt.sign(userJson, configSecret, signOptions); //priv_jwt pp_jwt
                 
+              }
 
-              return res.json({ success: true, token: req.headers["authorization"], user: req.user });
+              return res.json({ success: true, token: 'JWT ' + returnToken, user: userToReturn });
           });
         } else {
           winston.debug('project user already exists ');
 
           if (project_user.status==="active") {
-            return res.json({ success: true, token: req.headers["authorization"], user: req.user });
+            return res.json({ success: true, token: req.headers["authorization"], user: userToReturn });
           } else {
             winston.warn('Authentication failed. Project_user not active.');
             return res.status(401).send({ success: false, msg: 'Authentication failed. Project_user not active.' });

package/routes/message.js

@@ -122,7 +122,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.info("project_user", project_user);
+                winston.debug("project_user", project_user);
             
                 if (!project_user) {
                   return res.status(403).send({success: false, msg: 'Unauthorized. Project_user not found with user id  : '+ sender });
@@ -177,7 +177,8 @@ async (req, res)  => {
                   channel: req.body.channel, 
                   location: req.body.location,
                   participants: req.body.participants,
-                  lead: createdLead, requester: project_user,
+                  lead: createdLead, 
+                  requester: project_user,
                   priority: req.body.priority,
                   followers: req.body.followers,
                 };

package/utils/segment2mongoConverter.js

@@ -32,7 +32,7 @@ class Segment2MongoConverter {
                         //console.log('Operator >=');
                         this.convertGreaterThanOrEqualOperatorFilter(condition, filter);
                         break;
-                    case 'stars with':
+                    case 'starts with':
                         //console.log('Operator >=');
                         this.convertStarsWithOperatorFilter(condition, filter);
                         break;