@tiledesk/tiledesk-server 2.2.38 → 2.3.2

package/routes/tag.js

@@ -0,0 +1,138 @@
+var express = require('express');
+var router = express.Router();
+var TagLibrary = require("../models/tagLibrary");
+var winston = require('../config/winston');
+
+router.post('/', function (req, res) {
+
+  winston.debug(req.body);
+  winston.debug("req.user", req.user);
+
+  var newTag = new TagLibrary({
+    tag: req.body.tag,  
+    color: req.body.color,
+    id_project: req.projectid,
+    createdBy: req.user.id,
+    updatedBy: req.user.id
+  });
+
+  newTag.save(function (err, savedTag) {
+    if (err) {
+      // winston.error('--- > ERROR ', err)    
+      if (err.code === 11000) { //error for dupes
+          return TagLibrary.findOne({id_project:req.projectid, tag: req.body.tag },function (err, savedTag) {
+            res.json(savedTag);
+          });
+      }    
+      winston.error('--- > ERROR ', err)          
+      return res.status(500).send({ success: false, msg: 'Error saving object.' });
+    }
+
+    res.json(savedTag);
+  });
+});
+
+router.put('/:tagid', function (req, res) {
+  winston.debug(req.body);
+  var update = {};
+  
+
+  update.tag = req.body.tag;   
+  update.color = req.body.color;
+  
+  
+  TagLibrary.findByIdAndUpdate(req.params.tagid, update, { new: true, upsert: true }, function (err, updatedTag) {
+    if (err) {
+      winston.error('--- > ERROR ', err);
+      return res.status(500).send({ success: false, msg: 'Error updating object.' });
+    }
+
+  
+
+    // TagEvent.emit('Tag.update', updatedTag);
+    res.json(updatedTag);
+  });
+});
+
+router.delete('/:tagid', function (req, res) {
+  winston.debug(req.body);
+
+  TagLibrary.remove({ _id: req.params.tagid }, function (err, tag) {
+    if (err) {
+      winston.error('--- > ERROR ', err);
+      return res.status(500).send({ success: false, msg: 'Error deleting object.' });
+    }
+
+  
+    // TagEvent.emit('Tag.delete', Tag);
+
+    res.json(tag);
+  });
+});
+
+router.get('/:tagid', function (req, res) {
+  winston.debug(req.body);
+
+  TagLibrary.findById(req.params.tagid, function (err, tag) {
+    if (err) {
+      return res.status(500).send({ success: false, msg: 'Error getting object.' });
+    }
+    if (!tag) {
+      return res.status(404).send({ success: false, msg: 'Object not found.' });
+    }
+    res.json(tag);
+  });
+});
+
+router.get('/', function (req, res) {
+  var limit = 40; // Number of Tags per page
+  var page = 0;
+
+  if (req.query.page) {
+    page = req.query.page;
+  }
+
+  var skip = page * limit;
+  winston.debug('Tag ROUTE - SKIP PAGE ', skip);
+
+
+  var query = { "id_project": req.projectid};
+
+  // if (req.query.full_text) {
+  //   winston.debug('Tag ROUTE req.query.fulltext', req.query.full_text);
+  //   query.$text = { "$search": req.query.full_text };
+  // }
+
+
+  var direction = -1; //-1 descending , 1 ascending
+  if (req.query.direction) {
+    direction = req.query.direction;
+  }
+
+  var sortField = "createdAt";
+  if (req.query.sort) {
+    sortField = req.query.sort;
+  }
+
+  var sortQuery = {};
+  sortQuery[sortField] = direction;
+
+  winston.debug("sort query", sortQuery);
+
+  return TagLibrary.find(query).
+    skip(skip).limit(limit).
+    sort(sortQuery).
+    exec(function (err, tags) {
+      if (err) {
+        winston.error('Tag ROUTE - REQUEST FIND ERR ', err)
+        return (err);
+      }
+    
+        return res.json(tags);
+    });
+});
+
+
+
+
+module.exports = router;

package/routes/user-request.js

@@ -59,8 +59,9 @@ 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) {
+    // closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by)
+    const closed_by = req.user.id;
+  return requestService.closeRequestByRequestId(req.params.requestid, req.projectid, false, true, closed_by).then(function(closedRequest) {
 
       winston.verbose("request closed", closedRequest);
 

package/routes/widget.js

@@ -96,6 +96,7 @@ router.get('/', function(req, res, next) {
       winston.debug("req.project:" + JSON.stringify(req.project));
       
       if (req.project) {
+                                    //secondo me qui manca un parentesi tonda per gli or
         if (req.project.profile && (req.project.profile.type === 'free' && req.project.trialExpired === true) || (req.project.profile.type === 'payment' && req.project.isActiveSubscription === false)) {
           query.default = true;
         }
@@ -129,7 +130,21 @@ router.get('/', function(req, res, next) {
             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.debug("project", project);
+
+          // ProjectSetter project not found with id: 62d8cf8b2b10b30013bb9b99
+          // Informazioni
+          // 2022-07-27 14:32:14.772 CESTerror: Error getting widget. {"err":"Project Not Found"}
+          // Informazioni
+          // 2022-07-27 14:32:14.778 CESTerror: uncaughtException: Cannot read property 'profile' of null
+          // Informazioni
+          // 2022-07-27 14:32:14.778 CESTTypeError: Cannot read property 'profile' of null at /usr/src/app/routes/widget.js:132:124 at /usr/src/app/node_modules/mongoose/lib/model.js:5074:18 at processTicksAndRejections (internal/process/task_queues.js:79:11) {"date":"Wed Jul 27 2022 12:32:14 GMT+0000 (Coordinated Universal Time)","error":{},"exception":true,"os":{"loadavg":[0.26,0.51,0.58],"uptime":1028128},"process":{"argv":["/usr/local/bin/node","/usr/src/app/bin/www"],"cwd":"/usr/src/app","execPath":"/usr/local/bin/node","gid":0,"memoryUsage":{"arrayBuffers":128833077,"external":130521753,"heapTotal":110641152,"heapUsed":85605912,"rss":310054912},"pid":26,"uid":0,"version":"v12.22.12"},"stack":"TypeError: Cannot read property 'profile' of null\n at /usr/src/app/routes/widget.js:132:124\n at /usr/src/app/node_modules/mongoose/lib/model.js:5074:18\n at processTicksAndRejections (internal/process/task_queues.js:79:11)","trace":[{"column":124,"file":"/usr/src/app/routes/widget.js","function":null,"line":132,"method":null,"native":false},{"column":18,"file":"/usr/src/app/node_modules/mongoose/lib/model.js","function":null,"line":5074,"method":null,"native":false},{"column":11,"file":"internal/process/task_queues.js","function":"processTicksAndRejections","line":79,"method":null,"native":false}]}
+
+          // console.log("project!=null",project!=null);
+          // console.log("project.profile",project.profile);
+                                              //secondo me qui manca un parentesi tonda per gli or
+          if (project  && project.profile && ((project.profile.type === 'free' && project.trialExpired === true) || (project.profile.type === 'payment' && project.isActiveSubscription === false))) {
             winston.debug('getProject remove poweredBy tag', project);
             project.widget.poweredBy = undefined;
             project.widget.baloonImage = undefined;            

package/routes/widgetLoader.js

@@ -12,9 +12,40 @@ router.get('/load', function(req, res) {
   winston.debug(query);
   // TODO chech if query is null
   res.redirect(widgetLocation+'?'+query);
+
 });
   
 
+router.get('/v5/:project_id', function(req, res) {
+
+  var project_id = req.params.project_id;
+  winston.debug("project_id: " + project_id);
+
+  res.type('.js');
+
+  var js = `
+    window.tiledeskSettings= 
+    {
+        projectid: "${project_id}"
+    };
+    (function(d, s, id) { 
+        var w=window; var d=document; var i=function(){i.c(arguments);};
+        i.q=[]; i.c=function(args){i.q.push(args);}; w.Tiledesk=i;                    
+        var js, fjs=d.getElementsByTagName(s)[0];
+        if (d.getElementById(id)) return;
+        js=d.createElement(s); 
+        js.id=id; js.async=true; js.src="${widgetLocation}/launch.js";
+        fjs.parentNode.insertBefore(js, fjs);
+    }(document,'script','tiledesk-jssdk'));
+  `;
+
+  winston.debug("js: " + js);
+
+  res.send(js);
+
+});
+
+
 var widgetTestLocation = process.env.WIDGET_TEST_LOCATION || widgetConfig.testLocation;
 
 router.get('/test/load', function(req, res) {

package/services/faqBotHandler.js

@@ -10,7 +10,6 @@ var BotFromParticipant = require("../utils/botFromParticipant");
 var cacheUtil = require('../utils/cacheUtil');
 var eventService = require('../pubmodules/events/eventService');
 var mongoose = require('mongoose');
-const { TiledeskChatbotUtil } = require('@tiledesk/tiledesk-chatbot-util');
 const ActionsConstants = require('../models/actionsConstants');
 var httpUtil = require('../utils/httpUtil');
 
@@ -138,7 +137,7 @@ class FaqBotHandler {
 
            
 
-
+            // EXACT MATCH
             Faq.find(query) 
             .lean().               
              exec(async (err, faqs) => {
@@ -301,6 +300,7 @@ class FaqBotHandler {
                 }               
         
             
+                
                 Faq.find(query,  mongoproject)  
                 .sort(sort) 
                 .lean().               

package/services/faqBotSupport.js

@@ -4,7 +4,6 @@
 
 const Faq = require('../models/faq');
 const Faq_kb = require('../models/faq_kb');
-const MessageConstants = require('../models/messageConstants');
 var winston = require('../config/winston');
 
 var jwt = require('jsonwebtoken');

package/services/faqService.js

@@ -78,7 +78,7 @@ class FaqService {
           { 'question': '\\start', 'answer': 'Hello 👋. I\'m a bot 🤖.\n\nChoose one of the options below or write a message to reach our staff.\n* Who are you?\n* Where are you?\n* What can you do?\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'start', 'topic': 'internal' },            
           { 'question': 'defaultFallback', 'answer': 'I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Back to start tdAction:start\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'defaultFallback', 'topic': 'internal' }, //TODO se metto spazio n * nn va      
           { 'question': 'What can you do?', 'answer': 'Using natural language processing, I\'m able to find the best answer for your users. I also support images, videos etc.. Let\'s try:\n* Sample Image\n* Sample Video\n* Sample Action tdAction:action1\n* Sample Frame\n* Back to start tdAction:start', 'topic': 'sample' },    
-          { 'question': 'Sample Image', 'answer': 'tdImage:https://tiledesk.com/tiledesk-logo-x1.png\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
+          { 'question': 'Sample Image', 'answer': 'tdImage:https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
           { 'question': 'Sample Frame', 'answer': 'tdFrame:https://www.emanueleferonato.com/wp-content/uploads/2019/02/runner/\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
           { 'question': 'Sample Video', 'answer': 'tdVideo:https://www.youtube.com/embed/EngW7tLk6R8\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
           { 'question': 'Where are you?', 'answer': 'We are here ❤️\ntdFrame:https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d6087916.923447935!2d8.234804542117423!3d41.836572992140624!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x12d4fe82448dd203%3A0xe22cf55c24635e6f!2sItaly!5e0!3m2!1sen!2sit!4v1613657475377!5m2!1sen!2sit\n* Back to start tdAction:start', 'topic': 'sample' },    

package/services/modulesManager.js

@@ -28,16 +28,10 @@ if (licenseKey) {
 
 class ModulesManager {
 
-    constructor() {
-        this.trigger = undefined;
-        this.triggerRoute = undefined;
+    constructor() {       
         this.stripe = undefined;
         this.graphql = undefined;
-        this.analyticsRoute = undefined;
-        this.resthookRoute = undefined;
-        this.elasticIndexer = undefined;
-        this.activityArchiver = undefined;
-        this.activityRoute = undefined;
+        this.elasticIndexer = undefined;      
         this.facebookRoute = undefined;
         this.jwthistoryArchiver = undefined;
         this.jwthistoryRoute = undefined;
@@ -47,12 +41,10 @@ class ModulesManager {
         this.routingQueue = undefined;
         this.queue = undefined;
         this.cache = undefined;
-        this.cannedResponseRoute = undefined;
-        this.tagRoute = undefined;
-        this.groupsRoute = undefined;
         this.visitorCounterRoute = undefined;
         this.visitorCounterMiddleware = undefined;
         this.widgetsRoute = undefined;
+        this.enterprise = undefined;
     }
 
     injectBefore(app) {
@@ -106,50 +98,16 @@ class ModulesManager {
     useUnderProjects(app) {
         var that = this;
         winston.debug("ModulesManager using controllers");       
-
-      
-        if (this.triggerRoute) {
-            app.use('/:projectid/modules/triggers', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], this.triggerRoute);
-            winston.info("ModulesManager trigger controller loaded");       
-        }
-      
-        if (this.analyticsRoute) {
-           app.use('/:projectid/analytics', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], this.analyticsRoute);
-            winston.info("ModulesManager analytics controller loaded");       
-        }
-      
-        if (this.resthookRoute) {
-           app.use('/:projectid/subscriptions', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], this.resthookRoute);
-           winston.info("ModulesManager subscriptions controller loaded");       
-        }
-
-        if (this.activityRoute) {
-            app.use('/:projectid/activities', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], this.activityRoute);
-             winston.info("ModulesManager activities controller loaded");       
-        }
-
+            
+             
+    
      
         if (this.requestHistoryRoute) {
             app.use('/:projectid/requests/:request_id/history', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes(null, ['subscription'])] , this.requestHistoryRoute);
             winston.info("ModulesManager requestHistory controller loaded"); 
         }
 
-
-        if (this.cannedResponseRoute) {            
-            app.use('/:projectid/canned', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], this.cannedResponseRoute);
-            winston.info("ModulesManager canned controller loaded");       
-        }
-
-        if (this.tagRoute) {     
-            app.use('/:projectid/tags', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], this.tagRoute);
-            winston.info("ModulesManager tag controller loaded");       
-        }
-
-        if (this.groupsRoute) {     
-            app.use('/:projectid/groups', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], this.groupsRoute);
-            winston.info("ModulesManager group controller loaded");       
-        }
-
+    
 
 
         if (this.visitorCounterRoute) {     
@@ -174,20 +132,21 @@ class ModulesManager {
 
 
         try {
-            this.trigger = require('@tiledesk-ent/tiledesk-server-triggers').start;
-            winston.debug("this.trigger:"+ this.trigger);
-            this.triggerRoute = require('@tiledesk-ent/tiledesk-server-triggers').triggerRoute;
-            winston.debug("this.triggerRoute:"+ this.triggerRoute);       
-            winston.info("ModulesManager trigger initialized");
+            this.enterprise = require('@tiledesk-ent/tiledesk-server-enterprise');
+            winston.debug("this.enterprise:"+ this.enterprise);            
+            winston.info("ModulesManager enterprise initialized");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init trigger module not found");
+                winston.info("ModulesManager init enterprise module not found");
             }else {
-                winston.error("ModulesManager error initializing init trigger module", err);
+                winston.error("ModulesManager error initializing init enterprise module", err);
             }
         }
 
 
+
+
+
         try {
             this.stripe = require('@tiledesk-ent/tiledesk-server-payments').stripeRoute;
             winston.info("ModulesManager stripe initialized");
@@ -198,51 +157,6 @@ class ModulesManager {
                 winston.error("ModulesManager error initializing init stripe module", err);
            }
         } 
-      
-        try {
-            this.resthookRoute = require('@tiledesk-ent/tiledesk-server-resthook').resthookRoute;
-            winston.debug("this.resthookRoute:"+ this.resthookRoute);        
-             this.subscriptionNotifier = require('@tiledesk-ent/tiledesk-server-resthook').subscriptionNotifier;
-            // this.subscriptionNotifier.start();
-            winston.info("ModulesManager resthook initialized");
-        } catch(err) {
-            if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init resthookRoute module not found");
-            }else {
-                winston.error("ModulesManager error initializing init resthook module", err);
-            }
-        }
-
-      
-       try {
-            this.analyticsRoute = require('@tiledesk-ent/tiledesk-server-analytics').analyticsRoute;
-            winston.debug("this.analyticsRoute:"+ this.analyticsRoute);        
-            winston.info("ModulesManager analyticsRoute initialized");
-        } catch(err) {
-            if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init analytics module not found");
-            }else {
-                winston.error("ModulesManager error initializing init analytics module", err);
-            }
-        }
-
-
-        try {
-            this.activityArchiver = require('@tiledesk-ent/tiledesk-server-activities').activityArchiver;
-            // this.activityArchiver.listen();
-            winston.debug("this.activityArchiver:"+ this.activityArchiver);   
-            
-            this.activityRoute = require('@tiledesk-ent/tiledesk-server-activities').activityRoute;
-            winston.debug("this.activityRoute:"+ this.activityRoute);
-
-            winston.info("ModulesManager activities initialized");
-        } catch(err) {
-            if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init activities module not found");
-            }else {
-                winston.error("ModulesManager error initializing init activities module", err);
-            }
-        }
 
 
 
@@ -344,70 +258,8 @@ class ModulesManager {
             }
         }
 
-        try {
-            this.cannedResponseRoute = require('@tiledesk-ent/tiledesk-server-canned').cannedResponseRoute;
-            winston.debug("this.cannedResponseRoute:"+ this.cannedResponseRoute);        
-            winston.info("ModulesManager cannedResponseRoute initialized");
-        } catch(err) {
-            if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init canned module not found");
-            }else {
-                winston.error("ModulesManager error initializing init canned module", err);
-            }
-        }
-
-        try {
-            this.tagRoute = require('@tiledesk-ent/tiledesk-server-tags').tagRoute;
-            winston.debug("this.tagRoute:"+ this.tagRoute);        
-            winston.info("ModulesManager tagRoute initialized");
-        } catch(err) {
-            if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init tag module not found");
-            }else {
-                winston.error("ModulesManager error initializing init tag module", err);
-            }
-        }
-
-        try {
-            this.groupsRoute = require('@tiledesk-ent/tiledesk-server-groups').groupsRoute;
-            winston.debug("this.groupsRoute:"+ this.groupsRoute);        
-            winston.info("ModulesManager groupsRoute initialized");
-        } catch(err) {
-            if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init group module not found");
-            }else {
-                winston.error("ModulesManager error initializing init group module", err);
-            }
-        }
-
 
-          
-        if (config && config.routes && config.routes.departmentsRoute) {
-            try {                          
-                require('@tiledesk-ent/tiledesk-server-departments').ext(config.routes.departmentsRoute, config.passport);
-                winston.info("ModulesManager departmentsRoute initialized");
-            } catch(err) {
-                if (err.code == 'MODULE_NOT_FOUND') {
-                    winston.info("ModulesManager init departments module not found");
-                }else {
-                    winston.error("ModulesManager error initializing init departments module", err);
-                }
-            }
-        }
-            
-        if (config && config.routes && config.routes.projectsRoute) {
-            try {                          
-                require('@tiledesk-ent/tiledesk-server-mt').ext(config.routes.projectsRoute, config.passport);
-                winston.info("ModulesManager mt initialized");
-            } catch(err) {
-                if (err.code == 'MODULE_NOT_FOUND') {
-                    winston.info("ModulesManager init mt module not found");
-                }else {
-                    winston.error("ModulesManager error initializing init mt module", err);
-                }
-            }
-        }
-            
+        
         try {
             this.visitorCounterRoute = require('@tiledesk-ent/tiledesk-server-visitorcounter').add(config.express);
             winston.debug("this.visitorCounterRoute:"+ this.visitorCounterRoute);        
@@ -459,24 +311,6 @@ class ModulesManager {
 
     start() {
 
-        // stampa log
-        if (this.subscriptionNotifier) {
-            try {
-                this.subscriptionNotifier.start();
-                winston.info("ModulesManager subscriptionNotifier started");            
-            } catch(err) {        
-                winston.info("ModulesManager error starting subscriptionNotifier module", err);            
-            }
-        }
-
-        if (this.activityArchiver) {
-            try {
-                this.activityArchiver.listen();
-                winston.info("ModulesManager activityArchiver started");
-            } catch(err) {        
-                winston.info("ModulesManager error starting activityArchiver module", err);            
-            }
-        }
         
         if (this.jwthistoryArchiver) {
             try {