@tiledesk/tiledesk-server 2.3.49 → 2.3.51

package/CHANGELOG.md

@@ -5,6 +5,10 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.48) 
 
+# Untagged
+- Added new email sending endpoint 
+- Emails endpoint is now usable by agents
+
 # 2.3.49 -> PROD 
 - @tiledesk/tiledesk-tybot-connector": "^0.1.22
 

package/app.js

@@ -481,7 +481,8 @@ app.use('/:projectid/labels', [fetchLabels],labels);
 
 app.use('/:projectid/campaigns',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], campaigns);
 
-app.use('/:projectid/emails',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('owner')], email);
+app.use('/:projectid/emails',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], email);
+
 
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.49",
+  "version": "2.3.51",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -14,7 +14,7 @@
     "enable-ent": "echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc"
   },
   "private": false,
-  "author": "Andrea Leo - Frontiere21 SRL",
+  "author": "Andrea Leo - Tiledesk SRL",
   "license": "AGPL-3.0",
   "homepage": "https://www.tiledesk.com",
   "repository": {
@@ -36,6 +36,8 @@
     "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"
   },
   "dependencies": {
+    "@tiledesk/tiledesk-apps": "^1.0.6",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.19",
     "@tiledesk/tiledesk-chat21-app": "^1.1.7",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",

package/pubmodules/apps/index.js

@@ -0,0 +1,8 @@
+const listener = require("./listener");
+
+const apps = require("@tiledesk/tiledesk-apps");
+const appsRoute = apps.router;
+
+
+module.exports = { listener: listener, appsRoute: appsRoute }
+

package/pubmodules/apps/listener.js

@@ -0,0 +1,27 @@
+const apps = require("@tiledesk/tiledesk-apps");
+var winston = require('../../config/winston');
+
+class Listener {
+
+    listen(config) {
+
+        winston.info("Apps Listener listen");
+        
+        if (config.databaseUri) {
+            winston.debug("apps config databaseUri: " + config.databaseUri);
+        }
+
+        apps.startApp({
+            ACCESS_TOKEN_SECRET: process.env.APPS_ACCESS_TOKEN_SECRET || 'nodeauthsecret',
+            MONGODB_URI: process.env.APPS_MONGODB_URI || config.databaseUri,
+        }, () => {
+            winston.info("Tiledesk Apps proxy server succesfully started.")
+        })
+
+    }
+
+}
+
+var listener = new Listener();
+
+module.exports = listener;

package/pubmodules/pubModulesManager.js

@@ -21,6 +21,12 @@ class PubModulesManager {
         this.rasa = undefined;
         this.rasaRoute = undefined;
 
+        this.apps = undefined;
+        this.appsRoute = undefined;
+
+        this.whatsapp = undefined;
+        this.whatsappRoute = undefined;
+
         this.activityArchiver = undefined;
         this.activityRoute = undefined;
 
@@ -53,6 +59,14 @@ class PubModulesManager {
             app.use('/modules/rasa', this.rasaRoute);
             winston.info("ModulesManager rasaRoute controller loaded");       
         }
+        if (this.appsRoute) {
+            app.use('/modules/apps', this.appsRoute);
+            winston.info("ModulesManager appsRoute controller loaded");       
+        }
+        if (this.whatsappRoute) {
+            app.use('/modules/whatsapp', this.whatsappRoute);
+            winston.info("ModulesManager whatsappRoute controller loaded");
+        }
         if (this.tilebotRoute) {
             app.use('/modules/tilebot', this.tilebotRoute);
             winston.info("ModulesManager tilebot controller loaded");       
@@ -217,7 +231,38 @@ class PubModulesManager {
             }
         }
 
+        try {
+            this.apps = require('./apps');
+            winston.debug("this.apps: " + this.apps);
+            this.apps.listener.listen(config);
+
+            this.appsRoute = this.apps.appsRoute;
 
+            winston.info("PubModulesManager initialized apps.");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') { 
+                winston.info("PubModulesManager init apps module not found");
+            }else {
+                winston.info("PubModulesManager error initializing init apps module", err);
+            }
+        }
+
+        try {
+            this.whatsapp = require('./whatsapp');
+            winston.debug("this.whatsapp: " + this.whatsapp);
+            this.whatsapp.listener.listen(config);
+
+            this.whatsappRoute = this.whatsapp.whatsappRoute;
+
+            winston.info("PubModulesManager initialized apps.");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') { 
+                winston.info("PubModulesManager init apps module not found");
+            }else {
+                winston.info("PubModulesManager error initializing init apps module", err);
+            }
+        }
+        
 
         try {
             this.activityArchiver = require('./activities').activityArchiver;

package/pubmodules/rules/conciergeBot.js

@@ -198,7 +198,7 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
                                 "Chat closed", 
                                 request.id_project,
                                 'system', 
-                                {subtype:"info/support", "updateconversation" : false, messagelabel: {key: "CHAT_CLOSED"}},  
+                                {subtype:"info/support", "updateconversation" : false, messagelabel: {key: "CHAT_CLOSED"}},   // TODO send request.closed_by <- c'è il campo l'ho verificato
                                 undefined,
                                 request.language
                             );
@@ -228,7 +228,7 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
                                 request.request_id,
                                 "Chat reopened", 
                                 request.id_project,
-                                'system',                                      
+                                'system',                                       //changed from false to true 6Aug22 because reopen from dashboard history doesn't update convs in ionic
                                 {subtype:"info/support", "updateconversation" : true, messagelabel: {key: "CHAT_REOPENED"}},
                                 undefined,
                                 request.language

package/pubmodules/trigger/rulesTrigger.js

@@ -65,6 +65,9 @@ class RulesTrigger {
             });
           });
 
+
+
+          // da aggiungere in dashboard
           requestEvent.on('request.participants.join',  function(data) {      
             let request = data.request;
             let member = data.member;
@@ -82,10 +85,10 @@ class RulesTrigger {
             // operatingHoursService.projectIsOpenNow(request.id_project, function (isOpen, err) {   
             that.exec(message, 'message.create.from.requester', success, error);
           });
-  // not in use
-          // messageEvent.on('message.received', function(request) {
-          //   that.exec(request, 'message.received', success, error);
-          // });
+  
+          messageEvent.on('message.received', function(message) {
+            that.exec(message, 'message.received', success, error);
+          });
 
           // event2Event.on('*', function(event){
           //   winston.verbose('event2Event this.event: ' + this.event);

package/pubmodules/whatsapp/index.js

@@ -0,0 +1,7 @@
+const listener = require("./listener");
+
+const whatsapp = require("@tiledesk/tiledesk-whatsapp-connector");
+const whatsappRoute = whatsapp.router;
+
+
+module.exports = { listener: listener, whatsappRoute: whatsappRoute }

package/pubmodules/whatsapp/listener.js

@@ -0,0 +1,32 @@
+const whatsapp = require("@tiledesk/tiledesk-whatsapp-connector");
+var winston = require('../../config/winston');
+var configGlobal = require('../../config/global');
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+winston.info('Whatsapp apiUrl: ' + apiUrl);
+
+class Listener {
+
+    listen(config) {
+        winston.info("WhatsApp Listener listen");
+        if (config.databaseUri) {
+            winston.debug("whatsapp config databaseUri: " + config.databaseUri);
+        }
+
+        whatsapp.startApp({
+            MONGODB_URL: config.databaseUri,          
+            API_URL: apiUrl,
+            GRAPH_URL: process.env.META_GRAPH_URL || config.graphUrl,
+            BASE_URL: apiUrl + "/modules/whatsapp",                     
+            APPS_API_URL: apiUrl + "/modules/apps",                 
+            log: process.env.WHATSAPP_LOG
+        }, () => {
+            winston.info("Tiledesk WhatsApp Connector proxy server succesfully started.");
+        })
+
+    }
+}
+
+var listener = new Listener();
+
+module.exports = listener;

package/routes/email.js

@@ -17,10 +17,10 @@ router.get('/templates/:templateid',
 router.post('/test/send', 
  async (req, res) => {
   let to = req.body.to;
-  winston.info("to",to);
+  winston.debug("to",to);
 
   let configEmail = req.body.config;
-  winston.info("configEmail", configEmail);
+  winston.debug("configEmail", configEmail);
 
   emailService.sendTest(to, configEmail, function(err,obj) {
     // winston.info("sendTest rest", err, obj);
@@ -29,4 +29,28 @@ router.post('/test/send',
     
 });
 
+
+router.post('/send', 
+ async (req, res) => {
+  let to = req.body.to;
+  winston.info("to: " + to);
+
+  let text = req.body.text;
+  winston.info("text: " + text);
+
+  let request_id = req.body.request_id;
+  winston.info("request_id: " + request_id);
+
+  let subject = req.body.subject;
+  winston.info("subject: " + subject);
+
+  winston.info("req.project", req.project);
+
+             //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage)
+  emailService.sendEmailDirect(to, text, req.project, request_id, subject, undefined, undefined);
+  
+  res.json({"queued": true});
+    
+});
+
 module.exports = router;

package/routes/faq_kb.js

@@ -1,7 +1,7 @@
 var express = require('express');
 var router = express.Router();
 var Faq_kb = require("../models/faq_kb");
-var Faq= require("../models/faq");
+var Faq = require("../models/faq");
 var Department = require("../models/department");
 var faqService = require("../services/faqService");
 const botEvent = require('../event/botEvent');
@@ -14,11 +14,11 @@ var upload = multer()
 
 
 router.post('/', function (req, res) {
-    winston.info('create BOT ', req.body);
-    //create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template)
-    faqService.create(req.body.name, req.body.url, req.projectid, req.user.id, req.body.type, req.body.description, undefined, undefined, req.body.language, req.body.template).then(function(savedFaq_kb) {
-      res.json(savedFaq_kb);
-    });
+  winston.info('create BOT ', req.body);
+  //create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template)
+  faqService.create(req.body.name, req.body.url, req.projectid, req.user.id, req.body.type, req.body.description, undefined, undefined, req.body.language, req.body.template).then(function (savedFaq_kb) {
+    res.json(savedFaq_kb);
+  });
 
 });
 
@@ -27,7 +27,7 @@ router.post('/train', function (req, res) {
 
   winston.info('train BOT ', req.body);
 
-  Faq_kb.findById(req.body.id_faq_kb).exec(function(err, faq_kb) {
+  Faq_kb.findById(req.body.id_faq_kb).exec(function (err, faq_kb) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error getting object.' });
     }
@@ -36,59 +36,59 @@ router.post('/train', function (req, res) {
     }
     winston.debug('faq_kb ', faq_kb.toJSON());
 
-    winston.debug('faq_kb.type :'+ faq_kb.type);
-    if (faq_kb.type =="internal" && faq_kb.url) {
+    winston.debug('faq_kb.type :' + faq_kb.type);
+    if (faq_kb.type == "internal" && faq_kb.url) {
 
 
 
-      var train =   {
-        language:faq_kb.language,
-        nlu:[]
+      var train = {
+        language: faq_kb.language,
+        nlu: []
       };
-      winston.info("train", train);     
-      
-
-      var query = { "id_project": req.projectid, "id_faq_kb": req.body.id_faq_kb};
-
-      Faq.find(query) 
-      .limit(10000)
-      .lean().               
-       exec(async (err, faqs) => {
-         if (err) {
-           return res.status(500).send({ success: false, msg: 'Error getting object.' });
-         }
-         if (faqs && faqs.length>0) {
-          winston.info("faqs exact", faqs);              
-
-          faqs.forEach(function(f) {
-            var intent = {
-              intent:f.intent_display_name,
-              examples:[]
-            }
-            var questions = f.question.split("\n");
-            winston.info("questions", questions);
-
-            questions.forEach(function(q) {
-              winston.info("q", q);
-              intent.examples.push(q);
-            });       
-            winston.info("intent", intent);
-            train.nlu.push(intent);            
-          });
-          winston.info("train", train);
-
-          try {
-            var trainHttp = await httpUtil.call(faq_kb.url+"/trainandload", undefined, train, "POST");
-          }catch(e) {
-            winston.error("error training", e);
+      winston.info("train", train);
+
+
+      var query = { "id_project": req.projectid, "id_faq_kb": req.body.id_faq_kb };
+
+      Faq.find(query)
+        .limit(10000)
+        .lean().
+        exec(async (err, faqs) => {
+          if (err) {
+            return res.status(500).send({ success: false, msg: 'Error getting object.' });
           }
-          
+          if (faqs && faqs.length > 0) {
+            winston.info("faqs exact", faqs);
+
+            faqs.forEach(function (f) {
+              var intent = {
+                intent: f.intent_display_name,
+                examples: []
+              }
+              var questions = f.question.split("\n");
+              winston.info("questions", questions);
+
+              questions.forEach(function (q) {
+                winston.info("q", q);
+                intent.examples.push(q);
+              });
+              winston.info("intent", intent);
+              train.nlu.push(intent);
+            });
+            winston.info("train", train);
+
+            try {
+              var trainHttp = await httpUtil.call(faq_kb.url + "/trainandload", undefined, train, "POST");
+            } catch (e) {
+              winston.error("error training", e);
+            }
+
 
-          return res.json({train:train, httpResponse:trainHttp});
-          // return res.json(trainHttp);
-         }else {
-          return res.status(400).send({ success: false, msg: 'no faq to  train on external bot.' });
-         }
+            return res.json({ train: train, httpResponse: trainHttp });
+            // return res.json(trainHttp);
+          } else {
+            return res.status(400).send({ success: false, msg: 'no faq to  train on external bot.' });
+          }
         });
     } else {
       winston.debug('external query: ');
@@ -97,28 +97,28 @@ router.post('/train', function (req, res) {
 
   });
 
-    /*
-  {
-    "language":"it",
-    "nlu":[
-       {
-          "intent":"eta",
-          "examples":[
-             "quanti anni hai",
-             "dimmi la tua età",
-             "quanto sei grande",
-             "parlami della tua età"
-          ]
-       },
-       {
-          "intent":"brutteparole",
-          "examples":[
-             "non dire parolacce",
-             "le brutte parole non dovrebbero dirsi"
-          ]
-       }
-    ]
- }
+  /*
+{
+  "language":"it",
+  "nlu":[
+     {
+        "intent":"eta",
+        "examples":[
+           "quanti anni hai",
+           "dimmi la tua età",
+           "quanto sei grande",
+           "parlami della tua età"
+        ]
+     },
+     {
+        "intent":"brutteparole",
+        "examples":[
+           "non dire parolacce",
+           "le brutte parole non dovrebbero dirsi"
+        ]
+     }
+  ]
+}
 */
 
 });
@@ -128,7 +128,7 @@ router.post('/askbot', function (req, res) {
 
   winston.debug('ASK BOT ', req.body);
 
-  Faq_kb.findById(req.body.id_faq_kb).exec(function(err, faq_kb) {
+  Faq_kb.findById(req.body.id_faq_kb).exec(function (err, faq_kb) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error getting object.' });
     }
@@ -136,73 +136,73 @@ router.post('/askbot', function (req, res) {
       return res.status(404).send({ success: false, msg: 'Object not found.' });
     }
     winston.debug('faq_kb ', faq_kb.toJSON());
-    winston.debug('faq_kb.type :'+ faq_kb.type);
-    if (faq_kb.type =="internal" || faq_kb.type =="tilebot") {
+    winston.debug('faq_kb.type :' + faq_kb.type);
+    if (faq_kb.type == "internal" || faq_kb.type == "tilebot") {
+
 
 
 
-      
 
-      var query = { "id_project": req.projectid, "id_faq_kb": req.body.id_faq_kb, "question": req.body.question};
+      var query = { "id_project": req.projectid, "id_faq_kb": req.body.id_faq_kb, "question": req.body.question };
 
-      Faq.find(query) 
-      .lean().               
-       exec(function (err, faqs) {
-         if (err) {
-           return res.status(500).send({ success: false, msg: 'Error getting object.' });
-         }
-         if (faqs && faqs.length>0) {
-          winston.debug("faqs exact", faqs);              
+      Faq.find(query)
+        .lean().
+        exec(function (err, faqs) {
+          if (err) {
+            return res.status(500).send({ success: false, msg: 'Error getting object.' });
+          }
+          if (faqs && faqs.length > 0) {
+            winston.debug("faqs exact", faqs);
 
-          faqs.forEach(f => {
-            f.score = 100;
-          });
-          var result = {hits:faqs};
+            faqs.forEach(f => {
+              f.score = 100;
+            });
+            var result = { hits: faqs };
 
 
-          res.json(result);
-         }else {
-          query = { "id_project": req.projectid, "id_faq_kb": req.body.id_faq_kb};
+            res.json(result);
+          } else {
+            query = { "id_project": req.projectid, "id_faq_kb": req.body.id_faq_kb };
 
-          var search_obj = {"$search": req.body.question};
+            var search_obj = { "$search": req.body.question };
 
-          if (faq_kb.language) {
+            if (faq_kb.language) {
               search_obj["$language"] = faq_kb.language;
+            }
+            query.$text = search_obj;
+            winston.debug("fulltext search query", query);
+
+
+            winston.debug('internal ft query: ' + query);
+
+            Faq.find(query, { score: { $meta: "textScore" } })
+              .sort({ score: { $meta: "textScore" } }) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
+              .lean().
+              exec(function (err, faqs) {
+                if (err) {
+                  winston.error('Error getting object.', err);
+                  return res.status(500).send({ success: false, msg: 'Error getting fulltext object.' });
+                }
+
+                winston.debug("faqs", faqs);
+
+                var result = { hits: faqs };
+                res.json(result);
+              });
+
+
           }
-          query.$text = search_obj;
-          winston.debug("fulltext search query", query);  
-
-
-          winston.debug('internal ft query: '+ query);
-    
-           Faq.find(query,  {score: { $meta: "textScore" } })  
-           .sort( { score: { $meta: "textScore" } } ) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
-           .lean().               
-            exec(function (err, faqs) {
-              if (err) {
-                winston.error('Error getting object.', err);      
-                return res.status(500).send({ success: false, msg: 'Error getting fulltext object.' });
-              }
-    
-               winston.debug("faqs", faqs);              
-    
-               var result = {hits:faqs};
-               res.json(result);
-            });
 
-            
-         }
 
-         
-       });
+        });
+
 
-     
-    }else {
+    } else {
       winston.debug('external query: ');
       return res.status(400).send({ success: false, msg: 'askbot on external bot.' });
     }
-   
-    
+
+
   });
 
 });
@@ -214,26 +214,26 @@ router.put('/:faq_kbid', function (req, res) {
   winston.debug(req.body);
 
   var update = {};
-  if (req.body.name!=undefined) {
+  if (req.body.name != undefined) {
     update.name = req.body.name;
   }
-  if (req.body.description!=undefined) {
+  if (req.body.description != undefined) {
     update.description = req.body.description;
   }
-  if (req.body.url!=undefined) {
+  if (req.body.url != undefined) {
     update.url = req.body.url;
   }
-  if (req.body.webhook_url!=undefined) {
+  if (req.body.webhook_url != undefined) {
     update.webhook_url = req.body.webhook_url;
   }
-  if (req.body.webhook_enabled!=undefined) {
+  if (req.body.webhook_enabled != undefined) {
     update.webhook_enabled = req.body.webhook_enabled;
   }
-  
-  if (req.body.type!=undefined) {
+
+  if (req.body.type != undefined) {
     update.type = req.body.type;
   }
-  if (req.body.trashed!=undefined) {
+  if (req.body.trashed != undefined) {
     update.trashed = req.body.trashed;
   }
 
@@ -321,10 +321,10 @@ router.get('/', function (req, res) {
    */
   var query = { "id_project": req.projectid, "trashed": { $in: [null, false] } };
 
-  if (req.query.all!="true") {
+  if (req.query.all != "true") {
     query.type = { $ne: "identity" }
   }
-  
+
   winston.debug("query", query);
 
   Faq_kb.find(query, function (err, faq_kb) {
@@ -347,86 +347,134 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
   let json_string = req.file.buffer.toString('utf-8');
   winston.debug("json_string: ", json_string);
 
-  Faq_kb.findById(id_faq_kb, (err, faq_kb) => {
-    if (err) {
-      winston.error("GET FAQ-KB ERROR", err);
-      return res.status(500).send({ success: false, msg: "Error getting bot." }); 
-    }
-    if (!faq_kb) {
-      return res.status(404).send({ success: false, msg: 'Bot not found.'});
-    }
+  if (req.query.intentsOnly == "true") {
 
-    const json = JSON.parse(json_string);
+    winston.info("intents only")
 
-    if (json.webhook_enabled) {
-      faq_kb.webhook_enabled = json.webhook_enabled;
-    }
-    if (json.webhook_url) {
-      faq_kb.webhook_url = json.webhook_url;
-    }
-    if (json.language) {
-      faq_kb.language = json.language;
-    }
-    if (json.name) {
-      faq_kb.name = json.name;
-    }
-    if (json.description) {
-      faq_kb.description = json.description;
-    }
+    const json = JSON.parse(json_string)
+    console.log("\n intents --> \n")
+    console.log(json)
+
+    json.intents.forEach((intent) => {
 
-    Faq_kb.findByIdAndUpdate(id_faq_kb, faq_kb, { new: true }, (err, updatedFaq_kb) => {
+      var new_faq = new Faq({
+        id_faq_kb: id_faq_kb,
+        id_project: req.projectid,
+        createdBy: req.user.id,
+        question: intent.question,
+        answer: intent.answer,
+        reply: intent.reply,
+        form: intent.form,
+        enabled: intent.enabled,
+        webhook_enabled: intent.webhook_enabled,
+        language: intent.language,
+
+      })
+
+      new_faq.save((err, savedFaq) => {
+        if (err) {
+          winston.error("GET FAQ-KB ERROR", err);
+          if (err.code == 11000) {
+            return res.status(409).send({ success: false, msg: 'Duplicate intent_display_name.' });
+          } else {
+            winston.debug('--- > ERROR ', err)
+            return res.status(500).send({ success: false, msg: 'Error saving intent.' });
+          }
+        }
+        winston.debug("NEW FAQ CREATED WITH ID: ", savedFaq._id);
+        faqBotEvent.emit('faq.create', savedFaq);
+      })
+
+    })
+
+    return res.status(200).send({ success: true, msg: "Intents imported successfully"})
+
+  } else {
+
+    Faq_kb.findById(id_faq_kb, (err, faq_kb) => {
       if (err) {
-        return res.status(500).send({ success: false, msg: "Error updating bot." }); 
+        winston.error("GET FAQ-KB ERROR", err);
+        return res.status(500).send({ success: false, msg: "Error getting bot." });
       }
-      
-      botEvent.emit('faqbot.update', updatedFaq_kb);
-
-      json.intents.forEach((intent) => {
-        
-        var new_faq = new Faq({
-          id_faq_kb: updatedFaq_kb._id,
-          id_project: req.projectid,
-          createdBy: req.user.id,
-          question: intent.question,
-          answer: intent.answer,
-          reply: intent.reply,
-          form: intent.form,
-          enabled: intent.enabled,
-          webhook_enabled: intent.webhook_enabled,
-          language: intent.language,
-          
-        })
-        
-        new_faq.save((err, savedFaq) => {
-          if (err) {
-            winston.error("GET FAQ-KB ERROR", err);
-            if (err.code == 11000) {
-              return res.status(409).send({ success: false, msg: 'Duplicate intent_display_name.' });
-            } else {
-              winston.debug('--- > ERROR ', err)
-              return res.status(500).send({ success: false, msg: 'Error saving intent.' });
-            }  
-          }
-          winston.debug("NEW FAQ CREATED WITH ID: ", savedFaq._id);
-          faqBotEvent.emit('faq.create', savedFaq);
+      if (!faq_kb) {
+        return res.status(404).send({ success: false, msg: 'Bot not found.' });
+      }
+
+      const json = JSON.parse(json_string);
+
+      if (json.webhook_enabled) {
+        faq_kb.webhook_enabled = json.webhook_enabled;
+      }
+      if (json.webhook_url) {
+        faq_kb.webhook_url = json.webhook_url;
+      }
+      if (json.language) {
+        faq_kb.language = json.language;
+      }
+      if (json.name) {
+        faq_kb.name = json.name;
+      }
+      if (json.description) {
+        faq_kb.description = json.description;
+      }
+
+      Faq_kb.findByIdAndUpdate(id_faq_kb, faq_kb, { new: true }, (err, updatedFaq_kb) => {
+        if (err) {
+          return res.status(500).send({ success: false, msg: "Error updating bot." });
+        }
+
+        botEvent.emit('faqbot.update', updatedFaq_kb);
+
+        json.intents.forEach((intent) => {
+
+          var new_faq = new Faq({
+            id_faq_kb: updatedFaq_kb._id,
+            id_project: req.projectid,
+            createdBy: req.user.id,
+            question: intent.question,
+            answer: intent.answer,
+            reply: intent.reply,
+            form: intent.form,
+            enabled: intent.enabled,
+            webhook_enabled: intent.webhook_enabled,
+            language: intent.language,
+
+          })
+
+          new_faq.save((err, savedFaq) => {
+            if (err) {
+              winston.error("GET FAQ-KB ERROR", err);
+              if (err.code == 11000) {
+                return res.status(409).send({ success: false, msg: 'Duplicate intent_display_name.' });
+              } else {
+                winston.debug('--- > ERROR ', err)
+                return res.status(500).send({ success: false, msg: 'Error saving intent.' });
+              }
+            }
+            winston.debug("NEW FAQ CREATED WITH ID: ", savedFaq._id);
+            faqBotEvent.emit('faq.create', savedFaq);
+          })
+
         })
-        
-      })
 
-      res.send(updatedFaq_kb);
+        return res.send(updatedFaq_kb);
+
+      })
 
     })
-    
-  }) 
+  }
 
 })
 
 router.get('/exportjson/:id_faq_kb', (req, res) => {
 
+  winston.info("exporting bot...")
+
+
   let id_faq_kb = req.params.id_faq_kb;
 
   Faq_kb.findById(id_faq_kb, (err, faq_kb) => {
-    if (err){
+    if (err) {
       winston.error('GET FAQ-KB ERROR ', err)
       return res.status(500).send({ success: false, msg: 'Error getting bot.' });
     } else {
@@ -434,9 +482,9 @@ router.get('/exportjson/:id_faq_kb', (req, res) => {
 
 
       faqService.getAll(id_faq_kb).then((faqs) => {
-        
-        const intents = faqs.map(({_id, id_project, topic, status, id_faq_kb, createdBy, intent_id, createdAt, updatedAt, __v, ...keepAttrs}) => keepAttrs)
-      
+
+        const intents = faqs.map(({ _id, id_project, topic, status, id_faq_kb, createdBy, intent_id, createdAt, updatedAt, __v, ...keepAttrs }) => keepAttrs)
+
         let json = {
           webhook_enabled: faq_kb.webhook_enabled,
           webhook_url: faq_kb.webhook_url,
@@ -446,10 +494,20 @@ router.get('/exportjson/:id_faq_kb', (req, res) => {
           intents: intents
         }
 
-        let json_string = JSON.stringify(json);
+        if (req.query.intentsOnly == 'true') {
+          let intents_obj = {
+            intents: intents
+          }
+          let intents_string = JSON.stringify(intents_obj);
+          res.set({ "Content-Disposition": "attachment; filename=\"intents.txt\"" });
+          return res.send(intents_string);
+
+        } else {
+          let json_string = JSON.stringify(json);
+          res.set({ "Content-Disposition": "attachment; filename=\"bot.txt\"" });
+          return res.send(json_string);
+        }
 
-        res.set({"Content-Disposition":"attachment; filename=\"bot.txt\""});
-        return res.send(json_string);
 
       }).catch((err) => {
         winston.error('GET FAQ ERROR: ', err)
@@ -457,7 +515,7 @@ router.get('/exportjson/:id_faq_kb', (req, res) => {
       })
     }
   })
-  
+
 })
 
 

package/routes/lead.js

@@ -88,6 +88,10 @@ router.put('/:leadid', function (req, res) {
     if (req.body.email!=undefined) {
       leadEvent.emit('lead.email.update', updatedLead);
     }
+
+    if (req.body.email!=undefined || req.body.fullname!=undefined) {
+      leadEvent.emit('lead.fullname.email.update', updatedLead);
+    }
   
     res.json(updatedLead);
   });

package/services/emailService.js

@@ -1030,7 +1030,7 @@ class EmailService {
 
   }
 
-
+  
   
   async sendEmailChannelNotification(to, message, project, tokenQueryString, sourcePage) {
 
@@ -1360,10 +1360,6 @@ class EmailService {
   }
 
 
-
-
-
-
 /*
   sendEmailChannelTakingNotification(to, request, project, tokenQueryString) {
 
@@ -1411,6 +1407,102 @@ class EmailService {
   }
 */
 
+
+
+
+
+
+  
+async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage) {
+
+  var that = this;
+
+
+  if (project.toJSON) {
+    project = project.toJSON();
+  }
+
+  var html = await this.readTemplate('emailDirect.html', project.settings);
+
+  var envTemplate = process.env.EMAIL_DIRECT_HTML_TEMPLATE;
+    winston.debug("envTemplate: " + envTemplate);
+
+  if (envTemplate) {
+      html = envTemplate;
+  }
+
+  winston.debug("html: " + html);
+
+  var template = handlebars.compile(html);
+
+  var baseScope = JSON.parse(JSON.stringify(that));
+  delete baseScope.pass;
+
+
+  let msgText = text;
+  msgText = encode(msgText);
+  if (this.markdown) {
+    msgText = marked(msgText);
+  }
+  
+  winston.debug("msgText: " + msgText);
+  winston.debug("baseScope: " + JSON.stringify(baseScope));
+  
+
+  var replacements = {        
+    project: project,
+    seamlessPage: sourcePage,
+    msgText: msgText,
+    tokenQueryString: tokenQueryString,
+    baseScope: baseScope    
+  };
+
+  var html = template(replacements);
+  winston.debug("html: " + html);
+
+  
+  let replyTo;
+  if (this.replyEnabled) {
+    replyTo = request_id + this.inboundDomainDomainWithAt;
+  }
+
+  let from;
+  let configEmail;
+  if (project && project.settings && project.settings.email) {
+    if (project.settings.email.config) {
+      configEmail = project.settings.email.config;
+      winston.verbose("custom email configEmail setting found: ", configEmail);
+    }
+    if (project.settings.email.from) {
+      from = project.settings.email.from;
+      winston.verbose("custom from email setting found: "+ from);
+    }
+  }
+
+
+  // if (message.request && message.request.lead && message.request.lead.email) {
+  //   winston.info("message.request.lead.email: " + message.request.lead.email);
+  //   replyTo = replyTo + ", "+ message.request.lead.email;
+  // }
+
+  // if (!subject) {
+  //   subject = "Tiledesk"
+  // }
+  
+  that.send({
+    from:from, 
+    to:to, 
+    replyTo: replyTo, 
+    subject:subject,
+    text:html, 
+    html:html,
+    config:configEmail, 
+  }); 
+  
+}
+
+
+
   // ok
   async sendPasswordResetRequestEmail(to, resetPswRequestId, userFirstname, userLastname) {
 
@@ -1693,6 +1785,5 @@ async sendRequestTranscript(to, messages, request, project) {
 
 var emailService = new EmailService();
 
-//  emailService.sendTest("abc@abc.it");
 
 module.exports = emailService;

package/services/leadService.js

@@ -130,6 +130,7 @@ class LeadService {
         leadEvent.emit('lead.update', updatedLead);
         leadEvent.emit('lead.email.update', updatedLead);
         leadEvent.emit('lead.fullname.update', updatedLead);
+        leadEvent.emit('lead.fullname.email.update', updatedLead);
         return resolve(updatedLead);
       });
     });

package/services/requestService.js

@@ -63,7 +63,8 @@ class RequestService {
 
 
   sendMessageUpdateLead() {
-    leadEvent.on('lead.fullname.update', function(lead) {
+    leadEvent.on('lead.fullname.email.update', function(lead) {
+      winston.debug("lead.fullname.email.update ");
       // leadEvent.on('lead.update', function(lead) {
       
       setImmediate(() => {

package/template/email/beenInvitedExistingUser.html

@@ -94,7 +94,7 @@
                           {{currentUserFirstname}} {{currentUserLastname}} has invited you to the TileDesk project <strong> {{projectName}}</strong> 
                         </h2>
 
-                        <br> <br<strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">Hi {{invitedUserFirstname}} {{invitedUserLastname}},</strong>
+                        <br> <br><strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">Hi {{invitedUserFirstname}} {{invitedUserLastname}},</strong>
                         
                         <br> <br>
                         I invited you to take on the role of  {{invitedUserRole}} of the TileDesk <strong> {{projectName}}</strong> project

package/template/email/beenInvitedNewUser.html

@@ -95,7 +95,7 @@
                         {{currentUserFirstname}} {{currentUserLastname}} has invited you to the Tiledesk project <strong> {{projectName}}</strong> 
                         </h2>
 
-                        <br> <br<strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">{{to}},</strong>
+                        <br> <br><strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">{{to}},</strong>
                         
                         <br> <br>
                         I invited you to take on the role of {{invitedUserRole}} of the Tiledesk <strong> {{projectName}}</strong> project

package/template/email/emailDirect.html

@@ -0,0 +1,121 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+
+  <head>
+    <meta name="viewport" content="width=device-width" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>New Ticket from TileDesk</title>
+
+    <style type="text/css">
+      img {
+        max-width: 100%;
+        margin-left:16px;
+        margin-bottom:16px;
+        text-align:center !important;
+      }
+      body {
+        -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em;
+      }
+      body {
+        background-color: #f6f6f6;
+      }
+
+      @media only screen and (max-width: 640px) {
+        body {
+          padding: 0 !important;
+        }
+        h1 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+          text-align:center !important;
+        }
+        h2 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h3 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h4 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h1 {
+          font-size: 22px !important;
+        }
+        h2 {
+          font-size: 18px !important;
+        }
+        h3 {
+          font-size: 16px !important;
+        }
+        .container {
+          padding: 0 !important; width: 100% !important;
+        }
+        .content {
+          padding: 0 !important;
+        }
+        .content-wrap {
+          padding: 10px !important;
+        }
+        .invoice {
+          width: 100% !important;
+        }
+      }
+    </style>
+  </head>
+
+  <body itemscope itemtype="http://schema.org/EmailMessage" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6">
+
+    {{#if baseScope.replyEnabled}}
+        <div>\# Please type your reply above this line \#</div>
+    {{/if}}
+
+            <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background-color: #fff; margin: 0; border: 1px solid #e9e9e9;" bgcolor="#fff">
+            
+            <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+			<td class="alert alert-warning" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 16px; vertical-align: top; font-weight: 500; text-align: center; border-radius: 3px 3px 0 0; margin: 0;" align="center"  valign="top">
+              
+                <div style="text-align:center">
+                  <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
+                    <!-- <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:20%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd"> -->
+                    <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
+                  </a>
+                </div>
+              </td>
+            </tr>
+           
+              
+              <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                <td class="content-wrap" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 20px;" valign="top">
+                  <table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                                     
+
+                   
+
+                    <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                      <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                            <div style="white-space: pre-wrap;">{{{msgText}}}</div>
+                      </td>
+                    </tr>
+                                  
+
+
+                  
+                    <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                      <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+            <div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
+              <table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                  <td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">
+                    <span><a href="http://www.tiledesk.com" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;" > Tiledesk.com </a></span>
+                    <!-- <br><span><a href="%unsubscribe_url%"  style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">Unsubscribe</a></span>  -->
+                 </td>
+                </tr>
+              </table>
+
+  </body>
+</html>

package/test/example-json-intents.txt

@@ -0,0 +1 @@
+{"intents":[{"webhook_enabled":false,"enabled":true,"question":"\\start","answer":"Hello","intent_display_name":"start","language":"en"},{"webhook_enabled":false,"enabled":true,"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","language":"en"}]}

package/test/faqkbRoute.js

@@ -148,6 +148,54 @@ describe('FaqKBRoute', () => {
             })
         })
 
+        it('import json (intents only)', (done) => {
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+
+            userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
+                projectService.create("test-faqkb-create", savedUser._id).then(function (savedProject) {
+                    
+                    chai.request(server)
+                        .post('/' + savedProject._id + '/faq_kb')
+                        .auth(email, pwd)
+                        .send({ "name": "testbot", type: "internal", language: 'fr' })
+                        .end((err, res) => {
+                            console.log("res.body: ", res.body);
+                            res.should.have.status(200);
+                            res.body.should.be.a('object');
+                            expect(res.body.name).to.equal("testbot");
+                            expect(res.body.language).to.equal("fr");
+                            let id_faq_kb = res.body._id;
+
+                            chai.request(server)
+                                .post('/' + savedProject._id + '/faq_kb/importjson/' + id_faq_kb + '?intentsOnly=true')
+                                .auth(email, pwd)
+                                .set('Content-Type', 'text/plain')
+                                .attach('uploadFile',  fs.readFileSync(path.resolve(__dirname, './example-json-intents.txt')), 'example-json-intents.txt') 
+                                .end((err, res) => {
+                                    console.log("import (intents only) json res: ", res.body);
+                                    res.should.have.status(200);
+                                    //res.should.be.a('object');
+                                    //expect(res.body.success).to.equal(true);
+
+                                    chai.request(server)
+                                        .get('/' + savedProject._id + '/faq?id_faq_kb=' + id_faq_kb)
+                                        .auth(email, pwd)
+                                        .end((err, res) => {
+                                            console.log("faq_list: ", res.body);
+                                            res.should.have.status(200);
+                                            res.body.should.be.an('array').that.is.not.empty;
+            
+                                            done();
+            
+                                        })
+                                })
+                        })
+                })
+            })
+        })
+
 
         it('export json', (done) => {
 
@@ -199,6 +247,56 @@ describe('FaqKBRoute', () => {
 
         }).timeout(20000);
 
+        it('export json (intents only)', (done) => {
+
+
+            //   this.timeout();
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+
+            userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
+                projectService.create("test-faqkb-create", savedUser._id).then(function (savedProject) {
+                    
+                    chai.request(server)
+                        .post('/' + savedProject._id + '/faq_kb')
+                        .auth(email, pwd)
+                        .send({ "name": "testbot", type: "internal", template: "example", language: 'fr' })
+                        .end((err, res) => {
+                            //console.log("res",  res);
+                            console.log("res.body", res.body);
+                            res.should.have.status(200);
+                            res.body.should.be.a('object');
+                            expect(res.body.name).to.equal("testbot");
+                            expect(res.body.language).to.equal("fr");
+                            let id_faq_kb = res.body._id;
+                            console.log("res.body._id: ", res.body._id)
+
+                            chai.request(server)
+                                .get('/' + savedProject._id + '/faq?id_faq_kb=' + id_faq_kb)
+                                .auth(email, pwd)
+                                .end((err, res) => {
+                                    console.log("faq_list: ", res.body);
+                                    res.should.have.status(200);
+                                    res.body.should.be.an('array').that.is.not.empty;
+
+                                    chai.request(server)
+                                        .get('/' + savedProject._id + '/faq_kb/exportjson/' + id_faq_kb + "?intentsOnly=true")
+                                        .auth(email, pwd)
+                                        .end((err, res) => {
+                                            console.log("export json res: ", res.body);
+                                            res.should.have.status(200);
+                                            //res.body.should.be.a('string');
+
+                                            done();
+                                        })
+                                })
+                        });
+                });
+            });
+
+        }).timeout(20000);
+
 
         // mocha test/faqkbRoute.js  --grep 'train'
         it('train', (done) => {