From 05005d153db3ebb81ef183ca181b1658a1cb1598 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sat, 25 May 2019 18:31:19 +0000 Subject: [PATCH 1/8] chore(release): 1.3.1 [skip ci] ## [1.3.1](https://github.com/pragmatismo-io/BotServer/compare/1.3.0...1.3.1) (2019-05-25) ### Bug Fixes * **core.gbapp:** Azure deployment. ([f1b8eb2](https://github.com/pragmatismo-io/BotServer/commit/f1b8eb2)) * **core.gbapp:** Azure deployment. ([49e1743](https://github.com/pragmatismo-io/BotServer/commit/49e1743)) * **core.gbapp:** Azure Deployment. ([f8fab38](https://github.com/pragmatismo-io/BotServer/commit/f8fab38)) * **core.gbapp:** ESNext in tsconfig.json to match MSFT. ([01b8dd5](https://github.com/pragmatismo-io/BotServer/commit/01b8dd5)) * **core.gbapp:** Fixing loading of instances. ([bc9c588](https://github.com/pragmatismo-io/BotServer/commit/bc9c588)) * **core.gbapp:** Investigating BASIC broken. ([f0ec25e](https://github.com/pragmatismo-io/BotServer/commit/f0ec25e)) * **core.gbapp:** package.json artifacts sync. ([01d34a6](https://github.com/pragmatismo-io/BotServer/commit/01d34a6)) * **core.gbapp:** Publishing in Azure. ([4d6779e](https://github.com/pragmatismo-io/BotServer/commit/4d6779e)) * **core.gbapp:** Removing POC code. ([56f46f4](https://github.com/pragmatismo-io/BotServer/commit/56f46f4)) * **kb.gbapp:** Typo fix. ([ba26578](https://github.com/pragmatismo-io/BotServer/commit/ba26578)) * **whatsapp.gblib:** Enabling Whatsapp. ([4351b87](https://github.com/pragmatismo-io/BotServer/commit/4351b87)) * **whatsapp.gblib:** Enabling Whatsapp. ([74f5936](https://github.com/pragmatismo-io/BotServer/commit/74f5936)) * **whatsapp.lib:** Enabling Whatsapp. ([85249e5](https://github.com/pragmatismo-io/BotServer/commit/85249e5)) --- CHANGELOG.md | 19 +++++++++++++++++++ package.json | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac7ea92f..a14a2b88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +## [1.3.1](https://github.com/pragmatismo-io/BotServer/compare/1.3.0...1.3.1) (2019-05-25) + + +### Bug Fixes + +* **core.gbapp:** Azure deployment. ([f1b8eb2](https://github.com/pragmatismo-io/BotServer/commit/f1b8eb2)) +* **core.gbapp:** Azure deployment. ([49e1743](https://github.com/pragmatismo-io/BotServer/commit/49e1743)) +* **core.gbapp:** Azure Deployment. ([f8fab38](https://github.com/pragmatismo-io/BotServer/commit/f8fab38)) +* **core.gbapp:** ESNext in tsconfig.json to match MSFT. ([01b8dd5](https://github.com/pragmatismo-io/BotServer/commit/01b8dd5)) +* **core.gbapp:** Fixing loading of instances. ([bc9c588](https://github.com/pragmatismo-io/BotServer/commit/bc9c588)) +* **core.gbapp:** Investigating BASIC broken. ([f0ec25e](https://github.com/pragmatismo-io/BotServer/commit/f0ec25e)) +* **core.gbapp:** package.json artifacts sync. ([01d34a6](https://github.com/pragmatismo-io/BotServer/commit/01d34a6)) +* **core.gbapp:** Publishing in Azure. ([4d6779e](https://github.com/pragmatismo-io/BotServer/commit/4d6779e)) +* **core.gbapp:** Removing POC code. ([56f46f4](https://github.com/pragmatismo-io/BotServer/commit/56f46f4)) +* **kb.gbapp:** Typo fix. ([ba26578](https://github.com/pragmatismo-io/BotServer/commit/ba26578)) +* **whatsapp.gblib:** Enabling Whatsapp. ([4351b87](https://github.com/pragmatismo-io/BotServer/commit/4351b87)) +* **whatsapp.gblib:** Enabling Whatsapp. ([74f5936](https://github.com/pragmatismo-io/BotServer/commit/74f5936)) +* **whatsapp.lib:** Enabling Whatsapp. ([85249e5](https://github.com/pragmatismo-io/BotServer/commit/85249e5)) + # [1.3.0](https://github.com/pragmatismo-io/BotServer/compare/1.2.2...1.3.0) (2019-05-12) diff --git a/package.json b/package.json index 24b2dd19..6441563e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "botserver", - "version": "1.3.0", + "version": "1.3.1", "description": "General Bot Community Edition open-core server.", "main": "./src/app.ts", "bugs": "https://github.com/pragmatismo-io/BotServer/issues", -- 2.39.5 From 488de3895b5604fb93e35d2c7ccdd87811907904 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sun, 26 May 2019 23:41:29 +0000 Subject: [PATCH 2/8] chore(release): 1.3.2 [skip ci] ## [1.3.2](https://github.com/pragmatismo-io/BotServer/compare/1.3.1...1.3.2) (2019-05-26) ### Bug Fixes * **core.gbapp:** Self-replication on Azure. ([2ccae38](https://github.com/pragmatismo-io/BotServer/commit/2ccae38)) * **core.gbapp:** Self-replication on Azure. ([4b7d29d](https://github.com/pragmatismo-io/BotServer/commit/4b7d29d)) --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a14a2b88..1e7d6fb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## [1.3.2](https://github.com/pragmatismo-io/BotServer/compare/1.3.1...1.3.2) (2019-05-26) + + +### Bug Fixes + +* **core.gbapp:** Self-replication on Azure. ([2ccae38](https://github.com/pragmatismo-io/BotServer/commit/2ccae38)) +* **core.gbapp:** Self-replication on Azure. ([4b7d29d](https://github.com/pragmatismo-io/BotServer/commit/4b7d29d)) + ## [1.3.1](https://github.com/pragmatismo-io/BotServer/compare/1.3.0...1.3.1) (2019-05-25) diff --git a/package.json b/package.json index 6441563e..8a5fd116 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "botserver", - "version": "1.3.1", + "version": "1.3.2", "description": "General Bot Community Edition open-core server.", "main": "./src/app.ts", "bugs": "https://github.com/pragmatismo-io/BotServer/issues", -- 2.39.5 From e283a6d003148bb41826ca8ad09702fd66bb6bb6 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Mon, 27 May 2019 11:55:26 +0000 Subject: [PATCH 3/8] chore(release): 1.3.3 [skip ci] ## [1.3.3](https://github.com/pragmatismo-io/BotServer/compare/1.3.2...1.3.3) (2019-05-27) ### Bug Fixes * **core.gbapp:** Self-replication on Azure ([bf602c6](https://github.com/pragmatismo-io/BotServer/commit/bf602c6)) * **core.gbapp:** Self-replication on Azure ([3cca504](https://github.com/pragmatismo-io/BotServer/commit/3cca504)) * **core.gbapp:** Self-replication on Azure ([05edafd](https://github.com/pragmatismo-io/BotServer/commit/05edafd)) --- CHANGELOG.md | 9 +++++++++ package.json | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e7d6fb2..ad5d9150 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [1.3.3](https://github.com/pragmatismo-io/BotServer/compare/1.3.2...1.3.3) (2019-05-27) + + +### Bug Fixes + +* **core.gbapp:** Self-replication on Azure ([bf602c6](https://github.com/pragmatismo-io/BotServer/commit/bf602c6)) +* **core.gbapp:** Self-replication on Azure ([3cca504](https://github.com/pragmatismo-io/BotServer/commit/3cca504)) +* **core.gbapp:** Self-replication on Azure ([05edafd](https://github.com/pragmatismo-io/BotServer/commit/05edafd)) + ## [1.3.2](https://github.com/pragmatismo-io/BotServer/compare/1.3.1...1.3.2) (2019-05-26) diff --git a/package.json b/package.json index ce53f299..9ae831a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "botserver", - "version": "1.3.2", + "version": "1.3.3", "description": "General Bot Community Edition open-core server.", "main": "./boot.js", "bugs": "https://github.com/pragmatismo-io/BotServer/issues", @@ -245,4 +245,4 @@ "post-merge": [] } } -} \ No newline at end of file +} -- 2.39.5 From 557bf400c9f3bd25267aa2fb5415fbffc5310648 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Mon, 27 May 2019 12:22:43 +0000 Subject: [PATCH 4/8] chore(release): 1.3.4 [skip ci] ## [1.3.4](https://github.com/pragmatismo-io/BotServer/compare/1.3.3...1.3.4) (2019-05-27) ### Bug Fixes * **core.gbapp:** Self-replication on Azure ([e82a813](https://github.com/pragmatismo-io/BotServer/commit/e82a813)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad5d9150..d2719a0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.3.4](https://github.com/pragmatismo-io/BotServer/compare/1.3.3...1.3.4) (2019-05-27) + + +### Bug Fixes + +* **core.gbapp:** Self-replication on Azure ([e82a813](https://github.com/pragmatismo-io/BotServer/commit/e82a813)) + ## [1.3.3](https://github.com/pragmatismo-io/BotServer/compare/1.3.2...1.3.3) (2019-05-27) diff --git a/package.json b/package.json index 9ae831a3..9eddc286 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "botserver", - "version": "1.3.3", + "version": "1.3.4", "description": "General Bot Community Edition open-core server.", "main": "./boot.js", "bugs": "https://github.com/pragmatismo-io/BotServer/issues", -- 2.39.5 From 7e8640fb6397bac16cbbbf748a681cb954ef25f7 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Mon, 27 May 2019 12:58:01 +0000 Subject: [PATCH 5/8] chore(release): 1.3.5 [skip ci] ## [1.3.5](https://github.com/pragmatismo-io/BotServer/compare/1.3.4...1.3.5) (2019-05-27) ### Bug Fixes * **core.gbapp:** Self-replication on Azure ([f64cc4c](https://github.com/pragmatismo-io/BotServer/commit/f64cc4c)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2719a0f..95e61ce7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.3.5](https://github.com/pragmatismo-io/BotServer/compare/1.3.4...1.3.5) (2019-05-27) + + +### Bug Fixes + +* **core.gbapp:** Self-replication on Azure ([f64cc4c](https://github.com/pragmatismo-io/BotServer/commit/f64cc4c)) + ## [1.3.4](https://github.com/pragmatismo-io/BotServer/compare/1.3.3...1.3.4) (2019-05-27) diff --git a/package.json b/package.json index 9eddc286..0551a11d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "botserver", - "version": "1.3.4", + "version": "1.3.5", "description": "General Bot Community Edition open-core server.", "main": "./boot.js", "bugs": "https://github.com/pragmatismo-io/BotServer/issues", -- 2.39.5 From 86b45332c220dbb81bc6b4e7050227b58739d1e6 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Mon, 27 May 2019 17:10:50 +0000 Subject: [PATCH 6/8] chore(release): 1.3.6 [skip ci] ## [1.3.6](https://github.com/pragmatismo-io/BotServer/compare/1.3.5...1.3.6) (2019-05-27) ### Bug Fixes * **core.gbapp:** Self-replication on Azure ([5f0fb3b](https://github.com/pragmatismo-io/BotServer/commit/5f0fb3b)) * **core.gbapp:** Self-replication on Azure ([2509157](https://github.com/pragmatismo-io/BotServer/commit/2509157)) * **core.gbapp:** Self-replication on Azure ([8850370](https://github.com/pragmatismo-io/BotServer/commit/8850370)) --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95e61ce7..24470631 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [1.3.6](https://github.com/pragmatismo-io/BotServer/compare/1.3.5...1.3.6) (2019-05-27) + + +### Bug Fixes + +* **core.gbapp:** Self-replication on Azure ([5f0fb3b](https://github.com/pragmatismo-io/BotServer/commit/5f0fb3b)) +* **core.gbapp:** Self-replication on Azure ([2509157](https://github.com/pragmatismo-io/BotServer/commit/2509157)) +* **core.gbapp:** Self-replication on Azure ([8850370](https://github.com/pragmatismo-io/BotServer/commit/8850370)) + ## [1.3.5](https://github.com/pragmatismo-io/BotServer/compare/1.3.4...1.3.5) (2019-05-27) diff --git a/package.json b/package.json index d5d477f3..4fa94b62 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "botserver", - "version": "1.3.5", + "version": "1.3.6", "description": "General Bot Community Edition open-core server.", "main": "./boot.js", "bugs": "https://github.com/pragmatismo-io/BotServer/issues", -- 2.39.5 From 4d484d0a67965a1841fcd8a9e5bea13bb7a577b1 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Tue, 4 Jun 2019 11:21:32 -0300 Subject: [PATCH 7/8] fix(core.gbapp): Self-replication on Azure --- packages/core.gbapp/services/GBMinService.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 87b1b299..7d48a084 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -232,7 +232,7 @@ export class GBMinService { */ private async sendInstanceToClient(req, bootInstance: IGBInstance, res: any, webchatToken: any) { let botId = req.params.botId; - if (botId === '[default]'|| botId === undefined) { + if (botId === '[default]' || botId === undefined) { botId = GBConfigService.get('BOT_ID'); } const instance = await this.core.loadInstance(botId); @@ -377,7 +377,7 @@ export class GBMinService { if (p.getDialogs !== undefined) { const dialogs = p.getDialogs(min); dialogs.forEach(dialog => { - min.dialogs.add(new WaterfallDialog(dialog.name, dialog.waterfall)); + min.dialogs.add(new WaterfallDialog(dialog.id, dialog.waterfall)); }); } }, this); @@ -497,6 +497,9 @@ export class GBMinService { min.sandBoxMap[mainMethod].step = step; min.sandBoxMap[mainMethod][mainMethod].bind(min.sandBoxMap[mainMethod]); await min.sandBoxMap[mainMethod][mainMethod](); + } else if (context.activity.text.charAt(0) === '/') { + await step.beginDialog(context.activity.text); + } else if (context.activity.text === 'admin') { await step.beginDialog('/admin'); -- 2.39.5 From f29c8c2343c1799b07c5de6043678aff597fbc93 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Wed, 5 Jun 2019 18:23:31 -0300 Subject: [PATCH 8/8] fix(core.gbapp): Self-replication on Azure --- package-lock.json | 6 +++--- package.json | 4 ++-- packages/core.gbapp/services/GBCoreService.ts | 15 +++++++++++++++ packages/core.gbapp/services/GBDeployer.ts | 5 +++-- .../services/CSService.ts | 2 +- src/app.ts | 2 ++ 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8a4cf0ac..8d78ccc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3013,9 +3013,9 @@ "integrity": "sha512-3BWQEbArzHkw49BCdyNxqmSnLzkrL396Q0c+VcdabT3t75wV+dc4bwzSBuLfG0KW+fBjhSR4BXM8IQfnIZU0Vg==" }, "botlib": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/botlib/-/botlib-1.2.0.tgz", - "integrity": "sha512-JXA1LkRR8GEnb2W5/3N6H+aPnJv4b5J2XV9WiHo8zp9gW87i5g/F/wo8drDcqEfSOF2ZpHD3HyEFfbBcUY6C6A==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/botlib/-/botlib-1.2.1.tgz", + "integrity": "sha512-r9mjcag3Ttq3m6p1pewx094Os+dNLDb6rcBiTdGQMFjjeKLzqrLL3NGusYytOGyZek13TKeVciT9aU5ZQGofEQ==", "requires": { "async": "2.6.2", "botbuilder": "4.4.0", diff --git a/package.json b/package.json index 8fb880a6..dfa7f170 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "botbuilder-choices": "4.0.0-preview1.2", "botbuilder-dialogs": "4.4.0", "botbuilder-prompts": "4.0.0-preview1.2", - "botlib": "1.2.0", + "botlib": "^1.2.1", "chai": "4.2.0", "child_process": "1.0.2", "chokidar": "3.0.0", @@ -246,4 +246,4 @@ "post-merge": [] } } -} \ No newline at end of file +} diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts index ef166609..bb28c303 100644 --- a/packages/core.gbapp/services/GBCoreService.ts +++ b/packages/core.gbapp/services/GBCoreService.ts @@ -39,6 +39,7 @@ import { GBLog, IGBCoreService, IGBInstallationDeployer, IGBInstance, IGBPackage } from 'botlib'; import * as fs from 'fs'; import { Sequelize } from 'sequelize-typescript'; +import { GBServer } from '../../../src/app'; import { GBAdminPackage } from '../../admin.gbapp/index'; import { GBAdminService } from '../../admin.gbapp/services/GBAdminService'; import { GBAnalyticsPackage } from '../../analytics.gblib'; @@ -261,6 +262,20 @@ STORAGE_SYNC=true } } + public installWebHook(isGet: boolean, url: string, callback: any) { + + if (isGet) { + GBServer.globals.server.get(url, (req, res) => { + callback(req, res); + }); + } else { + GBServer.globals.server.post(url, (req, res) => { + callback(req, res); + }); + + } + } + public async saveInstance(fullInstance: any) { const options = { where: {} }; options.where = { botId: fullInstance.botId }; diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index f451e2d4..578cea90 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -47,7 +47,7 @@ const graph = require('@microsoft/microsoft-graph-client'); import { GBError, GBLog, GBMinInstance, IGBCoreService, IGBInstance, IGBPackage } from 'botlib'; import { AzureSearch } from 'pragmatismo-io-framework'; import { GBServer } from '../../../src/app'; -import { GuaribasPackage, GuaribasInstance } from '../models/GBModel'; +import { GuaribasPackage } from '../models/GBModel'; import { GBAdminService } from './../../admin.gbapp/services/GBAdminService'; import { AzureDeployerService } from './../../azuredeployer.gbapp/services/AzureDeployerService'; import { KBService } from './../../kb.gbapp/services/KBService'; @@ -232,7 +232,7 @@ export class GBDeployer { switch (packageType) { case '.gbot': - await this.deployBot(localPath, min.proxyAddress); + await this.deployBot(localPath, GBServer.globals.publicAddress); case '.gbkb': const service = new KBService(this.core.sequelize); @@ -371,6 +371,7 @@ export class GBDeployer { GBLog.info(`Theme (.gbtheme) assets accessible at: /themes/${filenameOnly}.`); } else if (Path.extname(filename) === '.gbkb') { server.use(`/kb/${filenameOnly}/subjects`, express.static(urlJoin(filename, 'subjects'))); + server.use(`/kb/${filenameOnly}/images`, express.static(urlJoin(filename, 'images'))); GBLog.info(`KB (.gbkb) assets accessible at: /kb/${filenameOnly}.`); } else if (Path.extname(filename) === '.gbui') { // Already Handled diff --git a/packages/customer-satisfaction.gbapp/services/CSService.ts b/packages/customer-satisfaction.gbapp/services/CSService.ts index 4ef113e9..74ba2706 100644 --- a/packages/customer-satisfaction.gbapp/services/CSService.ts +++ b/packages/customer-satisfaction.gbapp/services/CSService.ts @@ -54,7 +54,7 @@ export class CSService { instanceId: number, questionTyped: string, questionText: string): Promise { - return GuaribasQuestionAlternate.create({ + return await GuaribasQuestionAlternate.create({ questionTyped: questionTyped, questionText: questionText }); diff --git a/src/app.ts b/src/app.ts index a661e1b3..6485ccc1 100644 --- a/src/app.ts +++ b/src/app.ts @@ -56,6 +56,7 @@ const appPackages: IGBPackage[] = []; */ export class RootData { public publicAddress: string; + public server: any; } /** @@ -74,6 +75,7 @@ export class GBServer { GBServer.globals = new RootData(); const port = GBConfigService.getServerPort(); const server = express(); + GBServer.globals.server = server; server.use(bodyParser.json()); server.use(bodyParser.urlencoded({ extended: true })); -- 2.39.5