@tiledesk/tiledesk-server 2.4.7 → 2.4.8

package/.circleci/config.yml

@@ -16,7 +16,7 @@ jobs:
     # You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
     # A list of available CircleCI Docker Convenience Images are available here: https://circleci.com/developer/images/image/cimg/node
     docker:
-      - image: cimg/node:15.1
+      - image: cimg/node:16.17.1
     # Then run your tests!
     # CircleCI will report the results back to your VCS provider.
     steps:

package/app.js

@@ -132,6 +132,7 @@ var settingDataLoader = require('./services/settingDataLoader');
 var schemaMigrationService = require('./services/schemaMigrationService');
 var RouterLogger = require('./models/routerLogger');
 var cacheEnabler = require("./services/cacheEnabler");
+const session = require('express-session');
 
 require('./services/mongoose-cache-fn')(mongoose);
 
@@ -270,6 +271,16 @@ if (process.env.ENABLE_ACCESSLOG) {
 
 app.use(passport.initialize());
 
+// After you declare "app"
+if (process.env.DISABLE_SESSION_STRATEGY==true ||  process.env.DISABLE_SESSION_STRATEGY=="true" ) {
+  winston.info("Express Session disabled");
+} else {
+  // https://www.npmjs.com/package/express-session
+  let sessionSecret = process.env.SESSION_SECRET || "tiledesk-session-secret";
+  winston.info("Express Session Secret: " + sessionSecret);
+  app.use(session({ secret: sessionSecret}));
+  app.use(passport.session());
+}
 
 //ATTENTION. If you use AWS Api Gateway you need also to configure the cors policy https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-cors-console.html
 app.use(cors());

package/config/email.js

@@ -3,7 +3,7 @@ module.exports = {
   'username': 'postmaster@mg.tiledesk.com',
   'from': 'Tiledesk Notification <postmaster@mg.tiledesk.com>',
   'bcc': '',
-  'baseUrl':'https://console.tiledesk.com/v2/dashboard',
+  'baseUrl':'http://localhost:8081/dashboard',
   'replyEnabled' : false,
   'inboundDomain': 'tickets.tiledesk.com'
 };

package/middleware/passport.js

@@ -511,6 +511,7 @@ if (enableGoogleSignin==true) {
 
           var auth = new Auth({
             providerId: issuer,
+            email: email,
             subject: profile.id,
           });
           auth.save(function (err, authSaved) {    

package/models/auth.js

@@ -12,9 +12,17 @@ var AuthSchema = new Schema({
         default: 'password',
         required: true
      },
+     subject: {
+        type: String,
+        required: true
+     },
+     email: {
+        type: String,        
+     },
      password: {
         type: String,
-        required: true,
+        required: false,
+        // required: true,
         // https://stackoverflow.com/questions/12096262/how-to-protect-the-password-field-in-mongoose-mongodb-so-it-wont-return-in-a-qu
         // select: false
     },

package/models/user.js

@@ -55,6 +55,9 @@ var UserSchema = new Schema({
         index: true,
         // select: false
     }, 
+    description: {
+        type: String,
+    },
     // authType: { // update db old data
     //     type: String,
     //     index:true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "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.77",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.78",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.45",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",

package/pubmodules/apps/listener.js

@@ -6,13 +6,13 @@ var config = require('../../config/database'); // get db config file
 let configSecretOrPubicKay = process.env.GLOBAL_SECRET || config.secret;   
 
 var pKey = process.env.GLOBAL_SECRET_OR_PUB_KEY;
-console.log("pKey",pKey);
+// console.log("pKey",pKey);
 
 if (pKey) {
   configSecretOrPubicKay = pKey.replace(/\\n/g, '\n');
 }
 
-console.log("configSecretOrPubicKay",configSecretOrPubicKay);
+// console.log("configSecretOrPubicKay",configSecretOrPubicKay);
 
 class Listener {
 
@@ -23,7 +23,7 @@ class Listener {
         if (config.databaseUri) {
             winston.debug("apps config databaseUri: " + config.databaseUri);
         }
-        console.log("ACCESS_TOKEN_SECRET",process.env.APPS_ACCESS_TOKEN_SECRET || configSecretOrPubicKay);
+        // console.log("ACCESS_TOKEN_SECRET",process.env.APPS_ACCESS_TOKEN_SECRET || configSecretOrPubicKay);
 
         apps.startApp({
             ACCESS_TOKEN_SECRET: process.env.APPS_ACCESS_TOKEN_SECRET || configSecretOrPubicKay,

package/routes/auth.js

@@ -452,9 +452,31 @@ function (req, res) {
 });
 
 
+// http://localhost:3000/auth/google?redirect_url=http%3A%2F%2Flocalhost%3A3000%2Fauth%2Fgoogle%2Fcallback%3Ffrom%3Dsignup
+
+// http://localhost:3000/auth/google?redirect_url=http%3A%2F%2Flocalhost%3A3000%2Fauth%2Fgoogle%2Fcallbacks
+
+// http://localhost:3000/auth/google?redirect_url=%2F%23%2Fproject%2F6452281f6d68c5f419c1c577%2Fhome
+
+
 
 // Redirect the user to the Google signin page</em> 
-router.get("/google", passport.authenticate("google", { scope: ["email", "profile"] }));
+// 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;
+  // req._toParam = 'Hello';
+  passport.authenticate(
+      // 'google', { scope : ["email", "profile"], state: base64url(JSON.stringify({blah: 'text'}))  } //custom redirect_url req.query.state
+      'google', { scope : ["email", "profile"] } //custom redirect_url
+      // 'google', { scope : ["email", "profile"], callbackURL: req.query.redirect_url } //custom redirect_url
+  )(req,res,next);
+});
+
+// router.get("/google/callbacks", passport.authenticate("google", { session: false }), (req, res) => {
+//   console.log("callback_signup");
+//   res.redirect("/google/callback");
+// });
 
 // Retrieve user data using the access token received</em> 
 router.get("/google/callback", passport.authenticate("google", { session: false }), (req, res) => {
@@ -462,9 +484,17 @@ router.get("/google/callback", passport.authenticate("google", { session: false
 
   var user = req.user;
   winston.debug("user", user);
+  // 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);
+  
 
   var userJson = user.toObject();
   
+  delete userJson.password;
+
+
     var signOptions = {     
       issuer:  'https://tiledesk.com',       
       subject:  'user',
@@ -485,8 +515,19 @@ router.get("/google/callback", passport.authenticate("google", { session: false
   // return the information including token as JSON
   // res.json(returnObject);
 
-  var url = process.env.EMAIL_BASEURL+"?token=JWT "+token;
-  winston.debug("url: "+ url);
+  let dashboard_base_url = process.env.EMAIL_BASEURL || config.baseUrl;
+  winston.debug("Google Redirect dashboard_base_url: ", dashboard_base_url);
+
+  let homeurl = "/#/";
+
+  if (req.session.redirect_url) {
+    homeurl = req.session.redirect_url;
+  }
+
+  var url = dashboard_base_url+homeurl+"?token=JWT "+token;
+
+
+  winston.info("Google Redirect: "+ url);
 
   res.redirect(url);
 

package/routes/images.js

@@ -23,7 +23,9 @@ const fileService = new FileGridFsService("images");
 
 
 const fileFilter = (req, file, cb) => {
-  if (file.mimetype == 'image/jpeg' || file.mimetype == 'image/png' || file.mimetype == 'image/gif'|| file.mimetype == 'image/vnd.microsoft.icon') {
+  if (file.mimetype == 'image/jpeg' || file.mimetype == 'image/png' 
+      || file.mimetype == 'image/gif'|| file.mimetype == 'image/vnd.microsoft.icon'
+      || file.mimetype == 'image/webp') {
       cb(null, true);
   } else {
       cb(null, false);

package/routes/project.js

@@ -46,6 +46,8 @@ router.put('/:projectid/downgradeplan', [passport.authenticate(['basic', 'jwt'],
 router.delete('/:projectid/physical', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('owner')], function (req, res) {
   winston.debug(req.body);
   // TODO delete also department, faq_kb, faq, group, label, lead, message, project_users, requests, subscription
+  
+  // TODO use findByIdAndRemove otherwise project don't contains label object
   Project.remove({ _id: req.params.projectid }, function (err, project) {
       if (err) {
           winston.error('Error deleting project ', err);
@@ -121,12 +123,18 @@ router.put('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: fa
   if (req.body["settings.email.templates.newMessage"]!=undefined) {
     update["settings.email.templates.newMessage"] = req.body["settings.email.templates.newMessage"];
   }
+  if (req.body["settings.email.templates.newMessageFollower"]!=undefined) {
+    update["settings.email.templates.newMessageFollower"] = req.body["settings.email.templates.newMessageFollower"];
+  }
   if (req.body["settings.email.templates.ticket"]!=undefined) {
     update["settings.email.templates.ticket"] = req.body["settings.email.templates.ticket"];
   }
   if (req.body["settings.email.templates.sendTranscript"]!=undefined) {
     update["settings.email.templates.sendTranscript"] = req.body["settings.email.templates.sendTranscript"];
   }
+  if (req.body["settings.email.templates.emailDirect"]!=undefined) {
+    update["settings.email.templates.emailDirect"] = req.body["settings.email.templates.emailDirect"];
+  }
 
 
   if (req.body["settings.email.from"]!=undefined) {
@@ -512,6 +520,8 @@ router.get('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: fa
       winston.warn('Project not found ');
       return res.status(404).send({ success: false, msg: 'Object not found.' });
     }
+
+     //TODO REMOVE settings from project
     res.json(project);
   });
 });
@@ -608,6 +618,8 @@ router.get('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
 
       project_users.sort((a, b) => (a.id_project && b.id_project && a.id_project.updatedAt > b.id_project.updatedAt) ? 1 : -1)
       project_users.reverse(); 
+
+      //TODO REMOVE settings from project
       res.json(project_users);
     });
 });

package/routes/users.js

@@ -20,6 +20,7 @@ router.put('/', function (req, res) {
   update.firstname = req.body.firstname;
   update.lastname = req.body.lastname;
   update.attributes = req.body.attributes;
+  update.description = req.body.description;
   
   
 
@@ -75,6 +76,7 @@ router.delete('/physical', function (req, res) {
   // cancello virtualmente progetti owner
   winston.debug('delete USER - REQ BODY ', req.body);
 
+  // TODO use findByIdAndRemove otherwise user don't contains label object
   User.remove({ _id: req.user.id }, function (err, user) {
     if (err) {
       winston.error(err);

package/services/emailService.js

@@ -1857,7 +1857,7 @@ parseText(text, payload) {
   var baseScope = JSON.parse(JSON.stringify(this));
   delete baseScope.pass;
 
-  winston.info("parseText text: "+ text);
+  winston.debug("parseText text: "+ text);
 
   var templateHand = handlebars.compile(text);
 
@@ -1868,7 +1868,7 @@ parseText(text, payload) {
   };
 
   var textTemplate = templateHand(replacements);
-  winston.info("parseText textTemplate: "+ textTemplate);
+  winston.debug("parseText textTemplate: "+ textTemplate);
 
   return textTemplate;
 

package/template/email/assignedEmailMessage.html

@@ -5,7 +5,7 @@
 <head>
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>New message ticket from TileDesk</title>
+    <title>New message ticket from Tiledesk</title>
 
     <style type="text/css">
     img {

package/template/email/assignedRequest.html

@@ -5,7 +5,7 @@
 <head>
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>New chat from TileDesk</title>
+    <title>New chat from Tiledesk</title>
 
     <style type="text/css">
     img {

package/template/email/beenInvitedExistingUser.html

@@ -4,7 +4,7 @@
 <head>
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>New email from TileDesk</title>
+    <title>New email from Tiledesk</title>
 
     <style type="text/css">
       img {
@@ -100,13 +100,13 @@
 
                       <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                         <h2 style="text-align: center; letter-spacing: 1px; font-weight: 400; line-height:24px ">
-                          {{currentUserFirstname}} {{currentUserLastname}} has invited you to the TileDesk project <strong> {{projectName}}</strong> 
+                          {{currentUserFirstname}} {{currentUserLastname}} has invited you to the Tiledesk project <strong> {{projectName}}</strong> 
                         </h2>
 
                         <br> <br><strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">Hi {{invitedUserFirstname}} {{invitedUserLastname}},</strong>
                         
                         <br> <br>
-                        I invited you to take on the role of  {{invitedUserRole}} of the TileDesk <strong> {{projectName}}</strong> project
+                        I invited you to take on the role of  {{invitedUserRole}} of the Tiledesk <strong> {{projectName}}</strong> project
                     
 
                         <div style="text-align: center;">
@@ -116,7 +116,7 @@
                           </a>
                         </div>
 
-                        <br><br> Team TileDesk
+                        <br><br> The Tiledesk Team 
                       </td>
                     </tr>
                    

package/template/email/beenInvitedNewUser.html

@@ -118,7 +118,7 @@
                         </a> 
                         </div>
 
-                        <br><br> Team Tiledesk
+                        <br><br> The Tiledesk Team
                     </td>
                     </tr>
                 

package/template/email/emailDirect.html

@@ -4,7 +4,7 @@
   <head>
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>New Ticket from TileDesk</title>
+    <title>New Ticket from Tiledesk</title>
 
     <style type="text/css">
       img {

package/template/email/newMessage.html

@@ -4,7 +4,7 @@
 <head>
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>New message from TileDesk</title>
+    <title>New message from Tiledesk</title>
 
     <style type="text/css">
       img {

package/template/email/newMessageFollower.html

@@ -4,7 +4,7 @@
   <head>
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>New Ticket from TileDesk</title>
+    <title>New Ticket from Tiledesk</title>
 
     <style type="text/css">
       img {

package/template/email/passwordChanged.html

@@ -4,7 +4,7 @@
 <head>
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>New email from TileDesk</title>
+    <title>New email from Tiledesk</title>
 
     <style type="text/css">
         img {
@@ -106,11 +106,11 @@
                         <br> <br<strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">Hi {{userFirstname}} {{userLastname}},</strong>
                         
                         <br> <br>
-                        The password of your TileDesk account  {{to}} was just changed. 
+                        The password of your Tiledesk account  {{to}} was just changed. 
                         <br><br>If this was you, then you can safely ignore this email.
                         <br><br>If this wasn't you please contact <a href="mailto:info@tiledesk.com">our support team</a>
                     
-                        <br><br> Team TileDesk
+                        <br><br> The Tiledesk Team
                         </td>
                     </tr>
                     

package/template/email/pooledEmailMessage.html

@@ -5,7 +5,7 @@
 <head>
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>New message ticket from TileDesk</title>
+    <title>New message ticket from Tiledesk</title>
 
     <style type="text/css">
     img {

package/template/email/pooledRequest.html

@@ -4,7 +4,7 @@
 <head>
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>New pooled chat from TileDesk</title>
+    <title>New pooled chat from Tiledesk</title>
 
     <style type="text/css">
       img {

package/template/email/resetPassword.html

@@ -3,7 +3,7 @@
 <head>
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>New email from TileDesk</title>
+    <title>New email from Tiledesk</title>
 
     <style type="text/css">
       img {
@@ -102,7 +102,7 @@
                         <br> <br<strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">Hi {{userFirstname}} {{userLastname}},</strong>
                         
                         <br> <br>
-                        Seems like  you forgot your password for TileDesk. If this is true, click below to reset your password
+                        Seems like  you forgot your password for Tiledesk. If this is true, click below to reset your password
                         <div style="text-align: center;">
                           <br><br>
                           <a href="{{baseScope.baseUrl}}/#/resetpassword/{{resetPswRequestId}}" style=" background-color: #ff8574 !important; border: none; color: white; padding: 12px 30px; text-align: center; text-decoration: none; display: inline-block; font-size: 16px; font-weight: 600; letter-spacing: 1px; margin: 4px 2px; cursor: pointer;">
@@ -113,7 +113,7 @@
                         <br><br><span style="font-size:12px; ">If you're having trouble clicking the "Reset My Password" button, copy and paste the URL below into your web browser: </span>
                         <br>
                         <span style="color:#03a5e8; font-size:12px; ">{{baseScope.baseUrl}}/#/resetpassword/{{resetPswRequestId}}</span>
-                        <br><br> Team TileDesk
+                        <br><br> The Tiledesk Team
                       </td>
                     </tr>
                    

package/template/email/ticket.html

@@ -4,7 +4,7 @@
   <head>
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>New Ticket from TileDesk</title>
+    <title>New Ticket from Tiledesk</title>
 
     <style type="text/css">
       img {

package/template/email/verify.html

@@ -4,7 +4,7 @@
       <head>
         <meta name="viewport" content="width=device-width" />
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>New email from TileDesk</title>
+        <title>New email from Tiledesk</title>
     
         <style type="text/css">
           img {
@@ -109,11 +109,11 @@
                         <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
                           <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                             <strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">Hi {{savedUser.firstname}} {{savedUser.lastname}},</strong>
-                            <!-- <br> welcome on TileDesk.com. -->
-                            <br><br> Thank you for signin up with TileDesk.
+                            <!-- <br> welcome on Tiledesk.com. -->
+                            <br><br> Thank you for signin up with Tiledesk.
                             <br><br> To complete the setup, <span><a href="{{baseScope.baseUrl}}/#/verify/email/{{savedUser._id}}"> click here to verify your email address. </a> </span>
                             <br><br>Give us your feedback! We need your advice. Send an email to <a href="mailto:info@tiledesk.com">info@tiledesk.com</a>
-                            <br><br> Team TileDesk
+                            <br><br> The Tiledesk Team
                           </td>
                         </tr>