@tiledesk/tiledesk-server 2.2.39 → 2.3.1-8.1

package/channels/chat21/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-chat21-app",
   "description": "The Tiledesk Chat21 module",
-  "version": "1.1.4",
+  "version": "1.1.7",
   "private": false,
   "author": "Andrea Leo - Frontiere21 SRL",
   "license": "AGPL-3.0",
@@ -11,7 +11,7 @@
     "url": "https://github.com/Tiledesk/tiledesk-server"
   },
   "dependencies": {
-    "@chat21/chat21-node-sdk": "^1.1.4",
+    "@chat21/chat21-node-sdk": "^1.1.7",
     "winston": "^3.3.3",
     "firebase-admin": "^9.5.0"
   },

package/deploy.sh

@@ -1,3 +1,4 @@
+git pull
 npm version patch
 version=`node -e 'console.log(require("./package.json").version)'`
 echo "version $version"
@@ -8,3 +9,4 @@ if [ "$version" != "" ]; then
     git push --tags
     npm publish --access public
 fi
+git push

package/event/botEvent.js

@@ -123,7 +123,7 @@ messageEvent.on('message.create', function(message) {
             if (bot.type==="internal") {
                 botEvent.emit('bot.message.received.notify.internal', message);
                
-            }else {
+            }else {  //external 
                 if (bot.url) {
                     var botNotification = {bot: bot, message: message};
                     botEvent.emit('bot.message.received.notify.external', botNotification);

package/event/subscriptionEvent.js

@@ -0,0 +1,11 @@
+const EventEmitter = require('events');
+
+class SubscriptionEvent extends EventEmitter {}
+var winston = require('../config/winston');
+
+
+const subscriptionEvent = new SubscriptionEvent();
+
+
+
+module.exports = subscriptionEvent;

package/middleware/ipFilter.js

@@ -0,0 +1,220 @@
+const ipfilter = require('express-ipfilter').IpFilter
+var winston = require('../config/winston');
+var jwt = require('jsonwebtoken');
+
+
+var customDetection = function (req)  {
+    // const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;  
+    // const ip = (req.headers['x-forwarded-for'] || '').split(',').pop().trim() ||        //https://stackoverflow.com/questions/8107856/how-to-determine-a-users-ip-address-in-node
+    //   req.socket.remoteAddress
+  
+  
+    let ip = req.socket.remoteAddress;
+  
+      const xFor =  req.headers['x-forwarded-for'];
+      if (xFor ) {
+        const xForArr = xFor.split(',');
+        if (xForArr && xForArr.length>0) {
+          ip = xForArr.shift();
+        }
+      }
+      // const ip = 
+      // req.headers['x-forwarded-for']?.split(',').shift()
+      // || req.socket?.remoteAddress
+  
+    winston.info("standard ip: "+ip); // ip address of the user
+    return ip;
+}
+
+var getToken = function (headers) {
+  winston.debug("getToken",headers);
+  if (headers && headers.authorization) {
+    var parted = headers.authorization.split(' ');
+    if (parted.length === 2) {
+      return parted[1];
+    } else {
+      return null;
+    }
+  } else {
+    return null;
+  }
+};
+  
+
+class IPFilter {
+    
+
+    
+    constructor() {
+    }
+
+
+
+
+
+
+  
+  
+  
+projectIpFilter (req, res, next) {
+    var that = this;
+    // console.log("that", that)
+  
+    const nextIp = function(err) {
+      winston.debug("projectIpFilter next",err);
+    
+        if (err && err.name === "IpDeniedError") {
+          winston.info("IpDeniedError for projectIpFilter");
+          return res.status(401).json({ err: "error project ip filter" });
+          // next(err) 
+        } 
+    
+      next();
+    
+    }
+  
+  
+    if (!req.project) {
+      return next();
+    }
+    
+    var projectIpFilterEnabled = req.project.ipFilterEnabled;
+    winston.debug("project projectIpFilterEnabled: " +projectIpFilterEnabled)
+  
+    var projectIpFilter =  req.project.ipFilter
+    winston.debug("project ipFilter: " + projectIpFilter)
+    
+    if (projectIpFilterEnabled === true && projectIpFilter && projectIpFilter.length > 0) {
+      winston.debug("filtering project IpFilter with ", projectIpFilter );
+      var ip = ipfilter(projectIpFilter, { detectIp: customDetection, mode: 'allow' })
+      // var ip = ipfilter(projectIpFilter, { mode: 'allow' })
+       ip(req, res, nextIp);
+    } else {
+      next();
+    }
+  
+  }
+  
+   projectIpFilterDeny (req, res, next) {
+  
+    const nextIp = function(err) {
+      winston.debug("projectIpFilter next",err);
+    
+        if (err && err.name === "IpDeniedError") {
+          winston.info("IpDeniedError for projectIpFilterDeny");
+          return res.status(401).json({ err: "error project deny ip filter" });
+          // next(err) 
+        } 
+    
+      next();
+    
+    }
+  
+    if (!req.project) {
+      return next();
+    }
+    
+    var projectIpFilterDenyEnabled = req.project.ipFilterDenyEnabled;
+    winston.debug("project projectIpFilterDenyEnabled: " +projectIpFilterDenyEnabled)
+  
+    var projectIpFilterDeny =  req.project.ipFilterDeny
+    winston.debug("project IpFilterDeny: " + projectIpFilterDeny)
+  
+  
+    if (projectIpFilterDenyEnabled === true && projectIpFilterDeny && projectIpFilterDeny.length > 0) {
+      winston.debug("filtering project projectIpFilterDeny with ", projectIpFilterDeny );
+      var ip = ipfilter(projectIpFilterDeny, { detectIp: customDetection, mode: 'deny' })
+      ip(req, res, nextIp);
+    } else {
+      next();
+    }
+  
+  }
+  
+  
+  
+projectBanUserFilter(req, res, next) {
+  
+  winston.debug("projectBanUserFilter hereee*********** ")
+
+    const nextIp = function(err) {
+      winston.debug("projectBanUserFilter next",err);
+    
+        if (err && err.name === "IpDeniedError") {
+          winston.info("IpDeniedError for projectBanUserFilter");
+          return res.status(401).json({ err: "error projectBanUserFilter" });
+          // next(err) 
+        } 
+    
+      next();
+    
+    }
+  
+    if (!req.project) {
+      return next();
+    }
+    
+    var bannedUsers =  req.project.bannedUsers
+    winston.debug("project bannedUsers: " + bannedUsers)
+  
+    if (bannedUsers && bannedUsers.length > 0) {
+  
+      let bannedUsersArr = [];
+      let bannedUsersIdUserArr = [];
+      for (var i =0; i < bannedUsers.length; i++) {
+        bannedUsersArr.push(bannedUsers[i].ip);
+        bannedUsersIdUserArr.push(bannedUsers[i].id);
+      }
+    
+      winston.debug("project req.preDecodedJwt: ", req.preDecodedJwt)
+      // winston.debug("project req.preDecodedJwt._id: "+ req.preDecodedJwt._id)
+
+
+      if (req.preDecodedJwt && req.preDecodedJwt._id && bannedUsersIdUserArr.indexOf(req.preDecodedJwt._id) > -1) {
+        winston.info("filtering project bannedUsers with id: " + req.preDecodedJwt._id)
+        return res.status(401).json({ err: "error projectBanUserFilter by id" });
+      }
+
+
+      // winston.debug("filtering project bannedUsers with ", bannedUsersArr );
+      // var ip = ipfilter(bannedUsersArr, { detectIp: customDetection, mode: 'deny' })
+      // ip(req, res, nextIp);
+      next();
+    } else {
+      next();
+    }
+  
+  }
+  
+  
+
+  
+
+  decodeJwt(req, res, next) {
+  
+    let token = getToken(req.headers);
+    winston.debug("filtering token " + token); 
+
+    if (token) {
+
+      try {
+        var decoded = jwt.decode(token);
+        winston.debug("filtering decoded ", decoded);
+        req.preDecodedJwt = decoded;
+      }catch(e) {
+        winston.debug("Error decoding jwt");
+      }
+     
+    }
+   
+    
+    next();
+  }
+  
+  
+
+
+  
+}
+var iPFilter = new IPFilter();
+module.exports = iPFilter;

package/middleware/passport.js

@@ -77,15 +77,24 @@ module.exports = function(passport) {
               // winston.info("secretOrKeyProvider: "+request.project.name );
               // winston.info("secretOrKeyProvider: "+rawJwtToken );
               
-              var decoded = jwt.decode(rawJwtToken);
+              var decoded = request.preDecodedJwt
               winston.debug("decoded: ", decoded );
+              if (!decoded) { //fallback
+                winston.debug("load decoded after: ");
+                decoded = jwt.decode(rawJwtToken);
+              }
+              
+              winston.debug("decoded after: ", decoded );
 
               // qui arriva questo 
               // decoded:  {"_id":"5ce3ee855c520200176c189e","updatedAt":"2019-05-31T09:50:22.949Z","createdAt":"2019-05-21T12:26:45.192Z","name":"botext","url":"https://tiledesk-v2-simple--andrealeo83.repl.co","id_project":"5ce3d1ceb25ad30017274bc5","trashed":false,"createdBy":"5ce3d1c7b25ad30017274bc2","__v":0,"external":true,"iat":1559297130,"aud":"https://tiledesk.com","iss":"https://tiledesk.com","sub":"5ce3ee855c520200176c189e@tiledesk.com/bot"}
 
-              winston.debug("decoded.aud: "+ decoded.aud );
 
               if (decoded && decoded.aud) {
+
+                winston.debug("decoded.aud: "+ decoded.aud );
+
+                
                 const audUrl  = new URL(decoded.aud);
                 winston.debug("audUrl: "+ audUrl );
                 const path = audUrl.pathname;

package/models/lead.js

@@ -96,6 +96,8 @@ var LeadSchema = new Schema({
 LeadSchema.index({fullname: 'text', email: 'text'},
  {"name":"lead_fulltext","default_language": defaultFullTextLanguage,"language_override": "dummy"}); // schema level
 
+  // suggested by atlas
+LeadSchema.index({status: 1, id_project: 1, createdAt: -1});
 
  var lead = mongoose.model('lead', LeadSchema);
 

package/models/project.js

@@ -111,6 +111,16 @@ var ProjectSchema = new Schema({
   ipFilter: [{
     type: String
   }],
+  ipFilterDenyEnabled:{
+    type: Boolean,
+    default: false
+  },
+  ipFilterDeny: [{
+    type: String
+  }],
+  bannedUsers: [{
+     id: String, ip: String
+  }],
   // defaultLanguage: {
   //   type: String,
   //   required: true,

package/models/project_user.js

@@ -37,6 +37,9 @@ var TagSchema = require("../models/tag");
       index: true
       // required: true
     },
+    profileStatus: {
+      type: String,
+    },
     presence: PresenceSchema,
     attributes: {
       type: Object,
@@ -108,5 +111,6 @@ Project_userSchema.virtual('isAuthenticated').get(function () {
   // Project_user.find({ id_project: projectid, id_user: { $in : group[0].members}, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.AGENT]} })
   Project_userSchema.index({ id_project: 1, id_user:1, role: 1 }); 
 
+ 
   module.exports = mongoose.model('project_user', Project_userSchema);;
 

package/models/request.js

@@ -58,7 +58,7 @@ var RequestSchema = new Schema({
     type: Schema.Types.ObjectId,
     ref: 'project_user',
     required: false, //ENABLEIT,
-    index: true
+    // index: true //unused
   },
 
 
@@ -100,7 +100,7 @@ var RequestSchema = new Schema({
     type: Number,
     required: false,
     default: RequestConstants.UNASSIGNED,
-    index: true
+    // index: true //unused
   }, 
 
 
@@ -134,17 +134,20 @@ var RequestSchema = new Schema({
     index: true,
     default: "medium" //translate on client side
   },
-  
+
+  followers: [{ 
+    type: Schema.Types.ObjectId, 
+    ref: 'project_user' }],
 
   participantsAgents: {  
     type: Array,
     required: false,
-    index: true,
+    // index: true, //i think unused
   },
   participantsBots: {  
     type: Array,
     required: false,
-    index: true,
+    // index: true, //i think unused
   },
   department: {
     type: Schema.Types.ObjectId,
@@ -161,20 +164,20 @@ var RequestSchema = new Schema({
   // First reply time is the time between ticket creation and the first public comment from an agent, displayed in minutes. Some qualifications include:
   first_response_at: {
     type: Date,
-    index: true
+    // index: true // unused
   },
 
   //timestamp when the agent reply the first time to a visitor
   assigned_at: {
     type: Date,
-    index: true
+    // index: true //unused
   },
 
   // Wait Time (Average and Longest): The average and longest times visitors have been waiting for their chats to be served.
   // Wait time is calculated as duration between the first visitor message in the chat and the first agent message. Wait time will be 0 for agent initiated or trigger initiated chats.
   waiting_time: {
     type: Number,
-    index: true
+    // index: true // why?
   },
 
 
@@ -187,9 +190,12 @@ var RequestSchema = new Schema({
   //   default: 0
   // },
 
-  closed_at: {
+  closed_at: { 
     type: Date
   },
+  closed_by: { 
+    type: String
+  },
 
   tags: [TagSchema],
 
@@ -205,7 +211,11 @@ var RequestSchema = new Schema({
   }, 
   snapshot: {
     type: RequestSnapshotSchema,
-    select: true
+    select: true,
+    //index: false,
+    // includeIndices: false,
+    excludeIndexes: true //testa bene
+
     // select: false
   }, 
 
@@ -254,13 +264,25 @@ var RequestSchema = new Schema({
     required: false
   },
   location: LocationSchema,
-  
+  auto_close: {
+    type: Number,
+    index: true
+  },
   id_project: {
     type: String,
     required: true,
     index: true
   },
-
+  smartAssignment: {
+    type: Boolean,
+    default: true,
+    index: true
+  },
+  workingStatus: { //new, pending
+    type: String,
+    required: false,
+    index: true
+  },
   createdBy: {
     type: String,
     required: true
@@ -434,8 +456,24 @@ RequestSchema.index({ id_project: 1, preflight:1, updatedAt: -1 }); // used quer
 
 RequestSchema.index({ hasBot: 1, createdAt: 1 }); // suggested by atlas
 
+// suggested by atlas
+RequestSchema.index({ lead: 1, id_project: 1, participants: 1, preflight: 1, createdAt: -1 });
+// suggested by atlas
+RequestSchema.index({ lead: 1, id_project: 1, preflight: 1, createdAt: -1 });
+
+// suggested by atlas
+RequestSchema.index({ lead: 1, "snapshot.agents.id_user": 1, id_project: 1, preflight: 1, createdAt: -1 });
+
+// suggested by atlas
 RequestSchema.index({ id_project: 1, ticket_id: 1 });
 
+// suggested by atlas
+RequestSchema.index({ id_project: 1, createdAt: 1, preflight: 1});
+
+//suggested by atlas profiler. Used by auto closing requests
+RequestSchema.index({ hasBot: 1, status: 1, createdAt: 1});
+
+
 
 
 //   cannot index parallel arrays [agents] [participants] {"driv

package/models/subscriptionLog.js

@@ -0,0 +1,34 @@
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+
+
+
+var SubscriptionLogSchema = new Schema({
+  event: {
+    type: String,
+    required: true
+  },
+  target: {
+    type: String,
+    required: true
+  },
+  response: {
+    type: String,
+  },
+  body: {
+    type: String,
+  },
+  err: {
+    type: String,
+  },
+  id_project: {
+    type: String,
+    required: true,
+     index:true
+  }
+}, {
+    timestamps: true
+  }
+);
+
+module.exports = mongoose.model('subscriptionLog', SubscriptionLogSchema);

package/models/tagLibrary.js

@@ -0,0 +1,42 @@
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+var TagSchema = require('./tag');
+
+
+
+var TagLibrarySchema = new Schema({
+  ...TagSchema.obj,
+  // tag: {
+  //   type: String,
+  //   required: true,
+  //   index: true
+  // },  
+  // color: {
+  //   type: String,
+  //   required: false,
+  //   index: false
+  // },  
+  // attributes: {
+  //   type: Object,
+  // },
+  id_project: {
+    type: String,
+    required: true,
+    index: true
+  },
+  createdBy: {
+    type: String,
+    required: true
+  }
+},{
+  timestamps: true
+}
+);
+
+TagLibrarySchema.index({ id_project: 1, tag: 1 }, { unique: true }); 
+
+
+ var Tag = mongoose.model('tag', TagLibrarySchema);
+
+
+module.exports = Tag;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.2.39",
+  "version": "2.3.18.1",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -29,29 +29,22 @@
     "tiledesk-server": "./bin/www"
   },
   "optionalDependencies": {
-    "@tiledesk-ent/tiledesk-server-activities": "^1.1.18",
-    "@tiledesk-ent/tiledesk-server-analytics": "^1.1.12",
     "@tiledesk-ent/tiledesk-server-cache": "^1.1.10",
-    "@tiledesk-ent/tiledesk-server-canned": "^1.1.2",
-    "@tiledesk-ent/tiledesk-server-departments": "^1.1.3",
     "@tiledesk-ent/tiledesk-server-dialogflow": "^1.1.6",
-    "@tiledesk-ent/tiledesk-server-groups": "^1.1.3",
     "@tiledesk-ent/tiledesk-server-jwthistory": "^1.1.9",
-    "@tiledesk-ent/tiledesk-server-mt": "^1.1.8",
     "@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",
     "@tiledesk-ent/tiledesk-server-routing-queue": "^1.1.11",
-    "@tiledesk-ent/tiledesk-server-tags": "^1.1.2",
-    "@tiledesk-ent/tiledesk-server-triggers": "^1.1.82",
     "@tiledesk-ent/tiledesk-server-visitorcounter": "^1.1.1",
     "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"
   },
   "dependencies": {
-    "@tiledesk/tiledesk-chat21-app": "^1.1.4",
+    "@tiledesk/tiledesk-chat21-app": "^1.1.7",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
-    "@tiledesk/tiledesk-rasa-connector": "^1.0.5",
+    "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
+    "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.10",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.20.0",
@@ -94,6 +87,7 @@
     "passport": "^0.4.1",
     "passport-http": "^0.3.0",
     "passport-jwt": "^4.0.0",
+    "pdfmake": "^0.2.5",
     "promise-events": "^0.2.4",
     "request": "^2.88.2",
     "request-promise": "^4.2.6",