diff --git a/DATABASE-CHANGES.md b/DATABASE-CHANGES.md index 3939f58f..34b5b171 100644 --- a/DATABASE-CHANGES.md +++ b/DATABASE-CHANGES.md @@ -108,3 +108,11 @@ ALTER TABLE dbo.GuaribasInstance ADD googlePrivateKey nvarchar(4000) NULL, googleProjectId nvarchar(255) NULL GO + +# 2.0.119 + +ALTER TABLE dbo.GuaribasInstance ADD + facebookWorkplaceVerifyToken nvarchar(255) NULL, + facebookWorkplaceAppSecret nvarchar(255) NULL, + facebookWorkplaceAccessToken nvarchar(512) NULL +GO diff --git a/package-lock.json b/package-lock.json index 932d12bf..902da420 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "botserver", - "version": "2.0.121", + "version": "2.0.126", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5179,9 +5179,9 @@ } }, "botlib": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/botlib/-/botlib-1.8.3.tgz", - "integrity": "sha512-NWVeSgavucALMJ6yZT7ld0v01mL3964+3OLCW8oW2nuFxG4eBEpNztsg5HKJWBKb9nbeNWU70ynstC43kMQ+uw==", + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/botlib/-/botlib-1.9.2.tgz", + "integrity": "sha512-um7oVLrh3xHruQu0N6K4FBYHEidhAdCtgG4U6IadYMIt8j2hjeC5d9mwhElXhu/Darx7TWwoV42TNMVWuTuhxw==", "requires": { "async": "3.2.0", "botbuilder": "4.13.5", diff --git a/package.json b/package.json index 8ffe2771..31daa354 100644 --- a/package.json +++ b/package.json @@ -68,11 +68,11 @@ "bluebird": "3.7.2", "body-parser": "1.19.0", "botbuilder": "4.13.5", - "botbuilder-adapter-facebook": "^1.0.11", + "botbuilder-adapter-facebook": "1.0.11", "botbuilder-ai": "4.13.5", "botbuilder-dialogs": "4.13.5", "botframework-connector": "4.13.5", - "botlib": "1.8.3", + "botlib": "1.9.2", "cli-spinner": "0.2.10", "core-js": "3.14.0", "dotenv-extended": "2.9.0", diff --git a/packages/basic.gblib/services/GBVMService.ts b/packages/basic.gblib/services/GBVMService.ts index d4939d6e..7ee1c458 100644 --- a/packages/basic.gblib/services/GBVMService.ts +++ b/packages/basic.gblib/services/GBVMService.ts @@ -246,7 +246,7 @@ export class GBVMService extends GBService { code = code.replace(/(\w+)\s*\=\s*get\s(.*)/gi, ($0, $1, $2) => { if ($2.indexOf('http') !== -1) { - return `let ${$1} = sys().httpGet (${$2})`; + return `let ${$1} = sys().getByHttp (${$2})`; } else { return `let ${$1} = sys().get (${$2})`; } diff --git a/packages/basic.gblib/services/SystemKeywords.ts b/packages/basic.gblib/services/SystemKeywords.ts index 33e9e0a7..66939b01 100644 --- a/packages/basic.gblib/services/SystemKeywords.ts +++ b/packages/basic.gblib/services/SystemKeywords.ts @@ -60,7 +60,7 @@ export class SystemKeywords { * Reference to the deployer service. */ private readonly deployer: GBDeployer; - + dk: DialogKeywords; @@ -77,11 +77,12 @@ export class SystemKeywords { /** * Retrives the content of a given URL. */ - public async getFileContents(url) { + public async getFileContents(url, headers) { const options = { url: url, method: 'GET', - encoding: 'binary' + encoding: 'binary', + headers: headers }; return await request(options); // TODO: Check this. } @@ -638,9 +639,10 @@ export class SystemKeywords { * @example user = get "http://server/users/1" * */ - public async getByHttp(url: string) { + public async getByHttp(url: string, headers: any) { const options = { - uri: url + uri: url, + headers: headers }; let result = await request.get(options); diff --git a/packages/core.gbapp/models/GBModel.ts b/packages/core.gbapp/models/GBModel.ts index ae5ac922..a2a0ad62 100644 --- a/packages/core.gbapp/models/GBModel.ts +++ b/packages/core.gbapp/models/GBModel.ts @@ -147,10 +147,19 @@ export class GuaribasInstance extends Model @Column({ type: DataType.STRING(4000) }) public googlePrivateKey: string; - + @Column public googleProjectId: string; + + @Column({ type: DataType.STRING(255) }) + facebookWorkplaceVerifyToken: string; + @Column({ type: DataType.STRING(255) }) + facebookWorkplaceAppSecret: string; + + @Column({ type: DataType.STRING(512) }) + facebookWorkplaceAccessToken: string; + @Column public whatsappBotKey: string; diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 2013d70c..566012dd 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -638,12 +638,12 @@ export class GBMinService { if (GBServer.globals.minBoot === undefined) { GBServer.globals.minBoot = min; } - - if (process.env.FACEBOOK_VERIFY_TOKEN) { + + if (min.instance.facebookWorkplaceVerifyToken) { min['fbAdapter'] = new FacebookAdapter({ - verify_token: process.env.FACEBOOK_VERIFY_TOKEN, - app_secret: process.env.FACEBOOK_APP_SECRET, - access_token: process.env.FACEBOOK_ACCESS_TOKEN + verify_token: min.instance.facebookWorkplaceVerifyToken, + app_secret: min.instance.facebookWorkplaceAppSecret, + access_token: min.instance.facebookWorkplaceAccessToken }); } // TODO: min.appPackages = core.getPackagesByInstanceId(min.instance.instanceId); @@ -869,6 +869,8 @@ export class GBMinService { user.welcomed = true; GBLog.info(`Auto start (teams) dialog is now being called: ${startDialog} for ${min.instance.botId}...`); await GBVMService.callVM(startDialog.toLowerCase(), min, step, this.deployer); + + } } }