@tiledesk/tiledesk-server 2.3.50 → 2.3.52

package/CHANGELOG.md

@@ -1,13 +1,23 @@
 
 
-💥 TILEDESK SERVER v2.3.48 💥
+💥 TILEDESK SERVER v2.3.51 💥
 🚀        TAGGED AND PUBLISHED ON NPM           🚀
 🚀        IN PRODUCTION                        🚀
-(https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.48) 
+(https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.51) 
 
-# Untagged
+# 2.3.51
+- Added message.received as trigger event
+- Added import chatbot
+- Fix lead.fullname.email.update event
+
+# 2.3.50
 - Added new email sending endpoint 
 - Emails endpoint is now usable by agents
+- Added route for tiledesk-apps
+- Added route for tiledesk-whatsapp
+- Added route for tiledesk-kaleyra
+- Updated widget.json file
+- Fixed template for: beenInvitedNewUser.html beenInvitedExistingUser.html
 
 # 2.3.49 -> PROD 
 - @tiledesk/tiledesk-tybot-connector": "^0.1.22

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.50",
+  "version": "2.3.52",
   "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,9 +36,8 @@
     "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"
   },
   "dependencies": {
-    "@tiledesk/tiledesk-apps": "^1.0.6",
+    "@tiledesk/tiledesk-apps": "^1.0.9",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.19",
-    "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.5",
     "@tiledesk/tiledesk-chat21-app": "^1.1.7",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",

package/pubmodules/canned/cannedResponseRoute.js

@@ -121,7 +121,7 @@ router.get('/', function (req, res) {
   winston.debug('CannedResponse ROUTE - SKIP PAGE ', skip);
 
   // var query = { "id_project": req.projectid, "status": {$lt:1000}};
-  var query = {"id_project": req.projectid, "status": { $lt:1000 }, $or:[ { shared: true }, { createdBy: req.user._id } ] }
+  var query = {"id_project": req.projectid, "status": { $lt:1000 }, $or:[ { shared: true }, { shared : { $exists: false }}, { createdBy: req.user._id } ] }
 
   if (req.query.full_text) {
     winston.debug('CannedResponse ROUTE req.query.fulltext', req.query.full_text);

package/pubmodules/pubModulesManager.js

@@ -27,9 +27,6 @@ class PubModulesManager {
         this.whatsapp = undefined;
         this.whatsappRoute = undefined;
 
-        this.kaleyra = undefined;
-        this.kaleyraRoute = undefined;
-
         this.activityArchiver = undefined;
         this.activityRoute = undefined;
 
@@ -70,10 +67,6 @@ class PubModulesManager {
             app.use('/modules/whatsapp', this.whatsappRoute);
             winston.info("ModulesManager whatsappRoute controller loaded");
         }
-        if (this.kaleyraRoute) {
-            app.use('/modules/kaleyra', this.kaleyraRoute);
-            winston.info("ModulesManager kaleyraRoute controller loaded");
-        }
         if (this.tilebotRoute) {
             app.use('/modules/tilebot', this.tilebotRoute);
             winston.info("ModulesManager tilebot controller loaded");       
@@ -269,22 +262,7 @@ class PubModulesManager {
                 winston.info("PubModulesManager error initializing init apps module", err);
             }
         }
-
-        try {
-            this.kaleyra = require('./kaleyra');
-            winston.debug("this.kaleyra: " + this.kaleyra);
-            this.kaleyra.listener.listen(config);
-
-            this.kaleyraRoute = this.kaleyra.kaleyraRoute;
-
-            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/scheduler/tasks/closeAgentUnresponsiveRequestTask.js

@@ -90,7 +90,12 @@ findUnresponsiveRequests() {
           winston.verbose("CloseAgentUnresponsiveRequestTask: Request closed with request_id: " + request.request_id);
           // winston.info("Request closed",updatedStatusRequest);
         }).catch(function(err) {
-          winston.error("CloseAgentUnresponsiveRequestTask: Error closing the request with request_id: " + request.request_id, err);
+          if (process.env.HIDE_CLOSE_REQUEST_ERRORS == true || process.env.HIDE_CLOSE_REQUEST_ERRORS == "true" ) {
+
+          } else {
+            winston.error("CloseAgentUnresponsiveRequestTask: Error closing the request with request_id: " + request.request_id, err);
+          }
+          
         })
      
       });

package/pubmodules/scheduler/tasks/closeBotUnresponsiveRequestTask.js

@@ -65,6 +65,7 @@ findUnresponsiveRequests() {
     
   // db.getCollection('requests').find({"hasBot":true, "status": { "$lt": 1000 }, "createdAt":  { "$lte" :new ISODate("2020-11-28T20:15:31Z")} }).count()
     
+
     var query = {hasBot:true, status: { $lt: 1000 }, createdAt:  { $lte :new Date(Date.now() - this.queryAfterTimeout ).toISOString()} };
 
     if (this.queryProject) {
@@ -101,7 +102,12 @@ findUnresponsiveRequests() {
           winston.info("CloseBotUnresponsiveRequestTask: Request closed with request_id: " + request.request_id);
           // winston.info("Request closed",updatedStatusRequest);
         }).catch(function(err) {
-          winston.error("CloseBotUnresponsiveRequestTask: Error closing the request with request_id: " + request.request_id, err);
+          if (process.env.HIDE_CLOSE_REQUEST_ERRORS == true || process.env.HIDE_CLOSE_REQUEST_ERRORS == "true" ) {
+
+          } else {
+            winston.error("CloseBotUnresponsiveRequestTask: Error closing the request with request_id: " + request.request_id, err);
+          }
+          
         })
 
       });

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/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/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/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) => {

package/pubmodules/kaleyra/index.js

@@ -1,6 +0,0 @@
-const listener = require('./listener');
-
-const kaleyra = require('@tiledesk/tiledesk-kaleyra-proxy');
-const kaleyraRoute = kaleyra.router;
-
-module.exports = { listener: listener, kaleyraRoute: kaleyraRoute }

package/pubmodules/kaleyra/listener.js

@@ -1,32 +0,0 @@
-const kaleyra = require("@tiledesk/tiledesk-kaleyra-proxy");
-var winston = require('../../config/winston');
-var configGlobal = require('../../config/global');
-
-const apiUrl = process.env.API_URL || configGlobal.apiUrl;
-winston.info("Kaleyra apiUrl: " + apiUrl);
- 
-class Listener {
-
-    listen(config) {
-        winston.info("Kaleyra Listener listen");
-        if (config.databaseUri) {
-            winston.debug("kaleyra config databaseUri: " + config.databaseUri);
-        }
-
-        kaleyra.startApp({
-            MONGODB_URL: config.databaseUri,
-            API_URL: apiUrl,
-            BASE_URL: apiUrl + "/modules/kaleyra",
-            APPS_API_URL: apiUrl + "/modules/apps",
-            KALEYRA_API_URL: process.env.KALEYRA_API_URL,
-            API_KEY: process.env.API_KEY,
-            log: process.env.KALEYRA_LOG
-        }, () => {
-            winston.info("Tiledesk Kaleyra proxy server succesfully started.");
-        })
-    }
-}
-
-var listener = new Listener();
-
-module.exports = listener;