@tiledesk/tiledesk-server 2.2.28 → 2.2.31

package/CHANGELOG.md

@@ -1,5 +1,25 @@
-# untagged
-- Operator.select returns context object that contains the temp request..TEST IT
+
+
+
+# 2.2.31 (compatible with: Dashboard 2.2.37, Widget 5.0.25)
+- Fix email template reading from project.
+- Added transcript webpage for users without system messages
+- Fix export messages to csv
+- Fix ip address resolver
+- Exclude poweredBy field from widget endpoint
+- Bugfix when a conversation has a first_text with \agent
+- Added rasa chatbot chatbot type 
+- Added visitor email and fullname in the fulltext index 
+
+# 2.2.30 -> PROD 
+- Log fix
+
+# 2.2.29 
+- Added endpoint to find requests created by users and guests
+- Log fix
+
+# 2.2.28 (compatible with dasboard ver. 2.2.36)
+- Operator.select returns context object that contains the temp request
 - Added Serbian language to the widget
 - Added tag field to the project_user
 - Removed default BCC from email
@@ -7,15 +27,22 @@
 - Faq template now support blank and example
 - Organizzation support added
 - ipFilter related to the project is now supported
+- Added filter channel name for the request
+- Added edit card for payment
+- Fix concierge concierge bot for department selection
+- Added filter to find a request by ticket_id
+- Added filter to snap_lead_lead_id for request
+- Added endpoint to close a request by guest
+
 
-# 2.2.26
+# 2.2.26 (compatible with dasboard ver. 2.2.35)
 - Tag fix for 2.2.25
 
 # 2.2.25
 - New label prechat form
 - Updated mongodb-runner from 4.8.1 to 4.8.3 to fix ssh key error
 
-# 2.2.24 -> PROD
+# 2.2.24 
 - webhook subscription can fetch temmates endpoint
 - Added hasBot and createdAt index to the request model
 

package/app.js

@@ -320,7 +320,10 @@ var projectSetter = function (req, res, next) {
 
 
 function customDetection (req)  {
-  const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
+  // 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
+
   winston.info("standard ip: "+ip); // ip address of the user
   return ip;
 }
@@ -352,10 +355,10 @@ var projectIpFilter = function (req, res, next) {
   }
   
   var projectIpFilterEnabled = req.project.ipFilterEnabled;
-  winston.info("project projectIpFilterEnabled: " +projectIpFilterEnabled)
+  winston.debug("project projectIpFilterEnabled: " +projectIpFilterEnabled)
 
   var projectIpFilter =  req.project.ipFilter
-  winston.info("project ipFilter: " + projectIpFilter)
+  winston.debug("project ipFilter: " + projectIpFilter)
   
   if (projectIpFilterEnabled === true && projectIpFilter && projectIpFilter.length > 0) {
     var ip = ipfilter(projectIpFilter, { detectIp: customDetection, mode: 'allow' })

package/models/request.js

@@ -254,6 +254,7 @@ var RequestSchema = new Schema({
     required: false
   },
   location: LocationSchema,
+  
   id_project: {
     type: String,
     required: true,
@@ -417,7 +418,9 @@ RequestSchema.index({ id_project: 1, request_id: 1 }
 // https://docs.mongodb.com/manual/reference/text-search-languages/#text-search-languages
 
 //TODO cambiare dummy con language? attento che il codice deve essere compatibile
-RequestSchema.index({transcript: 'text', rating_message: 'text', subject: 'text', "tags.tag": 'text', "notes.text": 'text'},  
+
+
+RequestSchema.index({transcript: 'text', rating_message: 'text', subject: 'text', "tags.tag": 'text', "notes.text": 'text', "snapshot.lead.email": 'text', "snapshot.lead.fullname": 'text' },  
  {"name":"request_fulltext","default_language": defaultFullTextLanguage,"language_override": "dummy"}); // schema level
 
 //  let query = {id_project: operatorSelectedEvent.id_project, participants: { $exists: true, $ne: [] }};
@@ -431,6 +434,9 @@ RequestSchema.index({ id_project: 1, preflight:1, updatedAt: -1 }); // used quer
 
 RequestSchema.index({ hasBot: 1, createdAt: 1 }); // suggested by atlas
 
+RequestSchema.index({ id_project: 1, ticket_id: 1 });
+
+
 
 //   cannot index parallel arrays [agents] [participants] {"driv
 // RequestSchema.index({ id_project: 1, status: 1, preflight:1, participants:1, "agents.id_user":1, updatedAt: -1 }); //NN LO APPLICA

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.2.28",
+  "version": "2.2.31",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/publiccode.yml

@@ -0,0 +1,110 @@
+# This repository adheres to the publiccode.yml standard by including this 
+# metadata file that makes public software easily discoverable.
+# More info at https://github.com/italia/publiccode.yml
+
+publiccodeYmlVersion: '0.2'
+categories:
+  - customer-service-and-support
+  - communications
+  - marketing
+  - mobile-marketing
+description:
+  it:
+    apiDocumentation: 'https://developer.tiledesk.com/apis/rest-api'
+    documentation: 'https://gethelp.tiledesk.com'
+    features:
+      - live chat widget
+      - chatbot
+      - 'integration with DialogFlow, Rasa and all major AI solutions'
+      - ticketing
+      - multi-project management
+      - SLAs setting
+      - 'smart assignment of the queues '
+      - seamless conversation
+      - dashboard
+      - knowledge base
+      - mobile apps
+    genericName: Live chat with integrated chatbots
+    longDescription: |
+      To have fully satisfied customers is complex. Conversation’s actors
+      (chatbots and humans) should handoff to each other many times during a
+      chat to address customers needs. 
+
+
+      Tiledesk provides a solution **orchestrating instant, asynchronous and
+      multichannel communication among all stakeholders of a typical
+      conversational architecture**: chatbots, support operators, end users,
+      colleagues, applications, etc.  
+
+
+      **Main Features**: 
+
+
+      - Live Chat Widget with full multichannel experience on Web and Mobile; 
+
+      - Resolution Bot to automate customer support; 
+
+      - Easy Integration with all major AI-platforms, cloud and Open source,
+      from DialogFlow to RASA; 
+
+      - Ticketing Management system fully integrated into the platform and
+      instant conversation flow; 
+
+      - Team Organization with multi-project management, SLAs setting, smart
+      assignment of the 
+       queues, departments organization and much more; 
+      - Seamless conversation to “jump” between different channels in a
+      transparent way for end 
+       customers and agents; 
+      - Chat Tools like typing indicator, off-line access, delivery receipts,
+      contact list and much more; 
+
+      - Dashboard with real time analytics; 
+
+      - Knowledge base.
+
+           
+
+      Tiledesk is an **open source **project, made with passion in Salento
+      (Southern Italy).
+    shortDescription: |-
+      Tiledesk delivers scalable customer service to your mobile apps and your
+      website. It is a conversational platform that connects chatbots and
+      humans 
+developmentStatus: stable
+it:
+  conforme:
+    gdpr: false
+    lineeGuidaDesign: false
+    misureMinimeSicurezza: false
+    modelloInteroperabilita: false
+  countryExtensionVersion: '0.2'
+  piattaforme:
+    anpr: false
+    cie: false
+    pagopa: false
+    spid: false
+landingURL: 'https://tiledesk.com/install'
+legal:
+  license: AGPL-3.0-only
+localisation:
+  availableLanguages:
+    - it
+    - en
+    - es
+    - fr
+    - pt
+    - de
+    - ru
+    - tr
+  localisationReady: true
+maintenance:
+  contacts:
+    - name: Andrea Sponziello
+  type: internal
+name: Tiledesk
+platforms:
+  - web
+releaseDate: '2022-06-15'
+softwareType: standalone/web
+url: 'https://github.com/Tiledesk/tiledesk-deployment'

package/pubmodules/pubModulesManager.js

@@ -18,6 +18,8 @@ class PubModulesManager {
         this.messageTransformer = undefined;
 
         this.scheduler = undefined;
+
+        this.rasa = undefined;
     }
 
   
@@ -140,6 +142,21 @@ class PubModulesManager {
         }
 
 
+        try {
+            this.rasa = require('./rasa');
+            winston.debug("this.rasa:"+ this.rasa);    
+            this.rasa.listener.listen();      
+            winston.info("PubModulesManager initialized rasa.");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') { 
+                winston.info("PubModulesManager init rasa module not found");
+            }else {
+                winston.info("PubModulesManager error initializing init rasa module", err);
+            }
+        }
+
+
+
       
         
     }

package/pubmodules/rasa/index.js

@@ -0,0 +1,3 @@
+const listener = require("./listener");
+
+module.exports = {listener:listener };

package/pubmodules/rasa/listener.js

@@ -0,0 +1,51 @@
+const botEvent = require('../../event/botEvent');
+var Faq_kb = require("../../models/faq_kb");
+var winston = require('../../config/winston');
+
+const BOT_RASA_ENDPOINT = process.env.BOT_RASA_ENDPOINT;
+winston.debug("BOT_RASA_ENDPOINT: " + BOT_RASA_ENDPOINT);
+
+if (BOT_RASA_ENDPOINT) {
+  winston.info("Rasa endpoint: " + BOT_RASA_ENDPOINT);
+} else {
+   winston.info("Rasa endpoint not configured");
+}
+
+
+class Listener {
+
+    listen() {
+
+        winston.debug('rasa Listener listen');   
+
+        var that = this;
+
+        botEvent.on('faqbot.create', function(bot) {
+            if (BOT_RASA_ENDPOINT) {
+
+                winston.info('bot.type:'+bot.type); 
+                if (bot.type==="rasa") {
+
+                    winston.info('qui.type:'+bot.type); 
+
+
+                    Faq_kb.findByIdAndUpdate(bot.id, {"url":BOT_RASA_ENDPOINT}, { new: true, upsert: true }, function (err, savedFaq_kb) {
+
+                    // bot.save(function (err, savedFaq_kb) {
+                        if (err) {
+                         return winston.error('error saving faqkb rasa ', err)
+                        }
+                        winston.verbose('Saved faqkb rasa', savedFaq_kb.toObject())      
+                    });
+                }
+            }
+        });
+        
+    }
+
+}
+
+var listener = new Listener();
+
+
+module.exports = listener;

package/pubmodules/rules/conciergeBot.js

@@ -338,6 +338,7 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
                     if (request.subject) {
                         touchText = request.subject;
                     }
+                    touchText.replace("\\",""); //Bugfix when a conversation has a first_text with \agent
 
                         // messageService.send(sender, senderFullname, recipient, text, id_project, createdBy, attributes, type);
                         messageService.send(

package/routes/message.js

@@ -139,7 +139,7 @@ async (req, res)  => {
               .then(function(createdLead) {
 
                
-              
+            
                 var new_request = {                                     
                   request_id: req.params.request_id, 
                   project_user_id: project_user._id, 
@@ -312,9 +312,20 @@ async (req, res)  => {
 //     });
 //   });
 
+  router.get('/csv', function(req, res) {
+
+    // console.log("csv");
+
+
+    return Message.find({"recipient": req.params.request_id, id_project: req.projectid}).sort({createdAt: 'asc'}).exec(function(err, messages) { 
+      if (err) return next(err);
+      res.csv(messages, true);
+    });
+  });
+
   router.get('/:messageid', function(req, res) {
   
-    console.log(req.body);
+    // console.log(req.body);
     
     Message.findById(req.params.messageid, function(err, message) {
       if (err) {
@@ -337,13 +348,7 @@ router.get('/', function(req, res) {
     });
 });
 
-router.get('/csv', function(req, res) {
 
-  return Message.find({"recipient": req.params.request_id, id_project: req.projectid}).sort({createdAt: 'asc'}).exec(function(err, messages) { 
-      if (err) return next(err);
-      res.csv(messages, true);
-    });
-});
 
 
 module.exports = router;

package/routes/project.js

@@ -382,21 +382,21 @@ router.get('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
 
 
       //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);
+      winston.debug("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);
+        winston.debug("project_users.length:"+ project_users.length);
 
         let org = orgUtil.getOrg(req);
-        winston.info("org:"+ org);
+        winston.debug("org:"+ org);
         
         if (org!=undefined) {
-          winston.info("org!=undefined");
+          winston.debug("org!=undefined");
 
           var project_users = project_users.filter(function (projectUser) {
             if (projectUser.id_project.organization && projectUser.id_project.organization === org ) {
-              winston.info("keep");
+              winston.debug("keep");
               return true;
             }
           });
@@ -430,7 +430,7 @@ router.get('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
           }*/
         }
       } else {
-        winston.info("no")
+        winston.debug("no")
       }
 
 

package/routes/project_user.js

@@ -367,7 +367,7 @@ router.get('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
 
 
 router.get('/users/search', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], async (req, res, next) => {
-  winston.info("--> users search  ");
+  winston.debug("--> users search  ");
 
   if (!req.project) {
     return res.status(404).send({ success: false, msg: 'Project not found.' });
@@ -376,10 +376,10 @@ router.get('/users/search', [passport.authenticate(['basic', 'jwt'], { session:
 
   let query =  {email: req.query.email};
   
-  winston.info('query: ', query);
+  winston.debug('query: ', query);
   
   let user = await User.findOne(query).exec();
-  winston.info('user: ', user);
+  winston.debug('user: ', user);
   
   if (!user) {
     return res.status(404).send({ success: false, msg: 'Object not found.' });
@@ -387,7 +387,7 @@ router.get('/users/search', [passport.authenticate(['basic', 'jwt'], { session:
  
 
   let project_user = await Project_user.findOne({id_user: user._id, id_project: req.projectid}).exec();
-  winston.info('project_user: ', project_user);
+  winston.debug('project_user: ', project_user);
   
   if (!project_user) {
     return res.status(403).json({msg: "Unauthorized. This is not a your teammate." });

package/routes/user-request.js

@@ -5,6 +5,7 @@ var winston = require('../config/winston');
 const requestEvent = require('../event/requestEvent');
 const { check, validationResult } = require('express-validator');
 var requestService = require('../services/requestService');
+var mongoose = require('mongoose');
 
 
 router.patch('/:requestid/rating', function (req, res) {
@@ -70,4 +71,314 @@ router.put('/:requestid/closeg', function (req, res) {
 
 });
 
+
+
+
+router.get('/me', function (req, res, next) {
+
+  winston.debug("req projectid", req.projectid);
+  winston.debug("req.query.sort", req.query.sort);
+  winston.debug('REQUEST ROUTE - QUERY ', req.query)
+
+  const DEFAULT_LIMIT = 40;
+
+  var limit = DEFAULT_LIMIT; // Number of request per page
+
+  if (req.query.limit) {
+    limit = parseInt(req.query.limit);
+  }
+  if (limit > 100) {
+    limit = DEFAULT_LIMIT;
+  }
+
+
+  var page = 0;
+
+  if (req.query.page) {
+    page = req.query.page;
+  }
+
+  var skip = page * limit;
+  winston.debug('REQUEST ROUTE - SKIP PAGE ', skip);
+
+
+  var user_id = req.user._id;
+  winston.debug('REQUEST ROUTE - user_id:  '+user_id);
+
+  var isObjectId = mongoose.Types.ObjectId.isValid(user_id);
+  winston.debug("isObjectId:"+ isObjectId);
+
+
+  var query = { "id_project": req.projectid, "status": {$lt:1000}, preflight:false};
+
+    
+  if (isObjectId) {
+    query["snapshot.requester.id_user"] = user_id;
+    // query.id_user = mongoose.Types.ObjectId(contact_id);
+  } else {
+    query["snapshot.requester.uuid_user"] = user_id;
+  }
+
+
+  // $or:[{"snapshot.requester.id_user": user_id}, {"snapshot.requester.uuid_user": user_id}]};  
+
+  winston.debug('REQUEST ROUTE - query ', query);
+
+
+  if (req.query.dept_id) {
+    query.department = req.query.dept_id;
+    winston.debug('REQUEST ROUTE - QUERY DEPT ID', query.department);
+  }
+
+  if (req.query.full_text) {
+    winston.debug('req.query.fulltext', req.query.full_text);
+    query.$text = { "$search": req.query.full_text };
+  }
+
+  var history_search = false;
+
+  if (req.query.status) {
+    winston.debug('req.query.status', req.query.status);
+    query.status = req.query.status;
+
+    if (req.query.status == 1000 || req.query.status == "1000") {
+      history_search = true;
+    }
+    if (req.query.status==="all") {
+      history_search = true;
+      delete query.status;
+    }
+  }
+
+  // if (req.query.lead) {
+  //   winston.debug('req.query.lead', req.query.lead);
+  //   query.lead = req.query.lead;
+  // }
+
+  // USERS & BOTS
+  if (req.query.participant) {
+    winston.debug('req.query.participant', req.query.participant);
+    query.participants = req.query.participant;
+  }
+
+  winston.debug('req.query.hasbot', req.query.hasbot);
+  if (req.query.hasbot!=undefined) {
+    winston.debug('req.query.hasbot', req.query.hasbot);
+    query.hasBot = req.query.hasbot;
+  }
+
+  // if (req.query.waiting_time_exists) { //non basta aggiungi anche che nn è null
+  //   query.waiting_time = {"$exists": req.query.waiting_time_exists} //{$ne:null}
+  //   winston.debug('REQUEST ROUTE - QUERY waiting_time_exists', query.waiting_time_exists);
+  // }
+
+
+  if (req.query.tags) {
+    winston.debug('req.query.tags', req.query.tags);
+    query["tags.tag"] = req.query.tags;
+  }
+
+  if (req.query.location) {
+    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;
+  // }
+
+  /**
+   **! *** DATE RANGE  USECASE 1 ***
+   *  in the tiledesk dashboard's HISTORY PAGE
+   *  WHEN THE TRIAL IS EXIPIRED OR THE SUBSCIPTION IS NOT ACTIVE
+   *  THE SEARCH FOR DATE INTERVAL OF THE HISTORY OF REQUESTS ARE DISABLED AND 
+   *  ARE DISPLAYED ONLY THE REQUESTS OF THE LAST 14 DAYS
+   */
+  if ( history_search === true && req.project && req.project.profile && (req.project.profile.type === 'free' && req.project.trialExpired === true) || (req.project.profile.type === 'payment' && req.project.isActiveSubscription === false)) {
+
+
+    var startdate = moment().subtract(14, "days").format("YYYY-MM-DD");
+
+    var enddate = moment().format("YYYY-MM-DD");
+
+    winston.debug('»»» REQUEST ROUTE - startdate ', startdate);
+    winston.debug('»»» REQUEST ROUTE - enddate ', enddate);
+
+    var enddatePlusOneDay=  moment(new Date()).add(1, 'days').toDate()
+    winston.debug('»»» REQUEST ROUTE - enddate + 1 days: ', enddatePlusOneDay);
+
+    // var enddatePlusOneDay = "2019-09-17T00:00:00.000Z"
+
+    query.createdAt = { $gte: new Date(Date.parse(startdate)).toISOString(), $lte: new Date(enddatePlusOneDay).toISOString() }
+    winston.debug('REQUEST ROUTE - QUERY CREATED AT ', query.createdAt);
+
+  }
+ 
+ /**
+   **! *** DATE RANGE  USECASE 2 ***
+   *  in the tiledesk dashboard's HISTORY PAGE 
+   *  WHEN THE USER SEARCH FOR DATE INTERVAL OF THE HISTORY OF REQUESTS
+   */
+  if (req.query.start_date && req.query.end_date) {
+    winston.debug('REQUEST ROUTE - REQ QUERY start_date ', req.query.start_date);
+    winston.debug('REQUEST ROUTE - REQ QUERY end_date ', req.query.end_date);
+
+    /**
+     * USING TIMESTAMP  in MS    */
+    // var formattedStartDate = new Date(+req.query.start_date);
+    // var formattedEndDate = new Date(+req.query.end_date);
+    // query.createdAt = { $gte: formattedStartDate, $lte: formattedEndDate }
+
+    /**
+     * USING MOMENT      */
+    var startDate = moment(req.query.start_date, 'DD/MM/YYYY').format('YYYY-MM-DD');
+    var endDate = moment(req.query.end_date, 'DD/MM/YYYY').format('YYYY-MM-DD');
+
+    winston.debug('REQUEST ROUTE - REQ QUERY FORMATTED START DATE ', startDate);
+    winston.debug('REQUEST ROUTE - REQ QUERY FORMATTED END DATE ', endDate);
+
+    // ADD ONE DAY TO THE END DAY
+    var date = new Date(endDate);
+    var newdate = new Date(date);
+    var endDate_plusOneDay = newdate.setDate(newdate.getDate() + 1);
+    winston.debug('REQUEST ROUTE - REQ QUERY FORMATTED END DATE + 1 DAY ', endDate_plusOneDay);
+    // var endDate_plusOneDay =   moment('2018-09-03').add(1, 'd')
+    // var endDate_plusOneDay =   endDate.add(1).day();
+    // var toDate = new Date(Date.parse(endDate_plusOneDay)).toISOString()
+
+    query.createdAt = { $gte: new Date(Date.parse(startDate)).toISOString(), $lte: new Date(endDate_plusOneDay).toISOString() }
+    winston.debug('REQUEST ROUTE - QUERY CREATED AT ', query.createdAt);
+
+  } else if (req.query.start_date && !req.query.end_date) {
+    winston.debug('REQUEST ROUTE - REQ QUERY END DATE IS EMPTY (so search only for start date)');
+    var startDate = moment(req.query.start_date, 'DD/MM/YYYY').format('YYYY-MM-DD');
+
+    var range = { $gte: new Date(Date.parse(startDate)).toISOString() };
+    if (req.query.filterRangeField) {
+      query[req.query.filterRangeField] = range;
+    }else {
+      query.createdAt = range;
+    }
+    
+    winston.debug('REQUEST ROUTE - QUERY CREATED AT (only for start date)', query.createdAt);
+  }
+  // }
+
+
+
+  if (req.query.snap_department_routing) {
+    query["snapshot.department.routing"] = req.query.snap_department_routing;
+    winston.debug('REQUEST ROUTE - QUERY snap_department_routing', query.snap_department_routing);
+  }
+
+  if (req.query.snap_department_default) {
+    query["snapshot.department.default"] = req.query.snap_department_default;
+    winston.debug('REQUEST ROUTE - QUERY snap_department_default', query.snap_department_default);
+  }
+
+
+  if (req.query.snap_department_id_bot) {
+    query["snapshot.department.id_bot"] = req.query.snap_department_id_bot;
+    winston.debug('REQUEST ROUTE - QUERY snap_department_id_bot', query.snap_department_id_bot);
+  }
+
+  if (req.query.snap_department_id_bot_exists) {
+    query["snapshot.department.id_bot"] = {"$exists": req.query.snap_department_id_bot_exists}
+    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;
+  }
+  winston.debug("direction", direction);
+
+  var sortField = "createdAt";
+  if (req.query.sort) {
+    sortField = req.query.sort;
+  }
+  winston.debug("sortField", sortField);
+
+  var sortQuery = {};
+  sortQuery[sortField] = direction;
+
+  winston.debug("sort query", sortQuery);
+
+  winston.verbose('REQUEST ROUTE - REQUEST FIND ', query);
+
+  // requestcachefarequi populaterequired
+  var q1 = Request.find(query).
+    skip(skip).limit(limit);
+
+   
+    winston.debug('REQUEST ROUTE no_populate:' + req.query.no_populate);
+
+    if (req.query.no_populate != "true" && req.query.no_populate != true) {        
+      winston.verbose('REQUEST ROUTE - no_polutate false ', req.headers);
+      q1.populate('department').
+      populate('participatingBots').            //nico già nn gli usa
+      populate('participatingAgents').          //nico già nn gli usa
+      populate('lead').
+      populate({path:'requester',populate:{path:'id_user'}});        //toglilo perche nico lo prende già da snapshot
+    }
+        
+    // cache(cacheUtil.defaultTTL, "requests-"+projectId).    
+
+
+    // if (req.query.select_snapshot) {
+    //   winston.info('select_snapshot');
+    //   q1.select("+snapshot");
+    //   // q1.select({ "snapshot": 1});
+    // }
+
+    q1.sort(sortQuery);
+
+    // winston.info('q1',q1);
+
+
+    q1.exec();
+
+    // TODO if ?onlycount=true do not perform find query but only 
+    // set q1 to undefined; to skip query
+
+  var q2 =  Request.countDocuments(query).exec();
+
+  var promises = [
+    q1,
+    q2
+  ];
+
+  Promise.all(promises).then(function(results) {
+    var objectToReturn = {
+      perPage: limit,
+      count: results[1],
+      requests: results[0]
+    };
+    winston.debug('REQUEST ROUTE - objectToReturn ', objectToReturn);
+    return res.json(objectToReturn);
+
+  }).catch(function(err){
+    winston.error('REQUEST ROUTE - REQUEST FIND ERR ', err);
+    return res.status(500).send({ success: false, msg: 'Error getting requests.', err: err });
+  });
+  
+
+});
+
+
 module.exports = router;

package/routes/widget.js

@@ -114,10 +114,38 @@ router.get('/', function(req, res, next) {
 
   }
 
+
+  var getProject = function(req) {
+    winston.info('getProject.');
+
+    return new Promise(function (resolve, reject) {
+
+       //@DISABLED_CACHE .cache(cacheUtil.queryTTL, "projects:query:id:status:100:"+req.projectid+":select:-settings")            
+      
+      Project.findOne({_id: req.projectid, status: 100}).select('-settings -ipFilter -ipFilterEnabled').exec(function(err, project) {
+        // not use .lean I need project.trialExpired 
+
+          if (err) {
+            return reject({err: "Project Not Found"});        
+          }
+
+          if (project && project.profile && (project.profile.type === 'free' && project.trialExpired === true) || (project.profile.type === 'payment' && project.isActiveSubscription === false)) {
+            winston.info('getProject remove poweredBy tag', project);
+            project.widget.poweredBy = undefined;
+            project.widget.baloonImage = undefined;            
+          }
+
+        return resolve(project);
+      });        
+
+    });
+
+  }
+
 // TOOD add labels
     Promise.all([
-        Project.findOne({_id: req.projectid, status: 100}).select('-settings')
-        //@DISABLED_CACHE .cache(cacheUtil.queryTTL, "projects:query:id:status:100:"+req.projectid+":select:-settings")        
+
+        getProject(req)
       ,
         availableUsers()
       ,

package/services/emailService.js

@@ -98,13 +98,13 @@ class EmailService {
     this.host = process.env.EMAIL_HOST || config.host;
     winston.info('EmailService host: ' + this.host);
 
-    this.secure  = process.env.EMAIL_SECURE || false;
+    this.secure  = process.env.EMAIL_SECURE || false;     
     winston.info('EmailService secure: ' + this.secure);
 
     this.user  = process.env.EMAIL_USERNAME || config.username;
     winston.info('EmailService username: ' + this.user);
 
-    this.port  = process.env.EMAIL_PORT;
+    this.port  = process.env.EMAIL_PORT;  //default is 587
     winston.info('EmailService port: ' + this.port);
 
 
@@ -123,11 +123,19 @@ class EmailService {
     var that = this;
     winston.debug('EmailService readTemplate: '+ templateName + '  ' + JSON.stringify(settings)); 
     
+
       if (settings && settings.email && settings.email.templates) {
+
        var templates = settings.email.templates;
        winston.debug('EmailService templates: ',templates); 
-       var template = templates[templateName];
+
+       var templateDbName = templateName.replace(".html", "");
+       winston.debug('EmailService templateDbName: '+templateDbName); 
+
+
+       var template = templates[templateDbName];
        winston.debug('EmailService template: '+template); 
+
         if (template) {
         // that.callback(template);
           return new Promise(function (resolve, reject) {
@@ -240,7 +248,6 @@ class EmailService {
     };
 
     winston.debug('mailOptions', mailOptions);
-
     if (!mail.to) {
       return winston.warn("EmailService send method. to field is not defined", mailOptions);
     }
@@ -273,7 +280,7 @@ class EmailService {
 
     var that = this;
 
-    var html = await this.readTemplateFile('test.html');
+    var html = await this.readTemplate('test.html',{ "email" : {"templates": {test: "123"}}});
 
     var template = handlebars.compile(html);
 
@@ -282,7 +289,7 @@ class EmailService {
 
     var html = template(replacements);
     
-    return that.send({to:to, subject:`TileDesk test email`, config: configEmail, html: html, callback: callback});
+    return that.send({to:to, subject:`Tiledesk test email`, config: configEmail, html: html, callback: callback});
     
   }
 
@@ -399,10 +406,12 @@ class EmailService {
       }
     }
 
-    let subject = `[TileDesk ${project ? project.name : '-'}] New Assigned Chat`;
+
+
+    let subject = `[Tiledesk ${project ? project.name : '-'}] New Assigned Chat`;
 
     if (request.subject) {
-      subject = `[TileDesk ${project ? project.name : '-'}] ${request.subject}`;
+      subject = `[Tiledesk ${project ? project.name : '-'}] ${request.subject}`;
     }
 
     // if (request.ticket_id) {
@@ -546,10 +555,10 @@ class EmailService {
     }
 
 
-    let subject = `[TileDesk ${project ? project.name : '-'}] New message`;
+    let subject = `[Tiledesk ${project ? project.name : '-'}] New message`;
 
     if (request.subject) {
-      subject = `[TileDesk ${project ? project.name : '-'}] ${request.subject}`;
+      subject = `[Tiledesk ${project ? project.name : '-'}] ${request.subject}`;
     }
     if (request.ticket_id) {
       subject = `[Ticket #${request.ticket_id}] New message`;
@@ -690,10 +699,10 @@ class EmailService {
       }
     }
 
-    let subject = `[TileDesk ${project ? project.name : '-'}] New Pooled Chat`;
+    let subject = `[Tiledesk ${project ? project.name : '-'}] New Pooled Chat`;
 
     if (request.subject) {
-      subject = `[TileDesk ${project ? project.name : '-'}] ${request.subject}`;
+      subject = `[Tiledesk ${project ? project.name : '-'}] ${request.subject}`;
     }
     // if (request.ticket_id) {
     //   subject = `[Ticket #${request.ticket_id}] New Pooled Chat`;
@@ -831,10 +840,10 @@ class EmailService {
     }
 
 
-    let subject = `[TileDesk ${project ? project.name : '-'}] New Message`;
+    let subject = `[Tiledesk ${project ? project.name : '-'}] New Message`;
 
     if (request.subject) {
-      subject = `[TileDesk ${project ? project.name : '-'}] ${request.subject}`;
+      subject = `[Tiledesk ${project ? project.name : '-'}] ${request.subject}`;
     }
     if (request.ticket_id) {
       subject = `[Ticket #${request.ticket_id}] New Message`;
@@ -982,7 +991,7 @@ class EmailService {
       replyTo: replyTo, 
       inReplyTo: inReplyTo,
       references: references,
-      subject:`[TileDesk ${project ? project.name : '-'}] New Offline Message`, 
+      subject:`[Tiledesk ${project ? project.name : '-'}] New Offline Message`, 
       html:html, 
       config:configEmail, 
       headers: headers
@@ -997,7 +1006,7 @@ class EmailService {
       replyTo: replyTo,
       inReplyTo: inReplyTo, 
       references: references,
-      subject: `[TileDesk ${project ? project.name : '-'}] New Offline Message - notification`, 
+      subject: `[Tiledesk ${project ? project.name : '-'}] New Offline Message - notification`, 
       html:html, 
       headers: headers
     });
@@ -1247,8 +1256,8 @@ class EmailService {
     var html = template(replacements);
 
 
-    that.send({to: to, subject: '[TileDesk] Password reset request', html:html});
-    that.send({to:that.bcc, subject: '[TileDesk] Password reset request - notification', html:html });
+    that.send({to: to, subject: '[Tiledesk] Password reset request', html:html});
+    that.send({to:that.bcc, subject: '[Tiledesk] Password reset request - notification', html:html });
 
   }
 
@@ -1285,8 +1294,8 @@ class EmailService {
     var html = template(replacements);
 
 
-    that.send({to: to, subject:'[TileDesk] Your password has been changed', html:html });
-    that.send({to: that.bcc, subject: '[TileDesk] Your password has been changed - notification', html: html });
+    that.send({to: to, subject:'[Tiledesk] Your password has been changed', html:html });
+    that.send({to: that.bcc, subject: '[Tiledesk] Your password has been changed - notification', html: html });
 
   }
 
@@ -1332,8 +1341,8 @@ class EmailService {
     var html = template(replacements);
 
 
-    that.send({to:to, subject: `[TileDesk] You have been invited to the '${projectName}' project`, html:html});
-    that.send({to: that.bcc, subject: `[TileDesk] You have been invited to the '${projectName}' project - notification`, html: html});
+    that.send({to:to, subject: `[Tiledesk] You have been invited to the '${projectName}' project`, html:html});
+    that.send({to: that.bcc, subject: `[Tiledesk] You have been invited to the '${projectName}' project - notification`, html: html});
   }
 
     // ok
@@ -1376,8 +1385,8 @@ class EmailService {
 
     var html = template(replacements);
 
-    that.send({to:to, subject: `[TileDesk] You have been invited to the '${projectName}' project`, html:html });
-    that.send({to: that.bcc, subject: `[TileDesk] You have been invited to the '${projectName}' project - notification`, html: html});
+    that.send({to:to, subject: `[Tiledesk] You have been invited to the '${projectName}' project`, html:html });
+    that.send({to: that.bcc, subject: `[Tiledesk] You have been invited to the '${projectName}' project - notification`, html: html});
 
   }
 
@@ -1415,8 +1424,8 @@ class EmailService {
     var html = template(replacements);
 
 
-    that.send({to: to, subject: `[TileDesk] Verify your email address`, html:html });
-    that.send({to: that.bcc, subject: `[TileDesk] Verify your email address `+to + " - notification", html:html });
+    that.send({to: to, subject: `[Tiledesk] Verify your email address`, html:html });
+    that.send({to: that.bcc, subject: `[Tiledesk] Verify your email address `+to + " - notification", html:html });
 
   }
 
@@ -1483,8 +1492,8 @@ async sendRequestTranscript(to, messages, request, project) {
       winston.verbose("custom email setting found: ", configEmail);
     }
 
-    that.send({to:to, subject: '[TileDesk] Transcript', html:html, config: configEmail});
-    that.send({to: that.bcc, subject: '[TileDesk] Transcript - notification', html:html });
+    that.send({to:to, subject: '[Tiledesk] Transcript', html:html, config: configEmail});
+    that.send({to: that.bcc, subject: '[Tiledesk] Transcript - notification', html:html });
 
 }
 
@@ -1496,6 +1505,6 @@ async sendRequestTranscript(to, messages, request, project) {
 
 var emailService = new EmailService();
 
-//emailService.sendTest("al@f21.it");
+// emailService.sendTest("al@f21.it");
 
 module.exports = emailService;