@tiledesk/tiledesk-server 2.10.65 → 2.10.67

package/test/webhookRoute.js

@@ -0,0 +1,376 @@
+//During the test the env variable is set to test
+process.env.NODE_ENV = 'test';
+process.env.LOG_LEVEL = 'error';
+
+var projectService = require('../services/projectService');
+var userService = require('../services/userService');
+let log = false;
+
+//Require the dev-dependencies
+let chai = require('chai');
+let chaiHttp = require('chai-http');
+let server = require('../app');
+let should = chai.should();
+var fs = require('fs');
+const path = require('path');
+
+var expect = chai.expect;
+var assert = chai.assert;
+
+chai.use(chaiHttp);
+
+describe('WebhookRoute', () => {
+
+    it('create-new-webhook', (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-webhook-create", savedUser._id).then(function (savedProject) {
+
+                chai.request(server)
+                    .post('/' + savedProject._id + '/faq_kb')
+                    .auth(email, pwd)
+                    .send({ "name": "testbot", type: "tilebot", language: "en", template: "blank" })
+                    .end((err, res) => {
+
+                        if (err) { console.error("err: ", err); }
+                        if (log) { console.log("res.body", res.body); }
+
+                        res.should.have.status(200);
+                        res.body.should.be.a('object');
+
+                        let chatbot_id = res.body._id;
+                        let webhook_intent_id = "3bfda939-ff76-4762-bbe0-fc0f0dc4c777"
+
+                        chai.request(server)
+                            .post('/' + savedProject._id + '/webhooks/')
+                            .auth(email, pwd)
+                            .send({ chatbot_id: chatbot_id, block_id: webhook_intent_id })
+                            .end((err, res) => {
+
+                                if (err) { console.error("err: ", err); }
+                                if (log) { console.log("res.body", res.body); }
+
+                                res.should.have.status(200);
+                                res.body.should.be.a('object');
+                                expect(res.body.async).to.equal(true);
+                                expect(res.body.id_project).to.equal(savedProject._id.toString());
+                                expect(res.body.chatbot_id).to.equal(chatbot_id);
+                                expect(res.body.block_id).to.equal(webhook_intent_id);
+                                should.exist(res.body.webhook_id)
+                                expect(res.body).to.haveOwnProperty('webhook_id')
+                                expect(res.body.webhook_id).to.have.length(32)
+
+                                done();
+
+                            });
+                    });
+            });
+        });
+    })
+
+    it('create-and-get-webhook', (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-webhook-create", savedUser._id).then(function (savedProject) {
+
+                chai.request(server)
+                    .post('/' + savedProject._id + '/faq_kb')
+                    .auth(email, pwd)
+                    .send({ "name": "testbot", type: "tilebot", language: "en", template: "blank" })
+                    .end((err, res) => {
+
+                        if (err) { console.error("err: ", err); }
+                        if (log) { console.log("res.body", res.body); }
+
+                        res.should.have.status(200);
+                        res.body.should.be.a('object');
+
+                        let chatbot_id = res.body._id;
+                        let webhook_intent_id = "3bfda939-ff76-4762-bbe0-fc0f0dc4c777"
+
+                        chai.request(server)
+                            .post('/' + savedProject._id + '/webhooks/')
+                            .auth(email, pwd)
+                            .send({ chatbot_id: chatbot_id, block_id: webhook_intent_id })
+                            .end((err, res) => {
+
+                                if (err) { console.error("err: ", err); }
+                                if (log) { console.log("res.body", res.body); }
+
+                                res.should.have.status(200);
+                                res.body.should.be.a('object');
+
+                                chai.request(server)
+                                    .get('/' + savedProject._id + '/webhooks/' + chatbot_id)
+                                    .auth(email, pwd)
+                                    .end((err, res) => {
+
+                                        if (err) { console.error("err: ", err); }
+                                        if (log) { console.log("res.body", res.body); }
+
+                                        res.should.have.status(200);
+                                        res.body.should.be.a('object');
+                                        expect(res.body.async).to.equal(true);
+                                        expect(res.body.id_project).to.equal(savedProject._id.toString());
+                                        expect(res.body.chatbot_id).to.equal(chatbot_id);
+                                        expect(res.body.block_id).to.equal(webhook_intent_id);
+                                        should.exist(res.body.webhook_id)
+                                        expect(res.body).to.haveOwnProperty('webhook_id')
+                                        expect(res.body.webhook_id).to.have.length(32)
+
+                                    })
+
+                                done();
+
+                            });
+                    });
+            });
+        });
+    })
+
+    it('update-webhook', (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-webhook-create", savedUser._id).then(function (savedProject) {
+
+                chai.request(server)
+                    .post('/' + savedProject._id + '/faq_kb')
+                    .auth(email, pwd)
+                    .send({ "name": "testbot", type: "tilebot", language: "en", template: "blank" })
+                    .end((err, res) => {
+
+                        if (err) { console.error("err: ", err); }
+                        if (log) { console.log("res.body", res.body); }
+
+                        res.should.have.status(200);
+                        res.body.should.be.a('object');
+
+                        let chatbot_id = res.body._id;
+                        let webhook_intent_id = "3bfda939-ff76-4762-bbe0-fc0f0dc4c777"
+
+                        chai.request(server)
+                            .post('/' + savedProject._id + '/webhooks/')
+                            .auth(email, pwd)
+                            .send({ chatbot_id: chatbot_id, block_id: webhook_intent_id })
+                            .end((err, res) => {
+
+                                if (err) { console.error("err: ", err); }
+                                if (log) { console.log("res.body", res.body); }
+
+                                res.should.have.status(200);
+                                res.body.should.be.a('object');
+                                expect(res.body.async).to.equal(true);
+
+                                chai.request(server)
+                                    .put('/' + savedProject._id + '/webhooks/' + chatbot_id)
+                                    .auth(email, pwd)
+                                    .send({ async: false })
+                                    .end((err, res) => {
+
+                                        if (err) { console.error("err: ", err); }
+                                        if (log) { console.log("res.body", res.body); }
+
+                                        res.should.have.status(200);
+                                        res.body.should.be.a('object');
+                                        expect(res.body.async).to.equal(false);
+
+                                        done();
+
+                                    });
+                            });
+
+                    });
+            });
+        });
+    })
+
+    it('rigenerate-url-webhook', (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-webhook-create", savedUser._id).then(function (savedProject) {
+
+                chai.request(server)
+                    .post('/' + savedProject._id + '/faq_kb')
+                    .auth(email, pwd)
+                    .send({ "name": "testbot", type: "tilebot", language: "en", template: "blank" })
+                    .end((err, res) => {
+
+                        if (err) { console.error("err: ", err); }
+                        if (log) { console.log("res.body", res.body); }
+
+                        res.should.have.status(200);
+                        res.body.should.be.a('object');
+
+                        let chatbot_id = res.body._id;
+                        let webhook_intent_id = "3bfda939-ff76-4762-bbe0-fc0f0dc4c777"
+
+                        chai.request(server)
+                            .post('/' + savedProject._id + '/webhooks/')
+                            .auth(email, pwd)
+                            .send({ chatbot_id: chatbot_id, block_id: webhook_intent_id })
+                            .end((err, res) => {
+
+                                if (err) { console.error("err: ", err); }
+                                if (log) { console.log("res.body", res.body); }
+
+                                res.should.have.status(200);
+                                res.body.should.be.a('object');
+
+                                let old_webhook_id = res.body.webhook_id;
+
+                                chai.request(server)
+                                    .put('/' + savedProject._id + '/webhooks/' + chatbot_id + "/regenerate")
+                                    .auth(email, pwd)
+                                    .send()
+                                    .end((err, res) => {
+
+                                        if (err) { console.error("err: ", err); }
+                                        if (log) { console.log("res.body", res.body); }
+
+                                        res.should.have.status(200);
+                                        res.body.should.be.a('object');
+                                        should.exist(res.body.webhook_id)
+                                        expect(res.body.webhook_id).to.have.length(32)
+                                        expect(res.body.webhook_id).to.not.equal(old_webhook_id);
+
+                                        done();
+
+                                    });
+                            });
+
+                    });
+            });
+        });
+    })
+
+    it('delete-webhook', (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-webhook-create", savedUser._id).then(function (savedProject) {
+
+                chai.request(server)
+                    .post('/' + savedProject._id + '/faq_kb')
+                    .auth(email, pwd)
+                    .send({ "name": "testbot", type: "tilebot", language: "en", template: "blank" })
+                    .end((err, res) => {
+
+                        if (err) { console.error("err: ", err); }
+                        if (log) { console.log("res.body", res.body); }
+
+                        res.should.have.status(200);
+                        res.body.should.be.a('object');
+
+                        let chatbot_id = res.body._id;
+                        let webhook_intent_id = "3bfda939-ff76-4762-bbe0-fc0f0dc4c777"
+
+                        chai.request(server)
+                            .post('/' + savedProject._id + '/webhooks/')
+                            .auth(email, pwd)
+                            .send({ chatbot_id: chatbot_id, block_id: webhook_intent_id })
+                            .end((err, res) => {
+
+                                if (err) { console.error("err: ", err); }
+                                if (log) { console.log("res.body", res.body); }
+
+                                res.should.have.status(200);
+                                res.body.should.be.a('object');
+
+                                chai.request(server)
+                                    .delete('/' + savedProject._id + '/webhooks/' + chatbot_id)
+                                    .auth(email, pwd)
+                                    .end((err, res) => {
+
+                                        if (err) { console.error("err: ", err); }
+                                        if (log) { console.log("res.body", res.body); }
+
+                                        res.should.have.status(200);
+                                        res.body.should.be.a('object');
+                                        expect(res.body.success).to.equal(true);
+                                        expect(res.body.message).to.equal("Webhook for chatbot " + chatbot_id +  " deleted successfully")
+
+                                        done();
+
+                                    });
+                            });
+
+                    });
+            });
+        });
+    })
+
+    it('run-webhook', (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-webhook-create", savedUser._id).then(function (savedProject) {
+
+                chai.request(server)
+                    .post('/' + savedProject._id + '/faq_kb')
+                    .auth(email, pwd)
+                    .send({ "name": "testbot", type: "tilebot", language: "en", template: "blank" })
+                    .end((err, res) => {
+
+                        if (err) { console.error("err: ", err); }
+                        if (log) { console.log("res.body", res.body); }
+
+                        res.should.have.status(200);
+                        res.body.should.be.a('object');
+
+                        let chatbot_id = res.body._id;
+                        let webhook_intent_id = "3bfda939-ff76-4762-bbe0-fc0f0dc4c777"
+
+                        chai.request(server)
+                            .post('/' + savedProject._id + '/webhooks/')
+                            .auth(email, pwd)
+                            .send({ chatbot_id: chatbot_id, block_id: webhook_intent_id })
+                            .end((err, res) => {
+
+                                if (err) { console.error("err: ", err); }
+                                if (log) { console.log("res.body", res.body); }
+
+                                res.should.have.status(200);
+                                res.body.should.be.a('object');
+
+                                let webhook_id = res.body.webhook_id;
+
+                                chai.request(server)
+                                    .post('/webhook/' + webhook_id)
+                                    .auth(email, pwd)
+                                    .end((err, res) => {
+
+                                        if (err) { console.error("err: ", err); }
+                                        if (log) { console.log("res.body", res.body); }
+
+                                        console.log("res.body", res.body);
+                                        res.should.have.status(200);
+                                        res.body.should.be.a('object');
+                                        expect(res.body.success).to.equal(true);
+                                        expect(res.body.message).to.equal("Webhook disabled in test mode");
+
+                                        done();
+
+                                    });
+                            });
+
+                    });
+            });
+        });
+    })
+});

package/test-int/bot.js

@@ -25,6 +25,7 @@ var express = require('express');
 const bodyParser = require('body-parser');
 
 var leadService = require('../services/leadService');
+const chatbotTypes = require('../models/chatbotTypes');
 
 // var http = require('http');
 // const { parse } = require('querystring');
@@ -1317,7 +1318,7 @@ describe('bot', () => {
                  userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
                      projectService.create("test-bot", savedUser._id).then(function(savedProject) {    
                         // create(name, url, projectid, user_id, type) 
-                        faqService.create("testbot", undefined, savedProject._id, savedUser._id, "internal", undefined, "http://localhost:3019/", true).then(function(savedBot) {  
+                        faqService.create("testbot", undefined, savedProject._id, savedUser._id, "internal", undefined, undefined, "http://localhost:3019/", true).then(function(savedBot) {  
                             
                             var newFaq = new Faq({
                                 id_faq_kb: savedBot._id,
@@ -1429,7 +1430,7 @@ describe('bot', () => {
                  userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
                      projectService.create("test-bot", savedUser._id).then(function(savedProject) {    
                         // create(name, url, projectid, user_id, type) 
-                        faqService.create("testbot", undefined, savedProject._id, savedUser._id, "internal", undefined, "http://localhost:3029/", true).then(function(savedBot) {  
+                        faqService.create("testbot", undefined, savedProject._id, savedUser._id, "internal", undefined, undefined, "http://localhost:3029/", true).then(function(savedBot) {  
                             
                             Faq.findOneAndUpdate({id_project:savedProject._id,id_faq_kb:savedBot._id, question: "defaultFallback" }, {webhook_enabled: true},{new: true, upsert:false}, function (err, savedFaq) {
                             console.log("savedFaq",savedFaq);
@@ -1534,7 +1535,7 @@ describe('bot', () => {
                  userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
                      projectService.create("test-bot", savedUser._id).then(function(savedProject) {    
                         // create(name, url, projectid, user_id, type) 
-                        faqService.create("testbot", undefined, savedProject._id, savedUser._id, "internal", undefined, "http://localhost:3028/", true).then(function(savedBot) {  
+                        faqService.create("testbot", undefined, savedProject._id, savedUser._id, "internal", undefined, undefined, "http://localhost:3028/", true).then(function(savedBot) {  
                             
                             Faq.findOneAndUpdate({id_project:savedProject._id,id_faq_kb:savedBot._id, question: "defaultFallback" }, {webhook_enabled: true},{new: true, upsert:false}, function (err, savedFaq) {
                             console.log("savedFaq",savedFaq);
@@ -1666,7 +1667,7 @@ describe('bot', () => {
                  userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
                      projectService.create("test-bot", savedUser._id).then(function(savedProject) {    
                         // create(name, url, projectid, user_id, type) 
-                        faqService.create("testbot", undefined, savedProject._id, savedUser._id, "internal", undefined, "http://localhost:3030/", true).then(function(savedBot) {  
+                        faqService.create("testbot", undefined, savedProject._id, savedUser._id, "internal", undefined, undefined, "http://localhost:3030/", true).then(function(savedBot) {  
                             
                             Faq.findOneAndUpdate({id_project:savedProject._id,id_faq_kb:savedBot._id, question: "defaultFallback" }, {webhook_enabled: true},{new: true, upsert:false}, function (err, savedFaq) {
                             console.log("savedFaq",savedFaq);
@@ -1802,7 +1803,7 @@ describe('bot', () => {
                  userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
                      projectService.create("test-bot", savedUser._id).then(function(savedProject) {    
                         // create(name, url, projectid, user_id, type) 
-                        faqService.create("testbot", null, savedProject._id, savedUser._id, "internal", undefined, undefined, true).then(function(savedBot) {  
+                        faqService.create("testbot", null, savedProject._id, savedUser._id, "internal", undefined, undefined, undefined, true).then(function(savedBot) {  
                             
                             var newFaq = new Faq({
                                 id_faq_kb: savedBot._id,

package/utils/httpUtil.js

@@ -2,29 +2,61 @@
 'use strict';
 
 var request = require('retry-request', {
-    request: require('request')
-  });
+  request: require('request')
+});
+const axios = require("axios").default;
+
+let defaultHeaders = {
+  'Content-Type': 'application/json'
+}
 
 
 class HttpUtil {
 
-     call(url, headers, json, method) {
-        return new Promise(function (resolve, reject) {
-            request({
-                url: url,
-                headers: headers,
-                json: json,
-                method: method
-            }, function(err, result, json){            
-                //console.log("SENT notify for bot with url " + url +  " with err " + err);
-                if (err) {
-                    //console.log("Error sending notify for bot with url " + url + " with err " + err);
-                    return reject(err);
-                }
-                return resolve(json);
-            });
-        });
-    }
+  call(url, headers, json, method) {
+    return new Promise(function (resolve, reject) {
+      request({
+        url: url,
+        headers: headers,
+        json: json,
+        method: method
+      }, function (err, result, json) {
+        //console.log("SENT notify for bot with url " + url +  " with err " + err);
+        if (err) {
+          //console.log("Error sending notify for bot with url " + url + " with err " + err);
+          return reject(err);
+        }
+        return resolve(json);
+      });
+    });
+  }
+
+  async post(url, payload, customHeaders, auth) {
+
+    return new Promise((resolve, reject) => {
+
+      let headers = customHeaders ? customHeaders : defaultHeaders;
+      if (auth) headers.Authorization = auth;
+
+      axios({
+        url: url,
+        headers: {
+          ...headers
+        },
+        data: payload,
+        method: 'POST'
+      }).then((resbody) => {
+        resolve(resbody);
+      }).catch((err) => {
+        if (err.response) {
+          reject(err.response);
+        } else {
+          reject(err);
+        }
+      })
+
+    })
+  }
 }