@tiledesk/tiledesk-server 2.7.3 → 2.7.5

package/CHANGELOG.md

@@ -5,6 +5,16 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.7.5
+- Added support for bot PRIVATE and PUB ket in auth.js
+
+# 2.7.4
+- Bug fix '\start' in rulesTrigger
+- SSO fix
+- Updated tybot-connector to 0.2.60
+- Updated project profile call whit super admin token
+- Updated user signup with super admin token
+
 # 2.7.3
 - Updated project profile call
 - Updated tybot-connector to 0.2.59

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.7.3",
+  "version": "2.7.5",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -48,7 +48,7 @@
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.10",
     "@tiledesk/tiledesk-train-jobworker": "^0.0.7",
-    "@tiledesk/tiledesk-tybot-connector": "^0.2.59",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.60",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.64",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.7",
     "amqplib": "^0.5.5",

package/pubmodules/trigger/rulesTrigger.js

@@ -711,7 +711,7 @@ class RulesTrigger {
   
 
 
-              var startText = "\start";
+              var startText = "/start";
               // var startText = "\\start";
               if (action.parameters && action.parameters.text) {
                 startText = action.parameters.text;
@@ -788,7 +788,7 @@ class RulesTrigger {
                     'system', 
                     'Bot',                                     
                     request_id,
-                    '\\start', // TODO CHANGE TO / start
+                    '/start', // TODO CHANGE TO / start
                     id_project,
                     null,
                     {subtype:'info', updateconversation : false}
@@ -1039,7 +1039,7 @@ class RulesTrigger {
                 participants = eventAttributes.participants;
                 if (participants[0].indexOf("bot_")>-1) {
                   // TODO CHANGE TO /start
-                  text = "\\start";  //if participants is passed than the bot reply to the first message "welcome" so I changed "welcome" with "\start"
+                  text = "/start";  //if participants is passed than the bot reply to the first message "welcome" so I changed "welcome" with "\start"
                 }              
                 // status = RequestConstants.ASSIGNED;
                 // console.log("eventAttributes.participants",eventAttributes.participants);

package/routes/auth.js

@@ -33,6 +33,12 @@ if (pKey) {
   configSecret = pKey.replace(/\\n/g, '\n');
 }
 
+let pubConfigSecret = process.env.GLOBAL_SECRET || config.secret;
+var pubKey = process.env.GLOBAL_SECRET_OR_PUB_KEY;
+if (pubKey) {
+  pubConfigSecret = pKey.replace(/\\n/g, '\n');
+}
+
 var recaptcha = require('../middleware/recaptcha');
 
 
@@ -75,26 +81,26 @@ router.post('/signup',
         
         winston.debug('-- >> -- >> savedUser ', savedUser.toObject());
 
-        // let skipVerificationEmail = false;
-        // if (req.headers.authorization) {
+        let skipVerificationEmail = false;
+        if (req.headers.authorization) {
 
-        //   let token = req.headers.authorization.split(" ")[1];
-        //   let decode = jwt.verify(token, configSecret)
-        //   if (decode && (decode.email === process.env.ADMIN_EMAIL)) {
-        //     skipVerificationEmail = true;
-        //     winston.verbose("skip sending verification email")
-        //   }
-        // }
+          let token = req.headers.authorization.split(" ")[1];
+          let decode = jwt.verify(token, pubConfigSecret)
+          if (decode && (decode.email === process.env.ADMIN_EMAIL)) {
+            skipVerificationEmail = true;
+            winston.verbose("skip sending verification email")
+          }
+        }
 
-        // if (!req.body.disableEmail){
-        //   if (!skipVerificationEmail) {
-        //     emailService.sendVerifyEmailAddress(savedUser.email, savedUser);
-        //   }
-        // }
-        
         if (!req.body.disableEmail){
+          if (!skipVerificationEmail) {
             emailService.sendVerifyEmailAddress(savedUser.email, savedUser);
+          }
         }
+        
+        // if (!req.body.disableEmail){
+        //     emailService.sendVerifyEmailAddress(savedUser.email, savedUser);
+        // }
 
 
         /*
@@ -295,7 +301,8 @@ router.post('/signinWithCustomToken', [
     winston.debug("id_project: " + id_project + " uuid_user " + req.user._id + " role " + role);
 
 
-      Project_user.findOne({ id_project: id_project, uuid_user: req.user._id,  role: role}).              
+      Project_user.findOne({ id_project: id_project, uuid_user: req.user._id}).              
+      // Project_user.findOne({ id_project: id_project, uuid_user: req.user._id,  role: role}).              
       exec(async (err, project_user) => {
         if (err) {
           winston.error(err);
@@ -312,7 +319,7 @@ router.post('/signinWithCustomToken', [
           
           if (role === RoleConstants.OWNER || role === RoleConstants.ADMIN || role === RoleConstants.AGENT) {            
            createNewUser = true;
-           winston.debug('role owner admin agent');
+           winston.debug('role owner or admin or agent');
            var newUser;
            try {
 
@@ -324,7 +331,43 @@ router.post('/signinWithCustomToken', [
             if (e.code = "E11000") {
               newUser = await User.findOne({email: req.user.email.toLowerCase(), status: 100}).exec();
               winston.debug('signup found')
+                  // qui dovresti cercare pu sul progetto con id di newUser se c'è 
+              var  project_userUser = await Project_user.findOne({ id_project: id_project, id_user: newUser._id}).exec();
+                  if (project_userUser) {
+                    winston.debug('project user found')
+                    if (project_userUser.status==="active") {
+                        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;
+                        }
+                        winston.debug('project user found2')
+
+                        //remove password //test it              
+                        let userJson = newUser.toObject();
+                        delete userJson.password;
+                        winston.debug('project user found3')
+
+                        let returnToken = jwt.sign(userJson, configSecret, signOptions); //priv_jwt pp_jwt
+          
+                        winston.debug('project user found4')
 
+                        if (returnToken.indexOf("JWT")<0) {
+                          returnToken = "JWT " + returnToken;
+                        }
+                        winston.debug('project user found5')
+
+                        return res.json({ success: true, token: returnToken, user: newUser });
+
+                    }
+                  }
+                  
             } 
            }
            
@@ -334,6 +377,9 @@ router.post('/signinWithCustomToken', [
 
            winston.debug('userToReturn forced to newUser.', newUser)
            userToReturn=newUser;
+
+          
+
           }
 
             var newProject_user = new Project_user({
@@ -411,6 +457,16 @@ router.post('/signinWithCustomToken', [
 
           if (project_user.status==="active") {
 
+            winston.debug('role.'+role)
+            winston.debug(' project_user.role', project_user)
+            
+ 
+             if (role == project_user.role) {
+               winston.debug('equals role : '+role + " " + project_user.role);
+             } else {
+               winston.debug('different role : '+role + " " + project_user.role);
+             }
+
             if (req.user.role && (req.user.role === RoleConstants.OWNER || req.user.role === RoleConstants.ADMIN || req.user.role === RoleConstants.AGENT)) {
               let userFromDB = await User.findOne({email: req.user.email.toLowerCase(), status: 100}).exec();
 

package/routes/project.js

@@ -21,20 +21,6 @@ var cacheUtil = require('../utils/cacheUtil');
 var orgUtil = require("../utils/orgUtil");
 var cacheEnabler = require("../services/cacheEnabler");
 
-/**
- * NEW
- */
-var jwt = require('jsonwebtoken');
-var config = require('../config/database');
-
-let configSecret = process.env.GLOBAL_SECRET || config.secret;
-var pKey = process.env.GLOBAL_SECRET_OR_PUB_KEY;
-if (pKey) {
-  configSecret = pKey.replace(/\\n/g, '\n');
-}
-/**
- * End NEW
- */
 
 router.post('/', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], async (req, res) => {
   
@@ -254,7 +240,6 @@ router.put('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: fa
 
   var update = {};
 
-  console.log("ADMIN EMAIL: ", process.env.ADMIN_EMAIL)
   if (req.body.profile) {
 
     if (req.user &&

package/test/authentication.js

@@ -19,11 +19,18 @@ var expect = chai.expect;
 var assert = chai.assert;
 var jwt = require('jsonwebtoken');
 
+var config = require('../config/database');
+
+var mongoose = require('mongoose');
+mongoose.connect(config.databasetest);
+
 
 chai.use(chaiHttp);
 
 describe('Authentication', () => {
 
+   // mocha test/authentication.js  --grep 'signinOk'
+
   describe('/signin', () => {
  
    
@@ -257,6 +264,7 @@ describe('/signup', () => {
                            
         });
 
+   // mocha test/authentication.js  --grep 'signupkOWrongEmail'
 
     it('signupkOWrongEmail', (done) => {
 
@@ -696,6 +704,7 @@ it('signinWithCustomTokenKONoAud', (done) => {
 
 
 
+   // mocha test/authentication.js  --grep 'signinWithCustomTokenOkTwoSigninWithCT'
 
 it('signinWithCustomTokenOkTwoSigninWithCT', (done) => {
 
@@ -788,6 +797,248 @@ it('signinWithCustomTokenOkTwoSigninWithCT', (done) => {
 
 
 
+   // mocha test/authentication.js  --grep 'signinWithCustomTokenRoleNew'
+
+
+it('signinWithCustomTokenRoleNew', (done) => {
+
+        
+    var email = "test-signinWithCustomTokenRole-" + Date.now() + "@email.com";
+    var pwd = "pwd";
+
+
+    var emailToCheck = "emailrole"+ Date.now() +"@email.com";
+
+
+    userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
+        // create(name, createdBy, settings)
+        projectService.create("test-signinWithCustomTokenRole", 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 externalUserObj = {_id: "123", firstname:"andrea", lastname:"leo", email: emailToCheck, role:"admin"};
+                
+                console.log("externalUserObj", externalUserObj);
+
+
+                var signOptions = {                                                            
+                    subject:  'userexternal',                                                                 
+                    audience:  'https://tiledesk.com/projects/'+savedProject._id ,                                              
+                    };
+
+
+                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);          
+                        console.log("1");
+                                                                                                           
+                        expect(res.body.user.email).to.equal(emailToCheck);  
+                        console.log("2");
+                        expect(res.body.user.firstname).to.equal("andrea");          
+                        // expect(res.body.user._id).to.not.equal("123");          
+                        console.log("3");
+                                                        
+                       
+                        expect(res.body.token).to.not.equal(undefined);  
+                        // expect(res.body.token).to.equal('JWT '+jwtToken);  
+                                                                     
+                        console.log("4");
+                        done();
+                    });
+                });
+            });
+        });
+
+});
+
+
+
+
+
+   // mocha test/authentication.js  --grep 'signinWithCustomTokenRole'
+
+
+   it('signinWithCustomTokenRoleEmailAlreadyUsed', (done) => {
+
+        
+    var email = "test-signinWithCustomTokenRoleEmailAlreadyUsed-" + Date.now() + "@email.com";
+    var pwd = "pwd";
+
+
+    var emailToCheck = "emailrole"+ Date.now() +"@email.com";
+
+    userService.signup( emailToCheck ,pwd, "andrea", "leo").then(function(savedUserToCheck) {
+
+    userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
+        // create(name, createdBy, settings)
+        projectService.create("test-signinWithCustomTokenRoleEmailAlreadyUsed", 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 externalUserObj = {_id: "123", firstname:"andrea", lastname:"leo", email: emailToCheck, role:"admin"};
+                
+                console.log("externalUserObj", externalUserObj);
+
+
+                var signOptions = {                                                            
+                    subject:  'userexternal',                                                                 
+                    audience:  'https://tiledesk.com/projects/'+savedProject._id ,                                              
+                    };
+
+
+                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);          
+                        // console.log("1");
+                                                                                                           
+                        expect(res.body.user.email).to.equal(emailToCheck);  
+                        // console.log("2");
+                        expect(res.body.user.firstname).to.equal("andrea");          
+                        // expect(res.body.user._id).to.not.equal("123");          
+                        // console.log("3");
+                                                        
+                       
+                        expect(res.body.token).to.not.equal(undefined);  
+                        // expect(res.body.token).to.equal('JWT '+jwtToken);  
+                                                                     
+                        // console.log("4");
+                        done();
+                    });
+                });
+            });
+        });
+    });
+});
+
+
+
+
+
+
+
+   // mocha test/authentication.js  --grep 'signinWithCustomTokenRoleSameOwnerEmail'
+
+
+   it('signinWithCustomTokenRoleSameOwnerEmail', (done) => {
+
+        
+    var email = "test-sctrolesameowner-" + Date.now() + "@email.com";
+    var pwd = "pwd";
+
+
+    var emailToCheck = email;
+
+
+    userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
+        // create(name, createdBy, settings)
+        projectService.create("test-signinWithCustomTokenRoleEmailAlreadyUsed", 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 externalUserObj = {_id: "123", firstname:"andrea", lastname:"leo", email: emailToCheck, role:"admin"};
+                
+                console.log("externalUserObj", externalUserObj);
+
+
+                var signOptions = {                                                            
+                    subject:  'userexternal',                                                                 
+                    audience:  'https://tiledesk.com/projects/'+savedProject._id ,                                              
+                    };
+
+
+                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);          
+                        console.log("1");
+                                                                                                           
+                        expect(res.body.user.email).to.equal(emailToCheck);  
+                        console.log("2");
+                        expect(res.body.user.firstname).to.equal("Test Firstname");          
+                        // expect(res.body.user._id).to.not.equal("123");          
+                        console.log("3");
+                                                        
+                       
+                        expect(res.body.token).to.not.equal(undefined);  
+                        // expect(res.body.token).to.equal('JWT '+jwtToken);  
+                                                                     
+                        console.log("4");
+                        done();
+                    });
+                });
+            });
+        });
+    });
+
+