@tiledesk/tiledesk-server 2.3.75 → 2.3.76

package/middleware/passport.js

@@ -33,9 +33,26 @@ const maskOptions = {
   unmaskedEndDigits : 3 // Should be positive Integer
   };
 
+var alg = process.env.GLOBAL_SECRET_ALGORITHM;
+winston.info('Authentication Global Algorithm : ' + alg);
 
-var configSecret = process.env.GLOBAL_SECRET_OR_PUB_KEY || process.env.GLOBAL_SECRET || config.secret;
+// TODO STAMPA ANCHE PUBLIC
 
+var configSecret = process.env.GLOBAL_SECRET || config.secret;
+
+var pKey = process.env.GLOBAL_SECRET_OR_PUB_KEY;
+// console.log("pKey",pKey);
+
+if (pKey) {
+  configSecret = pKey.replace(/\\n/g, '\n');
+}
+// console.log("configSecret",configSecret);
+// if (process.env.GLOBAL_SECRET_OR_PUB_KEY) {
+//   console.log("GLOBAL_SECRET_OR_PUB_KEY defined");
+
+// }else {
+//   console.log("GLOBAL_SECRET_OR_PUB_KEY undefined");
+// }
 
 var maskedconfigSecret = MaskData.maskPhone(configSecret, maskOptions);
 winston.info('Authentication Global Secret : ' + maskedconfigSecret);

package/models/faq_kb.js

@@ -84,7 +84,10 @@ var Faq_kbSchema = new Schema({
     type: String,
     required: false,
     default: 'none'
-  }
+  },
+  tags: [{
+      type: String
+    }]
 },{
   timestamps: true
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.75",
+  "version": "2.3.76",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -37,14 +37,15 @@
   },
   "dependencies": {
     "@tiledesk/tiledesk-apps": "^1.0.12",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.19",
-    "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.6",
     "@tiledesk/tiledesk-chat21-app": "^1.1.7",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
+    "@tiledesk/tiledesk-dialogflow-connector": "^1.8.3",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
+    "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.6",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.51",
-    "@tiledesk/tiledesk-dialogflow-connector": "^1.8.3",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.53",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.19",
+    "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.20.0",
@@ -54,7 +55,6 @@
     "csv-express": "^1.2.2",
     "debug": "^4.3.4",
     "dotenv": "^8.6.0",
-    "amqplib": "^0.5.5",
     "email-templates": "^8.1.0",
     "eventemitter2": "^6.4.4",
     "express": "^4.17.3",
@@ -64,6 +64,7 @@
     "fast-csv": "^4.3.6",
     "geoip-lite": "^1.4.5",
     "handlebars": "^4.7.7",
+    "handlebars-dateformat": "^1.1.3",
     "html-entities": "^2.3.3",
     "http": "0.0.0",
     "immutable": "^4.1.0",

package/pubmodules/dialogflow/listener.js

@@ -50,6 +50,7 @@ class Listener {
                         if (err) {
                          return winston.error('error saving faqkb dialogflow ', err)
                         }
+                        botEvent.emit("faqbot.update",savedFaq_kb); //cache invalidation
                         winston.verbose('Saved faqkb dialogflow', savedFaq_kb.toObject())      
                     });
                 }

package/pubmodules/emailNotification/requestNotification.js

@@ -24,7 +24,16 @@ var configGlobal = require('../../config/global');
 
 var widgetConfig = require('../../config/widget');
 var widgetTestLocation = process.env.WIDGET_TEST_LOCATION || widgetConfig.testLocation;
-let configSecret = process.env.GLOBAL_SECRET_OR_PRIVATE_KEY || process.env.GLOBAL_SECRET || config.secret;
+
+
+let configSecret = process.env.GLOBAL_SECRET || config.secret;
+
+var pKey = process.env.GLOBAL_SECRET_OR_PRIVATE_KEY;
+// console.log("pKey",pKey);
+
+if (pKey) {
+  configSecret = pKey.replace(/\\n/g, '\n');
+}
 
 let apiUrl = process.env.API_URL || configGlobal.apiUrl;
 winston.debug('********* RequestNotification apiUrl: ' + apiUrl);

package/pubmodules/rasa/listener.js

@@ -56,6 +56,7 @@ class Listener {
                         if (err) {
                          return winston.error('error saving faqkb rasa ', err)
                         }
+                        botEvent.emit("faqbot.update",savedFaq_kb); //cache invalidation
                         winston.verbose('Saved faqkb rasa', savedFaq_kb.toObject())      
                     });
                 }

package/pubmodules/tilebot/listener.js

@@ -69,6 +69,7 @@ class Listener {
                         if (err) {
                          return winston.error('error saving faqkb tilebot ', err)
                         }
+                        botEvent.emit("faqbot.update",savedFaq_kb); //cache invalidation
                         winston.verbose('Saved faqkb tilebot', savedFaq_kb.toObject())      
                     });
                 }

package/routes/auth.js

@@ -24,7 +24,15 @@ var validtoken = require('../middleware/valid-token');
 var PendingInvitation = require("../models/pending-invitation");
 const { check, validationResult } = require('express-validator');
 var UserUtil = require('../utils/userUtil');
-let configSecret = process.env.GLOBAL_SECRET_OR_PRIVATE_KEY || process.env.GLOBAL_SECRET || config.secret;
+
+let configSecret = process.env.GLOBAL_SECRET || config.secret;
+var pKey = process.env.GLOBAL_SECRET_OR_PRIVATE_KEY;
+// console.log("pKey",pKey);
+
+if (pKey) {
+  configSecret = pKey.replace(/\\n/g, '\n');
+}
+
 // const fs  = require('fs');
 // var configSecret = fs.readFileSync('private.key');
 
@@ -540,7 +548,7 @@ router.put('/requestresetpsw', function (req, res) {
           emailService.sendPasswordResetRequestEmail(updatedUser.email, updatedUser.resetpswrequestid, updatedUser.firstname, updatedUser.lastname);
 
 
-         
+        //  TODO emit user.update?
           authEvent.emit('user.requestresetpassword', {updatedUser:updatedUser, req:req});
 
           
@@ -598,7 +606,7 @@ router.put('/resetpsw/:resetpswrequestid', function (req, res) {
 
         emailService.sendYourPswHasBeenChangedEmail(saveUser.email, saveUser.firstname, saveUser.lastname);
 
-            
+            //  TODO emit user.update?
         authEvent.emit('user.resetpassword', {saveUser:saveUser, req:req});
  
 

package/routes/faq_kb.js

@@ -12,6 +12,7 @@ const { forEach } = require('lodash');
 var multer = require('multer')
 var upload = multer()
 var configGlobal = require('../config/global');
+const faq = require('../models/faq');
 
 let chatbot_templates_api_url = process.env.CHATBOT_TEMPLATES_API_URL
 
@@ -250,6 +251,10 @@ router.put('/:faq_kbid', function (req, res) {
     update.intentsEngine = req.body.intentsEngine;
   }
 
+  if (req.body.tags != undefined) {
+    update.tags = req.body.tags;
+  }
+
   Faq_kb.findByIdAndUpdate(req.params.faq_kbid, update, { new: true, upsert: true }, function (err, updatedFaq_kb) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error updating object.' });
@@ -314,6 +319,7 @@ router.delete('/:faq_kbid', function (req, res) {
 
   winston.debug(req.body);
 
+ 
   Faq_kb.remove({ _id: req.params.faq_kbid }, function (err, faq_kb) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error deleting object.' });
@@ -475,6 +481,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
         id_project: req.projectid,
         createdBy: req.user.id,
         intent_display_name: intent.intent_display_name,
+        intent_id: intent.intent_id,
         question: intent.question,
         answer: intent.answer,
         reply: intent.reply,
@@ -524,7 +531,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
   } else {
 
     if (req.query.create && req.query.create == 'true') {
-      faqService.create(json.name, undefined, req.projectid, req.user.id, "tilebot", json.description, json.webhook_url, json.webhook_enabled, json.language, undefined, undefined, undefined).then((savedFaq_kb) => {
+      faqService.create(json.name, undefined, req.projectid, req.user.id, "tilebot", json.description, json.webhook_url, json.webhook_enabled, json.language, undefined, undefined, undefined, json.attributes).then((savedFaq_kb) => {
         winston.debug("saved (and imported) faq kb: ", savedFaq_kb);
         botEvent.emit('faqbot.create', savedFaq_kb);
 
@@ -535,6 +542,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
             id_project: req.projectid,
             createdBy: req.user.id,
             intent_display_name: intent.intent_display_name,
+            intent_id: intent.intent_id,
             question: intent.question,
             answer: intent.answer,
             reply: intent.reply,
@@ -617,6 +625,9 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
         if (json.description) {
           faq_kb.description = json.description;
         }
+        if (json.attributes) {
+          faq_kb.attributes = json.attributes;
+        }
   
         Faq_kb.findByIdAndUpdate(id_faq_kb, faq_kb, { new: true }, (err, updatedFaq_kb) => {
           if (err) {
@@ -632,6 +643,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
               id_project: req.projectid,
               createdBy: req.user.id,
               intent_display_name: intent.intent_display_name,
+              intent_id: intent.intent_id,
               question: intent.question,
               answer: intent.answer,
               reply: intent.reply,
@@ -687,7 +699,6 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
     }
 
   }
-
 })
 
 router.get('/exportjson/:id_faq_kb', (req, res) => {
@@ -704,10 +715,10 @@ router.get('/exportjson/:id_faq_kb', (req, res) => {
     } else {
       winston.debug('FAQ-KB: ', faq_kb)
 
-
       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)
+        // delete from exclude map intent_id
+        const intents = faqs.map(({ _id, id_project, topic, status, id_faq_kb, createdBy, createdAt, updatedAt, __v, ...keepAttrs }) => keepAttrs)
 
         let json = {
           webhook_enabled: faq_kb.webhook_enabled,
@@ -715,6 +726,7 @@ router.get('/exportjson/:id_faq_kb', (req, res) => {
           language: faq_kb.language,
           name: faq_kb.name,
           description: faq_kb.description,
+          attributes: faq_kb.attributes,
           intents: intents
         }
 

package/routes/images.js

@@ -192,11 +192,11 @@ uploadAvatar.single('file'), (req, res, next) => {
     
 
      var destinationFolder = 'uploads/users/' + userid + "/images/";
-     winston.info("destinationFolder:"+destinationFolder);
+     winston.debug("destinationFolder:"+destinationFolder);
 
      var thumFilename = destinationFolder+'thumbnails_200_200-photo.jpg';
 
-     winston.info("req.file.filename:"+req.file.filename);
+     winston.debug("req.file.filename:"+req.file.filename);
      fileService.getFileDataAsBuffer(req.file.filename).then(function(buffer) {
 
       sharp(buffer).resize(200, 200).toBuffer((err, resizeImage, info) => {

package/services/faqService.js

@@ -8,7 +8,7 @@ const ActionsConstants = require('../models/actionsConstants');
 class FaqService {
 
 
-  create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template, mainCategory, intentsEngine) {
+  create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template, mainCategory, intentsEngine, attributes) {
     var that = this;
     return new Promise(function (resolve, reject) {
 
@@ -28,7 +28,8 @@ class FaqService {
           intentsEngine: intentsEngine,
           trashed: false,
           createdBy: user_id,
-          updatedBy: user_id
+          updatedBy: user_id,
+          attributes: attributes
         });
              
 
@@ -101,9 +102,55 @@ class FaqService {
 
       if (template==="blank") {
 
+        // faqsArray = [         
+        //   { 'question': '\\start', 'answer': 'Hello', '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              
+        // ]
         faqsArray = [         
-          { 'question': '\\start', 'answer': 'Hello', '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': '\\start',
+            "actions" : [ 
+              {
+                  "_tdActionType" : "reply",
+                  "text" : "Hi, how can I help you?",
+                  "attributes" : {
+                      "commands" : [ 
+                          {
+                              "type" : "message",
+                              "message" : {
+                                  "type" : "text",
+                                  "text" : "Hi, how can I help you?"
+                              }
+                          }
+                      ]
+                  }
+              }
+            ],
+            'intent_display_name': 'start',
+            'topic': 'internal'
+          },            
+          {
+            'question': 'defaultFallback',
+            "actions" : [ 
+              {
+                  "_tdActionType" : "reply",
+                  "text" : "I didn't understand. Can you rephrase your question?",
+                  "attributes" : {
+                      "commands" : [ 
+                          {
+                              "type" : "message",
+                              "message" : {
+                                  "type" : "text",
+                                  "text" : "I didn't understand. Can you rephrase your question?"
+                              }
+                          }
+                      ]
+                  }
+              }
+            ],
+            'intent_display_name': 'defaultFallback',
+            'topic': 'internal'
+          }, //TODO se metto spazio n * nn va              
         ]
 
       }

package/services/subscriptionNotifier.js

@@ -92,7 +92,15 @@ class SubscriptionNotifier {
               signOptions.algorithm = alg;
             }
 
-            secret = process.env.GLOBAL_SECRET_OR_PRIVATE_KEY || process.env.GLOBAL_SECRET || config.secret;   
+            secret = process.env.GLOBAL_SECRET || config.secret;   
+            var pKey = process.env.GLOBAL_SECRET_OR_PRIVATE_KEY;
+            // console.log("pKey",pKey);
+
+            if (pKey) {
+              secret = pKey.replace(/\\n/g, '\n');
+            }
+
+
           }
     
           var token = jwt.sign(sJson, secret, signOptions); //priv_jwt pp_jwt

package/websocket/webSocketServer.js

@@ -22,7 +22,16 @@ var cacheUtil = require('../utils/cacheUtil');
 var mongoose = require('mongoose');
 const requestConstants = require("../models/requestConstants");
 var RoleConstants = require('../models/roleConstants');
-let configSecretOrPubicKay = process.env.GLOBAL_SECRET_OR_PUB_KEY || process.env.GLOBAL_SECRET || config.secret;   
+
+let configSecretOrPubicKay = process.env.GLOBAL_SECRET || config.secret;   
+
+var pKey = process.env.GLOBAL_SECRET_OR_PUB_KEY;
+// console.log("pKey",pKey);
+
+if (pKey) {
+  configSecretOrPubicKay = pKey.replace(/\\n/g, '\n');
+}
+
 var cacheEnabler = require("../services/cacheEnabler");
 
 
@@ -92,7 +101,7 @@ class WebSocketServer {
                         //   winston.debug('hasRoleAsPromise project_user',project_user);
                           // winston.debug('ok websocket');
 
-                          User.findOne({_id: identifier, status: 100}, 'email firstname lastname emailverified id')
+                          User.findOne({_id: identifier, status: 100}, 'email firstname lastname emailverified id')     //TODO user_cache_here ma attento select.. ATTENTO SERVER SELECT??
                             //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+identifier)    //user_cache
                             .exec(function (err, user) {