@tiledesk/tiledesk-server 2.4.41 → 2.4.43

package/CHANGELOG.md

@@ -5,9 +5,22 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+
+# 2.4.42
+- createIfNotExistsWithLeadId now update the lead email if jwt email changes
+
+# 2.4.41
+- Whatsapp updates
+
+# 2.4.40
+- botSubscriptionNotifier and botEvent queued disabled
+- added lead.create to the queue
+- queued scheduler (close chat)
+- added chat21 channel, cache, rules 
+
 # 2.4.39
 - Queued botSubscriptionNotifier
-- added lead.create to the queue????? testare di nuovo
+- added lead.create to the queue
 - @tiledesk/tiledesk-tybot-connector: 0.1.89
 - jobsManager.listen(); //listen after pubmodules to enabled queued *.queueEnabled events
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.41",
+  "version": "2.4.43",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -44,7 +44,7 @@
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
     "@tiledesk/tiledesk-messenger-connector": "0.1.9",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.89",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.91",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.51",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",

package/routes/auth.js

@@ -458,13 +458,23 @@ function (req, res) {
 
 // http://localhost:3000/auth/google?redirect_url=%2F%23%2Fproject%2F6452281f6d68c5f419c1c577%2Fhome
 
+// http://localhost:3000/auth/google?redirect_url=%23%2Fcreate-project-gs
 
+// http://localhost:3000/auth/google?forced_redirect_url=https%3A%2F%2Fpanel.tiledesk.com%2Fv3%2Fchat%2F%23conversation-detail%3Ffrom%3Dgoogle
+
+// https://tiledesk-server-pre.herokuapp.com/auth/google?redirect_url=%23%2Fcreate-project-gs
+
+// https://tiledesk-server-pre.herokuapp.com/auth/google
 
 // Redirect the user to the Google signin page</em> 
 // router.get("/google", passport.authenticate("google", { scope: ["email", "profile"] }));
 router.get("/google", function(req,res,next){
   winston.info("redirect_url: "+ req.query.redirect_url );
   req.session.redirect_url = req.query.redirect_url;
+
+  winston.info("forced_redirect_url: "+ req.query.forced_redirect_url );
+  req.session.forced_redirect_url = req.query.forced_redirect_url;
+
   // req._toParam = 'Hello';
   passport.authenticate(
       // 'google', { scope : ["email", "profile"], state: base64url(JSON.stringify({blah: 'text'}))  } //custom redirect_url req.query.state
@@ -487,7 +497,7 @@ router.get("/google/callback", passport.authenticate("google", { session: false
   // winston.info("req._toParam: "+ req._toParam);
   // winston.info("req.query.redirect_url: "+ req.query.redirect_url);
   // winston.info("req.query.state: "+ req.query.state);
-  winston.info("req.session.redirect_url: "+ req.session.redirect_url);
+  winston.debug("req.session.redirect_url: "+ req.session.redirect_url);
   
 
   var userJson = user.toObject();
@@ -526,6 +536,9 @@ router.get("/google/callback", passport.authenticate("google", { session: false
 
   var url = dashboard_base_url+homeurl+"?token=JWT "+token;
 
+  if (req.session.forced_redirect_url) {
+    url = req.session.forced_redirect_url+"&token=JWT "+token;
+  }
 
   winston.info("Google Redirect: "+ url);
 

package/routes/faq.js

@@ -28,6 +28,7 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
   winston.debug('delimiter: ' + delimiter);
 
   var csv = req.file.buffer.toString('utf8');
+  winston.debug("--> csv: ", csv)
   // winston.debug(' -> CSV STRING ', csv);
 
   // res.json({ success: true, msg: 'Importing CSV...' });
@@ -51,6 +52,8 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
       .on("data", function (data) {
         winston.debug('PARSED CSV ', data);
 
+        winston.debug('--> PARSED CSV ', data);
+
         var question = data[0]
         //var answer = data[1]
         var intent_id = data[2];
@@ -104,6 +107,8 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
           updatedBy: req.user.id
         });
 
+        winston.debug("--> newFaq: ", JSON.stringify(newFaq, null, 2));
+
         newFaq.save(function (err, savedFaq) {
           if (err) {
             winston.error('--- > ERROR uploadcsv', err)
@@ -194,6 +199,7 @@ router.post('/', function (req, res) {
 
 router.patch('/:faqid/attributes', function (req, res) {
   let data = req.body;
+  winston.debug("data: ", data);
 
   Faq.findById(req.params.faqid, function (err, updatedFaq) {
     if (err) {
@@ -206,6 +212,7 @@ router.patch('/:faqid/attributes', function (req, res) {
     }
 
     if (!updatedFaq.attributes) {
+      winston.debug("empty attributes");
       winston.debug("empty attributes");
       updatedFaq.attributes = {};
     }
@@ -218,6 +225,9 @@ router.patch('/:faqid/attributes', function (req, res) {
       updatedFaq.attributes[key] = val;
     })
 
+    winston.debug("updatedFaq: ", updatedFaq);
+    winston.debug("updatedFaq attributes: ", updatedFaq.attributes);
+
     winston.debug("updatedBot attributes", updatedFaq.attributes)
 
     updatedFaq.markModified('attributes');
@@ -229,6 +239,8 @@ router.patch('/:faqid/attributes', function (req, res) {
         return res.status(500).send({ success: false, msg: 'Error saving object.' });
       }
 
+      winston.debug("saved faq attributes", savedFaq.toObject());
+
       winston.verbose("saved faq attributes", savedFaq.toObject());
       faqBotEvent.emit('faq.update', savedFaq);
       res.json(savedFaq);

package/services/leadService.js

@@ -5,6 +5,7 @@ const uuidv4 = require('uuid/v4');
 const leadEvent = require('../event/leadEvent');
 var winston = require('../config/winston');
 var cacheUtil = require('../utils/cacheUtil');
+var cacheEnabler = require("../services/cacheEnabler");
 
 
 class LeadService {
@@ -67,8 +68,18 @@ class LeadService {
           if (!lead) {
             return resolve(that.createWitId(lead_id, fullname, email, id_project, createdBy, attributes, status));
           }
-          winston.debug("lead already exists createIfNotExistsWithLeadId");
-          return resolve(lead);
+
+          winston.debug("lead.email: " + lead.email); 
+          winston.debug("email: " + email); 
+          
+          if (lead.email == email) {
+            winston.debug("lead already exists createIfNotExistsWithLeadId with the same email");
+            return resolve(lead);
+          } else {
+            winston.debug("lead already exists createIfNotExistsWithLeadId but with different email");
+            return resolve(that.updateWitId(lead_id, fullname, email, id_project, status));
+          }
+          
       
       });
     });
@@ -101,7 +112,7 @@ class LeadService {
   }
 
   updateWitId(lead_id, fullname, email, id_project, status) {
-    winston.debug("lead_id: "+ lead_id);
+    winston.debug("updateWitId lead_id: "+ lead_id);
     winston.debug("fullname: "+ fullname);
     winston.debug("email: "+ email);
     winston.debug("id_project: "+ id_project);

package/test/messageRoute.js

@@ -1431,11 +1431,183 @@ describe('/SendMessageSigninWithCustomToken', () => {
               
   });
 
+
+
+
+
+
+  // mocha test/messageRoute.js  --grep 'sendMessageSigninWithCustomTokenModified'
+
+  it('sendMessageSigninWithCustomTokenModified', (done) => {
+
+      
+    var email = "test-sendmessagesigninwithcustomtokenModified-" + Date.now() + "@email.com";
+    var pwd = "pwd";
+
+    userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
+        // create(name, createdBy, settings)
+        projectService.create("test-sendMessageSigninWithCustomTokenModified", savedUser._id).then(function(savedProject) {     
+      
+            chai.request(server)
+            .post('/'+ savedProject._id + '/keys/generate')
+            .auth(email, pwd)
+            .send()
+            .end((err, res) => {
+                //console.log("res",  res);
+                console.log("res.body",  res.body);
+                res.should.have.status(200);
+                res.body.should.be.a('object');
+                expect(res.body.jwtSecret).to.not.equal(null);                                                                              
+            
+                // 'E11000 duplicate key error collection: tiledesk-test.users index: email_1 dup key: { email: "email@email.com" }' }
+                var externalUserId = "123";
+                var externalUserObj = {_id: externalUserId, firstname:"andrea", lastname:"leo", email: "email2@email.com"};
+                
+                console.log("externalUserObj", externalUserObj);
+
+
+                var signOptions = {                                                            
+                    subject:  'userexternal',                                                                 
+                    audience:  'https://tiledesk.com/projects/'+savedProject._id ,                                              
+                    };
+
+
+                var secret = res.body.jwtSecret;
+                var jwtToken = jwt.sign(externalUserObj, res.body.jwtSecret,signOptions);
+            
+                console.log("jwtToken", jwtToken);
+
+
+                chai.request(server)
+                    .post('/auth/signinWithCustomToken' )
+                    .set('Authorization', 'JWT '+jwtToken)
+                    //.send({ id_project: savedProject._id})
+                    .send()
+                    .end((err, res) => {
+                        //console.log("res",  res);
+                        console.log("res.body",  res.body);
+                        res.should.have.status(200);
+                        res.body.should.be.a('object');
+                        expect(res.body.success).to.equal(true);                                                                                                                     
+                        expect(res.body.user.email).to.equal("email2@email.com");  
+                        expect(res.body.user.firstname).to.equal("andrea");                                               
+                       
+                        expect(res.body.token).to.not.equal(undefined);  
+                        expect(res.body.token).to.equal('JWT '+jwtToken);  
+                                                                     
+                    
+                        chai.request(server)
+                            .post('/'+ savedProject._id + '/requests/sendMessageSigninWithCustomTokenModified/messages')
+                            .set('Authorization', 'JWT '+jwtToken)
+                            .set('content-type', 'application/json')
+                            .send({"text":"text"})
+                            .end(function(err, res) {
+                                //console.log("res",  res);
+                                console.log("res.body",  res.body);
+                                res.should.have.status(200);
+                                res.body.should.be.a('object');                          
+
+                                expect(res.body.sender).to.equal(externalUserId);
+                                // expect(res.body.sender).to.equal(savedProjectAndPU.project_user._id.toString());
+                                // expect(res.body.senderFullname).to.equal("senderFullname");
+                                expect(res.body.recipient).to.equal("sendMessageSigninWithCustomTokenModified");
+                                expect(res.body.text).to.equal("text");
+                                expect(res.body.id_project).to.equal(savedProject._id.toString());
+                                expect(res.body.createdBy).to.equal(externalUserId);
+                                expect(res.body.status).to.equal(0);
+
+                                expect(res.body.request.request_id).to.equal("sendMessageSigninWithCustomTokenModified");
+                                expect(res.body.request.first_text).to.equal("text");
+                                expect(res.body.request.id_project).to.equal(savedProject._id.toString());
+                                expect(res.body.request.createdBy).to.equal(externalUserId);
+
+                                // expect(res.body.request.messages_count).to.equal(1);
+
+                                expect(res.body.request.status).to.equal(200);                                
+                                expect(res.body.request.snapshot.agents.length).to.equal(1);
+                                expect(res.body.request.participants.length).to.equal(1);
+                                expect(res.body.request.department).to.not.equal(null);
+                                expect(res.body.request.lead).to.not.equal(null);               
+                                expect(res.body.request.lead.email).to.equal("email2@email.com");     
+
+                          
+                                chai.request(server)
+                                  .get('/'+ savedProject._id + '/requests/sendMessageSigninWithCustomTokenModified')
+                                  .auth(email, pwd)
+                                  .set('content-type', 'application/json')                                   
+                                  .end(function(err, res) {
+                                      //console.log("res",  res);
+                                      console.log("res.body",  res.body);
+                                      expect(res.body.lead.lead_id).to.equal(externalUserId);
+                                      expect(res.body.lead.email).to.equal("email2@email.com");
+                                      expect(res.body.lead.fullname).to.equal("andrea leo");
+                                      expect(res.body.requester.role).to.equal("user");
+                                      expect(res.body.requester.uuid_user).to.equal(externalUserId);
+                                      expect(res.body.requester.id_user).to.equal(undefined);
+
+
+
+
+                                      externalUserObj.email = "email33@email.com";
+
+                                      jwtToken = jwt.sign(externalUserObj,secret, signOptions);
+                                      console.log("jwtToken2", jwtToken);
+
+                                      chai.request(server)
+                                      .post('/auth/signinWithCustomToken' )
+                                      .set('Authorization', 'JWT '+jwtToken)
+                                      //.send({ id_project: savedProject._id})
+                                      .send()
+                                      .end((err, res) => {
+                                          //console.log("res",  res);
+                                          console.log("res.body",  res.body);
+                                          res.should.have.status(200);
+                                          res.body.should.be.a('object');
+                                          expect(res.body.success).to.equal(true);                                                                                                                     
+                                          expect(res.body.user.email).to.equal("email33@email.com");  
+                                          expect(res.body.user.firstname).to.equal("andrea");          
+
+                                          chai.request(server)
+                                          .post('/'+ savedProject._id + '/requests/sendMessageSigninWithCustomTokenModified33/messages')
+                                          .set('Authorization', 'JWT '+jwtToken)
+                                          .set('content-type', 'application/json')
+                                          .send({"text":"text"})
+                                          .end(function(err, res) {
+                                              //console.log("res",  res);
+                                              console.log("res.body",  res.body);
+                                              res.should.have.status(200);
+                                              res.body.should.be.a('object');               
+                                              
+                                              expect(res.body.request.lead.email).to.equal("email33@email.com");     
+                                              done()
+
+
+                                          });
+
+                                         
+                                      });
+
+                                     
+                                  });
+                                      
+                            });
+                    });
+                });
+            });
+        });
+            
 });
 
 
 
 
+});
+
+
+
+
+
+
 
 // mocha test/messageRoute.js  --grep 'sendMessageSigninAnonym'