@tiledesk/tiledesk-server 2.4.83 → 2.4.84

package/CHANGELOG.md

@@ -5,6 +5,10 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.4.84
+- Updated tybot-connector to 0.2.38
+- Updated whatsapp-connector to 0.1.58
+
 # 2.4.83
 - Improved whatsapp log services
 - Updated whatsapp-connector to 0.1.57

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.83",
+  "version": "2.4.84",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -45,8 +45,8 @@
     "@tiledesk/tiledesk-messenger-connector": "^0.1.13",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.2.30",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.57",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.38",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.58",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.7",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",

package/routes/auth.js

@@ -379,7 +379,16 @@ router.post('/signinWithCustomToken', [
           winston.debug('project user already exists ');
 
           if (project_user.status==="active") {
-            return res.json({ success: true, token: req.headers["authorization"], user: userToReturn });
+
+            if (req.user.role && (req.user.role === RoleConstants.OWNER || req.user.role === RoleConstants.ADMIN || req.user.role === RoleConstants.AGENT)) {
+              let userFromDB = await User.findOne({email: req.user.email , status: 100}).exec();
+              return res.json({ success: true, token: req.headers["authorization"], user: userFromDB });
+
+            } else {
+              return res.json({ success: true, token: req.headers["authorization"], user: userToReturn });
+            }
+
+
           } else {
             winston.warn('Authentication failed. Project_user not active.');
             return res.status(401).send({ success: false, msg: 'Authentication failed. Project_user not active.' });

package/routes/faq.js

@@ -13,6 +13,10 @@ const botEvent = require('../event/botEvent');
 const uuidv4 = require('uuid/v4');
 csv = require('csv-express');
 csv.separator = ';';
+const axios = require("axios").default;
+var configGlobal = require('../config/global');
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
 
 // POST CSV FILE UPLOAD FROM CLIENT
 router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next) {
@@ -200,6 +204,122 @@ router.post('/', function (req, res) {
   });
 });
 
+router.post('/ops_update', async (req, res) => {
+
+  let id_faq_kb = req.body.id_faq_kb;
+  let operations = req.body.operations;
+
+  for (let op of operations) {
+    let HTTPREQUEST;
+    let id;
+
+    // method post
+    switch (op.type) {
+      case 'post':
+        HTTPREQUEST = {
+          url: apiUrl + '/' + req.projectid + '/faq/',
+          headers: {
+            'Content-Type': 'application/json',
+            'Authorization': req.headers.authorization
+          },
+          json: op.intent,
+          method: 'post'
+        }
+        winston.debug("operation HTTPREQUEST: ", HTTPREQUEST);
+        myrequest(
+          HTTPREQUEST, async (err, resbody) => {
+            if (err) {
+              winston.error("err performing operation: ", err);
+            } else {
+              winston.debug("\n\nresbody operation: ", resbody);
+            }
+          }
+        )
+        break;
+
+      // method put
+      case 'put':
+        id = op.intent._id;
+        if (op.intent.intent_id) {
+          id = "intentId" + op.intent.intent_id;
+        }
+        HTTPREQUEST = {
+          url: apiUrl + '/' + req.projectid + '/faq/' + id,
+          headers: {
+            'Content-Type': 'application/json',
+            'Authorization': req.headers.authorization
+          },
+          json: op.intent,
+          method: 'put'
+        }
+        winston.debug("operation HTTPREQUEST: ", HTTPREQUEST);
+        myrequest(
+          HTTPREQUEST, async (err, resbody) => {
+            if (err) {
+              winston.error("err performing operation: ", err);
+            } else {
+              winston.debug("\n\nresbody operation: ", resbody);
+            }
+          }
+        )
+        break;
+
+      // method patch
+      case 'patch':
+        HTTPREQUEST = {
+          url: apiUrl + '/' + req.projectid + '/faq/' + op.intent._id + '/attributes',
+          headers: {
+            'Content-Type': 'application/json',
+            'Authorization': req.headers.authorization
+          },
+          json: op.intent.attributes,
+          method: 'patch'
+        }
+        winston.debug("operation HTTPREQUEST: ", HTTPREQUEST);
+        myrequest(
+          HTTPREQUEST, async (err, resbody) => {
+            if (err) {
+              winston.error("err performing operation: ", err);
+            } else {
+              winston.debug("\n\nresbody operation: ", resbody);
+            }
+          }
+        )
+        break;
+
+      // method delete
+      case 'delete':
+        id = op.intent._id;
+        if (op.intent.intent_id) {
+          id = "intentId" + op.intent.intent_id;
+        }
+        HTTPREQUEST = {
+          url: apiUrl + '/' + req.projectid + '/faq/' + id + '?id_faq_kb=' + id_faq_kb,
+          headers: {
+            'Content-Type': 'application/json',
+            'Authorization': req.headers.authorization
+          },
+          method: 'delete'
+        }
+        winston.debug("operation HTTPREQUEST: ", HTTPREQUEST);
+        myrequest(
+          HTTPREQUEST, async (err, resbody) => {
+            if (err) {
+              winston.error("err performing operation: ", err);
+            } else {
+              winston.debug("\n\nresbody operation: ", resbody);
+            }
+          }
+        )
+        break;
+    }
+  }
+
+  res.status(200).send({ success: true });
+
+
+})
+
 router.patch('/:faqid/attributes', function (req, res) {
   let data = req.body;
   winston.debug("data: ", data);
@@ -259,7 +379,7 @@ router.put('/:faqid', function (req, res) {
   let faqid = req.params.faqid;
 
   if (!req.body.id_faq_kb) {
-    return res.status(422).send({ err: "Missing id_faq_kb in Request Body"})
+    return res.status(422).send({ err: "Missing id_faq_kb in Request Body" })
   }
   let id_faq_kb = req.body.id_faq_kb;
 
@@ -307,7 +427,7 @@ router.put('/:faqid', function (req, res) {
 
   if (faqid.startsWith("intentId")) {
     let intent_id = faqid.substring(8);
-    Faq.findOneAndUpdate({ id_faq_kb: id_faq_kb, intent_id: intent_id }, update, { new: true, upsert: true}, (err, updatedFaq) => {
+    Faq.findOneAndUpdate({ id_faq_kb: id_faq_kb, intent_id: intent_id }, update, { new: true, upsert: true }, (err, updatedFaq) => {
       if (err) {
         if (err.code == 11000) {
           return res.status(409).send({ success: false, msg: 'Duplicate  intent_display_name.' });
@@ -318,12 +438,12 @@ router.put('/:faqid', function (req, res) {
 
       faqBotEvent.emit('faq.update', updatedFaq);
       //faqBotEvent.emit('faq_train.update', updatedFaq.id_faq_kb);
-  
+
       res.status(200).send(updatedFaq);
     })
 
   } else {
-    
+
     Faq.findByIdAndUpdate(req.params.faqid, update, { new: true, upsert: true }, function (err, updatedFaq) {
       if (err) {
         if (err.code == 11000) {
@@ -332,10 +452,10 @@ router.put('/:faqid', function (req, res) {
           return res.status(500).send({ success: false, msg: 'Error updating object.' });
         }
       }
-  
+
       faqBotEvent.emit('faq.update', updatedFaq);
       //faqBotEvent.emit('faq_train.update', updatedFaq.id_faq_kb);
-  
+
       res.status(200).send(updatedFaq);
       // updateRemoteFaq(updatedFaq)
     });
@@ -354,11 +474,11 @@ router.delete('/:faqid', function (req, res) {
   if (req.query && req.query.id_faq_kb) {
     id_faq_kb = req.query.id_faq_kb;
   }
-  
+
   if (faqid.startsWith("intentId")) {
     let intent_id = faqid.substring(8);
     if (!id_faq_kb) {
-      return res.status(500).send({ success: false, msg: "Unable to delete object. Query param 'id_faq_kb' is mandatory if you want to delete via intent_id"})
+      return res.status(500).send({ success: false, msg: "Unable to delete object. Query param 'id_faq_kb' is mandatory if you want to delete via intent_id" })
     }
 
     Faq.findOneAndDelete({ intent_id: intent_id, id_faq_kb: id_faq_kb }, (err, faq) => {
@@ -367,14 +487,14 @@ router.delete('/:faqid', function (req, res) {
       }
 
       if (!faq) {
-        return res.status(404).send({ success: false, msg: "Error deleting object. The object does not exists."})
+        return res.status(404).send({ success: false, msg: "Error deleting object. The object does not exists." })
       }
 
       winston.debug('Deleted FAQ ', faq);
-      
+
       faqBotEvent.emit('faq.delete', faq);
       //faqBotEvent.emit('faq_train.delete', faq.id_faq_kb);
-  
+
       res.status(200).send(faq);
 
     })
@@ -385,12 +505,12 @@ router.delete('/:faqid', function (req, res) {
         return res.status(500).send({ success: false, msg: 'Error deleting object.' });
       }
       winston.debug('Deleted FAQ ', faq);
-  
+
       faqBotEvent.emit('faq.delete', faq);
       //faqBotEvent.emit('faq_train.delete', faq.id_faq_kb);
-  
+
       res.status(200).send(faq);
-  
+
     });
   }
 });
@@ -517,7 +637,32 @@ router.get('/', function (req, res, next) {
 
 });
 
+async function myrequest(options, callback) {
+
+  winston.debug("myrequest options: ", options)
+  return await axios({
+    url: options.url,
+    method: options.method,
+    data: options.json,
+    params: options.params,
+    headers: options.headers
+  }).then((res) => {
+    if (res && res.status == 200 && res.data) {
+      if (callback) {
+        callback(null, res.data);
+      }
+    }
+    else {
+      if (callback) {
+        callback(TiledeskClient.getErr({ message: "Response status not 200" }, options, res), null, null);
+      }
+    }
+  }).catch((err) => {
+    if (callback) {
+      callback(err, null, null);
+    }
+  })
+}
 
 
-
-module.exports = router;
+module.exports = router;

package/test/example-json-multiple-operation-mock.js

@@ -0,0 +1,287 @@
+// const json_multiple_operation = {
+//   "id_faq_kb": "6543c2357be357002c682908",
+//   "operations": [
+//     {
+//       "type": "delete",
+//       "intent": {
+//         "webhook_enabled": false,
+//         "enabled": true,
+//         "topic": "default",
+//         "status": "live",
+//         "actions": [
+//           {
+//             "_tdActionTitle": "",
+//             "_tdActionId": "846d1b3c-3f2c-4a53-bf07-0b0b5cc7e3dd",
+//             "_tdActionType": "close"
+//           }
+//         ],
+//         "_id": "655b46ebbaddb8002c5a889e",
+//         "id_faq_kb": "6543c2357be357002c682908",
+//         "id_project": "64a6e63d4152c9002c927891",
+//         "language": "en",
+//         "intent_display_name": "untitled_block_4",
+//         "createdBy": "5ab0f3fa57066e0014bfd71e",
+//         "intent_id": "7c25c967-3162-451c-a7de-b240d8c8265b",
+//         "attributes": {
+//           "position": {
+//             "x": 2331,
+//             "y": -611.5
+//           },
+//           "nextBlockAction": {
+//             "_tdActionId": "9f12ef32-ca5f-4bc9-8a40-76a179e9ebcb",
+//             "_tdActionType": "intent",
+//             "intentName": ""
+//           }
+//         },
+//         "createdAt": "2023-11-20T11:45:47.448Z",
+//         "updatedAt": "2023-11-20T11:45:47.448Z",
+//         "faq_kb": [
+//           {
+//             "webhook_enabled": false,
+//             "type": "tilebot",
+//             "language": "en",
+//             "public": false,
+//             "certified": false,
+//             "intentsEngine": "none",
+//             "tags": [],
+//             "score": 0,
+//             "trained": true,
+//             "certifiedTags": [],
+//             "_id": "6543c2357be357002c682908",
+//             "name": "02nov16:37",
+//             "id_project": "64a6e63d4152c9002c927891",
+//             "trashed": false,
+//             "createdBy": "5ab0f3fa57066e0014bfd71e",
+//             "createdAt": "2023-11-02T15:37:25.364Z",
+//             "updatedAt": "2023-11-02T15:37:25.400Z",
+//             "url": "https://tiledesk-server-pre.herokuapp.com/modules/tilebot/ext/6543c2357be357002c682908"
+//           }
+//         ],
+//         "id": "655b46ebbaddb8002c5a889e"
+//       }
+//     },
+//     {
+//       "type": "put",
+//       "intent": {
+//         "webhook_enabled": false,
+//         "enabled": true,
+//         "topic": "default",
+//         "status": "live",
+//         "actions": [
+//           {
+//             "_tdActionTitle": "",
+//             "_tdActionId": "bee43d8a-03d7-4b51-a22a-83c55a13eadf",
+//             "_tdActionType": "close"
+//           }
+//         ],
+//         "_id": "65579a7fbcee1b003c6dd6fb",
+//         "id_faq_kb": "6543c2357be357002c682908",
+//         "id_project": "64a6e63d4152c9002c927891",
+//         "language": "en",
+//         "intent_display_name": "untitled_block_2",
+//         "createdBy": "5ab0f3fa57066e0014bfd71e",
+//         "intent_id": "ede5cf7f-ce09-49d2-921c-55a9faf099d8",
+//         "attributes": {
+//           "position": {
+//             "x": 1904,
+//             "y": -746
+//           },
+//           "nextBlockAction": {
+//             "_tdActionId": "481701dd-661d-45ee-97ec-7034720eb235",
+//             "_tdActionType": "intent",
+//             "intentName": ""
+//           }
+//         },
+//         "createdAt": "2023-11-17T16:53:19.856Z",
+//         "updatedAt": "2023-11-20T14:56:51.089Z",
+//         "answer": "",
+//         "question": "",
+//         "faq_kb": [
+//           {
+//             "webhook_enabled": false,
+//             "type": "tilebot",
+//             "language": "en",
+//             "public": false,
+//             "certified": false,
+//             "intentsEngine": "none",
+//             "tags": [],
+//             "score": 0,
+//             "trained": true,
+//             "certifiedTags": [],
+//             "_id": "6543c2357be357002c682908",
+//             "name": "02nov16:37",
+//             "id_project": "64a6e63d4152c9002c927891",
+//             "trashed": false,
+//             "createdBy": "5ab0f3fa57066e0014bfd71e",
+//             "createdAt": "2023-11-02T15:37:25.364Z",
+//             "updatedAt": "2023-11-02T15:37:25.400Z",
+//             "url": "https://tiledesk-server-pre.herokuapp.com/modules/tilebot/ext/6543c2357be357002c682908"
+//           }
+//         ],
+//         "id": "65579a7fbcee1b003c6dd6fb"
+//       }
+//     },
+//     {
+//       "type": "put",
+//       "intent": {
+//         "webhook_enabled": false,
+//         "enabled": true,
+//         "topic": "default",
+//         "status": "live",
+//         "actions": [
+//           {
+//             "_tdActionTitle": "",
+//             "_tdActionId": "34f6ae25-829b-4d9c-8899-5ba85a53861b",
+//             "_tdActionType": "reply",
+//             "attributes": {
+//               "disableInputMessage": false,
+//               "commands": [
+//                 {
+//                   "type": "wait",
+//                   "time": 500
+//                 },
+//                 {
+//                   "type": "message",
+//                   "message": {
+//                     "type": "text",
+//                     "text": "A chat message will be sent to the visitor ...",
+//                     "attributes": {
+//                       "attachment": {
+//                         "type": "template",
+//                         "buttons": [
+//                           {
+//                             "uid": "5d18e074bded4b4b8ff2724cbfd44d04",
+//                             "type": "action",
+//                             "value": "Button",
+//                             "link": "",
+//                             "target": "blank",
+//                             "action": "",
+//                             "attributes": "",
+//                             "show_echo": true
+//                           }
+//                         ]
+//                       }
+//                     }
+//                   }
+//                 }
+//               ]
+//             }
+//           }
+//         ],
+//         "_id": "655b44b3baddb8002c5a8708",
+//         "id_faq_kb": "6543c2357be357002c682908",
+//         "id_project": "64a6e63d4152c9002c927891",
+//         "language": "en",
+//         "intent_display_name": "untitled_block_3",
+//         "createdBy": "5ab0f3fa57066e0014bfd71e",
+//         "intent_id": "06e171e6-614e-4092-b949-b04e21c674f0",
+//         "attributes": {
+//           "position": {
+//             "x": 1851,
+//             "y": -435
+//           },
+//           "nextBlockAction": {
+//             "_tdActionId": "9cfa41bf-ef98-4bce-b37f-18eb52e17b3a",
+//             "_tdActionType": "intent",
+//             "intentName": ""
+//           }
+//         },
+//         "createdAt": "2023-11-20T11:36:19.054Z",
+//         "updatedAt": "2023-11-20T14:42:40.825Z",
+//         "answer": "",
+//         "question": "",
+//         "faq_kb": [
+//           {
+//             "webhook_enabled": false,
+//             "type": "tilebot",
+//             "language": "en",
+//             "public": false,
+//             "certified": false,
+//             "intentsEngine": "none",
+//             "tags": [],
+//             "score": 0,
+//             "trained": true,
+//             "certifiedTags": [],
+//             "_id": "6543c2357be357002c682908",
+//             "name": "02nov16:37",
+//             "id_project": "64a6e63d4152c9002c927891",
+//             "trashed": false,
+//             "createdBy": "5ab0f3fa57066e0014bfd71e",
+//             "createdAt": "2023-11-02T15:37:25.364Z",
+//             "updatedAt": "2023-11-02T15:37:25.400Z",
+//             "url": "https://tiledesk-server-pre.herokuapp.com/modules/tilebot/ext/6543c2357be357002c682908"
+//           }
+//         ],
+//         "id": "655b44b3baddb8002c5a8708"
+//       }
+//     }
+//   ]
+// }
+
+const json_multiple_operation = {
+  "id_faq_kb": "6543c2357be357002c682908",
+  "operations": [
+    {
+      "type": "delete",
+      "intent": {
+        "webhook_enabled": false,
+        "enabled": true,
+        "topic": "default",
+        "status": "live",
+        "actions": [
+          {
+            "_tdActionTitle": "",
+            "_tdActionId": "846d1b3c-3f2c-4a53-bf07-0b0b5cc7e3dd",
+            "_tdActionType": "close"
+          }
+        ],
+        "_id": "655b46ebbaddb8002c5a889e",
+        "id_faq_kb": "6543c2357be357002c682908",
+        "id_project": "64a6e63d4152c9002c927891",
+        "language": "en",
+        "intent_display_name": "untitled_block_4",
+        "createdBy": "5ab0f3fa57066e0014bfd71e",
+        "intent_id": "7c25c967-3162-451c-a7de-b240d8c8265b",
+        "attributes": {
+          "position": {
+            "x": 2331,
+            "y": -611.5
+          },
+          "nextBlockAction": {
+            "_tdActionId": "9f12ef32-ca5f-4bc9-8a40-76a179e9ebcb",
+            "_tdActionType": "intent",
+            "intentName": ""
+          }
+        },
+        "createdAt": "2023-11-20T11:45:47.448Z",
+        "updatedAt": "2023-11-20T11:45:47.448Z",
+        "faq_kb": [
+          {
+            "webhook_enabled": false,
+            "type": "tilebot",
+            "language": "en",
+            "public": false,
+            "certified": false,
+            "intentsEngine": "none",
+            "tags": [],
+            "score": 0,
+            "trained": true,
+            "certifiedTags": [],
+            "_id": "6543c2357be357002c682908",
+            "name": "02nov16:37",
+            "id_project": "64a6e63d4152c9002c927891",
+            "trashed": false,
+            "createdBy": "5ab0f3fa57066e0014bfd71e",
+            "createdAt": "2023-11-02T15:37:25.364Z",
+            "updatedAt": "2023-11-02T15:37:25.400Z",
+            "url": "https://tiledesk-server-pre.herokuapp.com/modules/tilebot/ext/6543c2357be357002c682908"
+          }
+        ],
+        "id": "655b46ebbaddb8002c5a889e"
+      }
+    }
+  ]
+}
+
+
+module.exports = { json_multiple_operation };

package/test/faqRoute.js

@@ -5,6 +5,8 @@ var User = require('../models/user');
 var projectService = require('../services/projectService');
 var userService = require('../services/userService');
 
+const example_data = require('./example-json-multiple-operation-mock');
+
 //Require the dev-dependencies
 let chai = require('chai');
 let chaiHttp = require('chai-http');
@@ -37,6 +39,9 @@ describe('FaqKBRoute', () => {
 
             userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
                 projectService.create("test-faqkb-create", savedUser._id).then(function (savedProject) {
+
+
+                    console.log("#### savedProject: ", savedProject)
                     chai.request(server)
                         .post('/' + savedProject._id + '/faq_kb')
                         .auth(email, pwd)
@@ -359,6 +364,32 @@ describe('FaqKBRoute', () => {
             });
         })
 
+        it('updateBulkOperations', (done) => {
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+
+            userService.signup(email, pwd, "Test Firstname", "Test Lastname").then((savedUser) => {
+                projectService.create("test-updatebulkops", savedUser._id).then((savedProject) => {
+
+                    //console.log("EXAMPLE DATA: ", JSON.stringify(example_data));
+
+                    chai.request(server)
+                        .post('/' + savedProject._id + '/faq/ops_update')
+                        .auth(email, pwd)
+                        .send(example_data.json_multiple_operation) // set up the payload
+                        .end((err, res) => {
+                            if (log) { console.log("res.body", res.body); }
+                            res.should.have.status(200);
+                            res.body.should.be.a('object');
+
+                            done();
+                        })
+
+                })
+            })
+        })
+
 
         it('uploadcsv', (done) => {
 
@@ -713,4 +744,3 @@ describe('FaqKBRoute', () => {
 
 });
 
-