@tiledesk/tiledesk-server 2.2.26 → 2.2.28

package/CHANGELOG.md

@@ -4,6 +4,12 @@
 - Added tag field to the project_user
 - Removed default BCC from email
 - BugFix: Avoid cluster concurrent jobs in multiple nodes
+- Faq template now support blank and example
+- Organizzation support added
+- ipFilter related to the project is now supported
+
+# 2.2.26
+- Tag fix for 2.2.25
 
 # 2.2.25
 - New label prechat form

package/README.md

@@ -90,3 +90,4 @@ To see how to upgrade tiledesk-server see [here](./docs/upgrading.md)
 # Testing
 Run unit test with `npm test` and integration test with `npm run test:int` 
 
+

package/app.js

@@ -96,6 +96,7 @@ var faqpub = require('./routes/faqpub');
 var labels = require('./routes/labels');
 var fetchLabels = require('./middleware/fetchLabels');
 var cacheUtil = require("./utils/cacheUtil");
+var orgUtil = require("./utils/orgUtil");
 var images = require('./routes/images');
 var files = require('./routes/files');
 var campaigns = require('./routes/campaigns');
@@ -128,6 +129,10 @@ var pubModulesManager = require('./pubmodules/pubModulesManager');
 var channelManager = require('./channels/channelManager');
 channelManager.listen(); 
 
+const ipfilter = require('express-ipfilter').IpFilter
+// const IpDeniedError = require('express-ipfilter').IpDeniedError;
+
+
 var modulesManager = undefined;
 try {
   modulesManager = require('./services/modulesManager');
@@ -233,7 +238,10 @@ if (process.env.ROUTELOGGER_ENABLED==="true") {
 
       var fullUrl = req.protocol + '://' + req.get('host') + req.originalUrl;
       winston.debug("fullUrl:"+ fullUrl);
+      winston.debug(" req.get('host'):"+  req.get('host'));
+     
       winston.debug("req.get('origin'):" + req.get('origin'));
+      winston.debug("req.get('referer'):" + req.get('referer'));
 
       var routerLogger = new RouterLogger({
         origin: req.get('origin'),
@@ -291,7 +299,7 @@ var projectSetter = function (req, res, next) {
       if (err) {
         winston.warn("Problem getting project with id: " + projectid + " req.originalUrl:  " + req.originalUrl);
       }
-  
+
       winston.debug("projectSetter project:" + project);
       if (!project) {
         winston.warn("ProjectSetter project not found with id: " + projectid);
@@ -311,6 +319,53 @@ var projectSetter = function (req, res, next) {
 }
 
 
+function customDetection (req)  {
+  const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
+  winston.info("standard ip: "+ip); // ip address of the user
+  return ip;
+}
+
+
+var projectIpFilter = function (req, res, next) {
+  // var projectIpFilter = function (err, req, res, next) {
+
+    // var ip = require('ip');
+    // winston.info("projectIpFilter ip2: " + ip.address() );
+
+
+    const nextIp = function(err) {
+      winston.info("projectIpFilter next",err);
+
+        if (err && err.name === "IpDeniedError") {
+          winston.info("IpDeniedError");
+          return res.status(401).json({ err: "error project ip filter" });
+          // next(err) 
+        } 
+
+      next();
+
+  }
+
+
+  if (!req.project) {
+    return next();
+  }
+  
+  var projectIpFilterEnabled = req.project.ipFilterEnabled;
+  winston.info("project projectIpFilterEnabled: " +projectIpFilterEnabled)
+
+  var projectIpFilter =  req.project.ipFilter
+  winston.info("project ipFilter: " + projectIpFilter)
+  
+  if (projectIpFilterEnabled === true && projectIpFilter && projectIpFilter.length > 0) {
+    var ip = ipfilter(projectIpFilter, { detectIp: customDetection, mode: 'allow' })
+    // var ip = ipfilter(projectIpFilter, { mode: 'allow' })
+    ip(req, res, nextIp);
+  } else {
+    next();
+  }
+
+}
 
 
 
@@ -322,6 +377,7 @@ var projectSetter = function (req, res, next) {
 // app.post('/oauth/token', oauth2.token);
 
 
+// const ips = ['::1'];
 
 app.use('/auth', auth);
 app.use('/testauth', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], authtest);
@@ -355,7 +411,7 @@ if (modulesManager) {
 }
 
 
-app.use('/:projectid/', [projectIdSetter, projectSetter]);
+app.use('/:projectid/', [projectIdSetter, projectSetter, projectIpFilter]);
 
 
 app.use('/:projectid/authtestWithRoleCheck', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], authtestWithRoleCheck);
@@ -447,8 +503,22 @@ app.use(function (err, req, res, next) {
 });*/
 
 
+
+
+
+
+
+
+
 // error handler
 app.use((err, req, res, next) => {
+
+  winston.info("err.name", err.name)
+  if (err.name === "IpDeniedError") {
+    winston.info("IpDeniedError");
+    return res.status(401).json({ err: "error ip filter" });
+  } 
+
   winston.error("General error", err);
   return res.status(500).json({ err: "error" });
 });

package/bin/www

@@ -32,7 +32,10 @@ webSocketServer.init(httpServer);
  * Listen on provided port, on all network interfaces.
  */
 
-var listener = httpServer.listen(port,function(){
+// use ipv4 or ipv6 https://stackoverflow.com/questions/50855419/get-only-ipv4-ips-via-nodejs-express
+// var listener = httpServer.listen(port,'0.0.0.0', function(){      
+
+var listener = httpServer.listen(port, function(){      
     console.log('Listening tiledesk-server ver:'+version+' on port ' + listener.address().port); //Listening on port 8888
 });
 

package/config/global.js

@@ -1,3 +1,5 @@
 module.exports = {
   'apiUrl':'http://localhost:3000',
+  'organizationBaseUrl' : 'org.local',
+  'organizationEnabled' : false
 };

package/models/project.js

@@ -101,6 +101,16 @@ var ProjectSchema = new Schema({
       return [new Channel({ name: 'chat21' })];
     }
   },
+  organization: {
+    type: String,
+  },
+  ipFilterEnabled:{
+    type: Boolean,
+    default: false
+  },
+  ipFilter: [{
+    type: String
+  }],
   // defaultLanguage: {
   //   type: String,
   //   required: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.2.26",
+  "version": "2.2.28",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -38,7 +38,7 @@
     "@tiledesk-ent/tiledesk-server-groups": "^1.1.2",
     "@tiledesk-ent/tiledesk-server-jwthistory": "^1.1.9",
     "@tiledesk-ent/tiledesk-server-mt": "^1.1.7",
-    "@tiledesk-ent/tiledesk-server-payments": "^1.1.5",
+    "@tiledesk-ent/tiledesk-server-payments": "^1.1.6",
     "@tiledesk-ent/tiledesk-server-queue": "^1.1.11",
     "@tiledesk-ent/tiledesk-server-request-history": "^1.1.5",
     "@tiledesk-ent/tiledesk-server-resthook": "^1.1.53",
@@ -61,6 +61,7 @@
     "email-templates": "^8.0.8",
     "eventemitter2": "^6.4.4",
     "express": "~4.17.1",
+    "express-ipfilter": "^1.2.0",
     "express-session": "^1.17.2",
     "express-validator": "^6.12.1",
     "fast-csv": "^4.3.6",

package/pubmodules/rules/conciergeBot.js

@@ -70,8 +70,11 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
                         //TESTA QUESTO
 
                                 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) { 
+                                
+                                winston.debug("message.request.hasBot: "+message.request.hasBot);
+                                // winston.info("message.request.department.id_bot: "+message.request.department.id_bot);
+                                if (message.request.status === 50 &&  message.request.hasBot === false) { 
+                                    // 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)

package/routes/labels.js

@@ -27,6 +27,8 @@ router.get('/default', function (req, res) {
 });
 // curl -v -X POST -H 'Content-Type:application/json'  -d '{"lang":"IT"}' http://localhost:3000/123/labels/default/clone
 
+// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@f21.it:123456 -d '{"lang":"IT"}' http://localhost:3001/624c78e27b91d2a2ab49543a/labels/default/clone
+
 router.post('/default/clone', 
   [
     passport.authenticate(['basic', 'jwt'], { session: false }), 

package/routes/project.js

@@ -15,6 +15,7 @@ require('../middleware/passport')(passport);
 var validtoken = require('../middleware/valid-token')
 var RoleConstants = require("../models/roleConstants");
 var cacheUtil = require('../utils/cacheUtil');
+var orgUtil = require("../utils/orgUtil");
 
 router.put('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], function (req, res) {
   winston.debug('UPDATE PROJECT REQ BODY ', req.body);
@@ -151,6 +152,15 @@ router.put('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: fa
   if (req.body.channels!=undefined) {
     update.channels = req.body.channels; 
   }
+
+  if (req.body.ipFilterEnabled!=undefined) {
+    update.ipFilterEnabled = req.body.ipFilterEnabled;
+  }
+
+  if (req.body.ipFilter!=undefined) {
+    update.ipFilter = req.body.ipFilter;
+  }
+
   
   // if (req.body.defaultLanguage!=undefined) {
   //   update.defaultLanguage = req.body.defaultLanguage; 
@@ -291,6 +301,13 @@ router.patch('/:projectid', [passport.authenticate(['basic', 'jwt'], { session:
     update.channels = req.body.channels; 
   }
   
+  if (req.body.ipFilterEnabled!=undefined) {
+    update.ipFilterEnabled = req.body.ipFilterEnabled;
+  }
+
+  if (req.body.ipFilter!=undefined) {
+    update.ipFilter = req.body.ipFilter;
+  }
     
   // if (req.body.defaultLanguage!=undefined) {
   //   update.defaultLanguage = req.body.defaultLanguage; 
@@ -362,6 +379,61 @@ router.get('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
         return res.status(500).send({ success: false, msg: 'Error getting object.' });
       }       
 
+
+
+      //organization: if third sub domain iterate and put only project with organization==subdomain otherwise remove projects with org
+      winston.info("orgUtil.ORGANIZATION_ENABLED: " + orgUtil.ORGANIZATION_ENABLED);
+      if (orgUtil.ORGANIZATION_ENABLED == true ) {
+
+              // winston.info("project_users", project_users);
+        winston.info("project_users.length:"+ project_users.length);
+
+        let org = orgUtil.getOrg(req);
+        winston.info("org:"+ org);
+        
+        if (org!=undefined) {
+          winston.info("org!=undefined");
+
+          var project_users = project_users.filter(function (projectUser) {
+            if (projectUser.id_project.organization && projectUser.id_project.organization === org ) {
+              winston.info("keep");
+              return true;
+            }
+          });
+
+        /* for (var i = 0; i < project_users.length; i++) { 
+            winston.info("project_users[i].id_project.organization: " + project_users[i].id_project.organization);
+            if (project_users[i].id_project.organization && project_users[i].id_project.organization === org ) {
+              //keep
+              winston.info("keep");
+            } else {
+              // project_users.splice(i, 1); // 2nd parameter means remove one item only
+              winston.info("splice");
+            }
+          }*/
+        } else {
+
+            var project_users = project_users.filter(function (projectUser) {
+              if (projectUser.id_project.organization == undefined ) {
+                // winston.info("keep");
+                return true;
+              }
+            });        
+          
+
+          /*
+          for (var i = 0; i < project_users.length; i++) { 
+            winston.info("project_users[i].id_project.organization: " + project_users[i].id_project.organization);
+            if (project_users[i].id_project.organization) {
+              project_users.splice(i, 1); // 2nd parameter means remove one item only
+            }
+          }*/
+        }
+      } else {
+        winston.info("no")
+      }
+
+
       project_users.sort((a, b) => (a.id_project && b.id_project && a.id_project.updatedAt > b.id_project.updatedAt) ? 1 : -1)
       project_users.reverse(); 
       res.json(project_users);

package/routes/request.js

@@ -693,6 +693,10 @@ router.get('/', function (req, res, next) {
     query.location = req.query.location;
   }
 
+  if (req.query.ticket_id) {
+    query.ticket_id = req.query.ticket_id;
+  }
+
   // if (req.query.request_id) {
   //   console.log('req.query.request_id', req.query.request_id);
   //   query.request_id = req.query.request_id;
@@ -798,6 +802,17 @@ router.get('/', function (req, res, next) {
     winston.debug('REQUEST ROUTE - QUERY snap_department_id_bot_exists', query.snap_department_id_bot_exists);
   }
 
+  if (req.query.snap_lead_lead_id) {
+    query["snapshot.lead.lead_id"] = req.query.snap_lead_lead_id;
+    winston.debug('REQUEST ROUTE - QUERY snap_lead_lead_id', query.snap_lead_lead_id);
+  }
+
+  if (req.query.channel) {
+    query["channel.name"] =  req.query.channel
+    winston.debug('REQUEST ROUTE - QUERY channel', query.channel);
+  }
+
+
   var direction = -1; //-1 descending , 1 ascending
   if (req.query.direction) {
     direction = req.query.direction;

package/routes/user-request.js

@@ -4,6 +4,7 @@ var Request = require("../models/request");
 var winston = require('../config/winston');
 const requestEvent = require('../event/requestEvent');
 const { check, validationResult } = require('express-validator');
+var requestService = require('../services/requestService');
 
 
 router.patch('/:requestid/rating', function (req, res) {
@@ -54,5 +55,19 @@ router.patch('/:requestid/rating', function (req, res) {
 });
 
 
+router.put('/:requestid/closeg', function (req, res) {
+  winston.debug(req.body);
+  
+  // closeRequestByRequestId(request_id, id_project)
+  return requestService.closeRequestByRequestId(req.params.requestid, req.projectid).then(function(closedRequest) {
+
+      winston.verbose("request closed", closedRequest);
+
+        return res.json(closedRequest);
+      
+  });
+
+
+});
 
 module.exports = router;

package/utils/orgUtil.js

@@ -0,0 +1,74 @@
+
+
+'use strict';
+var global = require('../config/global');
+var email = require('../config/email');
+var winston = require('../config/winston');
+
+
+
+
+class OrgUtil {
+
+    constructor() {
+        this.ORGANIZATION_ENABLED = process.env.ORGANIZATION_ENABLED || global.organizationEnabled;
+        if (this.ORGANIZATION_ENABLED===true || this.ORGANIZATION_ENABLED === "true") {
+            this.ORGANIZATION_ENABLED = true;
+        }else {
+            this.ORGANIZATION_ENABLED = false;
+        }
+
+        winston.info("Organization enabled: "+ this.ORGANIZATION_ENABLED );
+
+        this.ORGANIZATION_BASE_URL = process.env.ORGANIZATION_BASE_URL || global.organizationBaseUrl;
+        winston.info("Organization base url: "+ this.ORGANIZATION_BASE_URL );
+
+    }
+
+    getOrg(req) {
+
+        // if (this.ORGANIZATION_ENABLED===false) {
+        //     return undefined;
+        // }
+
+
+        // let host = req.get('host');
+        // winston.info("host: "+ host );
+
+        let origin = req.get('origin');
+        winston.info("origin: "+ origin );
+
+        // winston.info("email: " + email.baseUrl);
+        winston.info("this.ORGANIZATION_BASE_URL: " + this.ORGANIZATION_BASE_URL); 
+        // global.organizationBaseUrl
+        // if (host !=email.baseUrl ) {
+        if (origin && origin.indexOf(this.ORGANIZATION_BASE_URL)>-1) {
+        // if (origin!=this.ORGANIZATION_BASE_URL) {
+            // winston.info("host found: "+ host );
+            // return host;
+            winston.info("origin found: "+ origin );
+            return origin;
+        }
+        winston.info("origin not found: "+ origin );
+        
+        // winston.info("host not found: "+ host );
+        // if (host.indexOf("localhost1")>-1) {
+        //     console.log("host found: "+ host );
+        //     return "localhost";
+        // }
+        return undefined;
+     
+    }
+
+   
+
+
+      
+  
+}
+
+
+var orgUtil = new OrgUtil();
+
+
+module.exports = orgUtil;