From 794e0260fbe4f0a220c09144d39c5a9482706659 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Wed, 19 Jul 2023 09:48:28 +0000 Subject: [PATCH 1/2] chore(release): 2.4.15 [skip ci] ## [2.4.15](https://github.com/GeneralBots/BotServer/compare/2.4.14...2.4.15) (2023-07-19) ### Bug Fixes * **all:** Create bot working again. ([4eecd5a](https://github.com/GeneralBots/BotServer/commit/4eecd5acec56547e5b5ab064f52dc81eb451e1a4)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dde67f62..b613f4c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [2.4.15](https://github.com/GeneralBots/BotServer/compare/2.4.14...2.4.15) (2023-07-19) + + +### Bug Fixes + +* **all:** Create bot working again. ([4eecd5a](https://github.com/GeneralBots/BotServer/commit/4eecd5acec56547e5b5ab064f52dc81eb451e1a4)) + ## [2.4.14](https://github.com/GeneralBots/BotServer/compare/2.4.13...2.4.14) (2023-07-18) diff --git a/package.json b/package.json index 0c02af8b..c8cc6aca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "botserver", - "version": "2.4.14", + "version": "2.4.15", "type": "module", "description": "General Bot Community Edition open-core server.", "main": "./boot.mjs", From abe5f0380187bc4da498f15a13c8b4ae741bf8ec Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Wed, 19 Jul 2023 07:53:02 -0300 Subject: [PATCH 2/2] fix(all): Minor changes in PROD. --- .../admin.gbapp/services/GBAdminService.ts | 9 ++++--- packages/core.gbapp/services/GBDeployer.ts | 6 ++--- packages/core.gbapp/services/GBMinService.ts | 27 ++++++++++++++----- .../security.gbapp/services/SecService.ts | 2 +- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/packages/admin.gbapp/services/GBAdminService.ts b/packages/admin.gbapp/services/GBAdminService.ts index 6f48dfe4..7a177241 100644 --- a/packages/admin.gbapp/services/GBAdminService.ts +++ b/packages/admin.gbapp/services/GBAdminService.ts @@ -224,9 +224,12 @@ export class GBAdminService implements IGBAdminService { return obj.value; } - public async acquireElevatedToken(instanceId: number): Promise { - const minBoot = GBServer.globals.minBoot; - instanceId = minBoot.instance.instanceId; + public async acquireElevatedToken(instanceId: number, root: boolean = false): Promise { + + if (root){ + const minBoot = GBServer.globals.minBoot; + instanceId = minBoot.instance.instanceId; + } let expiresOnV; try { expiresOnV = await this.getValue(instanceId, 'expiresOn'); diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index 3144656e..4286a824 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -104,7 +104,7 @@ export class GBDeployer implements IGBDeployer { * Retrives token and initialize drive client API. */ public static async internalGetDriveClient(min: GBMinInstance) { - const token = await min.adminService.acquireElevatedToken(min.instance.instanceId); + const token = await min.adminService['acquireElevatedToken'](min.instance.instanceId, true); const siteId = process.env.STORAGE_SITE_ID; const libraryId = process.env.STORAGE_LIBRARY; @@ -209,7 +209,7 @@ export class GBDeployer implements IGBDeployer { // Gets the access token to perform service operations. - const accessToken = await GBServer.globals.minBoot.adminService.acquireElevatedToken(bootInstance.instanceId); + const accessToken = await min.adminService['acquireElevatedToken'](min.instance.instanceId, true); // Creates the MSFT application that will be associated to the bot. @@ -401,7 +401,7 @@ export class GBDeployer implements IGBDeployer { // Connects to MSFT storage. - const token = await min.adminService.acquireElevatedToken(min.instance.instanceId); + const token = await min.adminService['acquireElevatedToken'](min.instance.instanceId, true); const client = MicrosoftGraph.Client.init({ authProvider: done => { done(null, token); diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 71462101..2f024ff2 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -707,7 +707,7 @@ export class GBMinService { min['scheduleMap'] = {}; min['conversationWelcomed'] = {}; min.packages = sysPackages; - + // NLP Manager. const manager = new NlpManager({ languages: ['pt'], forceNER: true }); @@ -725,7 +725,7 @@ export class GBMinService { }); } - min.appPackages = await this.core['getApplicationsByInstanceId'] (appPackages, min.instance.instanceId); + min.appPackages = await this.core['getApplicationsByInstanceId'](appPackages, min.instance.instanceId); // Creates a hub of services available in .gbapps. @@ -1050,8 +1050,7 @@ export class GBMinService { await this.processEventActivity(min, user, context, step); } } catch (error) { - const msg = `ERROR: ${error.message} ${error.stack} ${error.error ? error.error.body : ''} ${error.error ? (error.error.stack ? error.error.stack : '') : '' - }`; + const msg = `ERROR: ${error.message} ${error.stack} ${error.error ? error.error.body : ''} ${error.error ? (error.error.stack ? error.error.stack : '') : '' }`; GBLog.error(msg); await min.conversationalService.sendText( @@ -1065,7 +1064,7 @@ export class GBMinService { }; try { - + await adapter['processActivity'](req, res, handler); } catch (error) { if (error.code === 401) { @@ -1270,7 +1269,7 @@ export class GBMinService { accum.push(result); return accum; }, []) as GBFile[]; - + if (min.cbMap[userId] && min.cbMap[userId].promise == '!GBHEAR') { if (results.length > 1) { throw new Error('It is only possible to upload one file per message, right now.'); @@ -1477,7 +1476,21 @@ export class GBMinService { // If there is a dialog in course, continue to the next step. else if (step.activeDialog !== undefined) { - await step.continueDialog(); + + try { + await step.continueDialog(); + + } catch (error) { + const msg = `ERROR: ${error.message} ${error.stack} ${error.error ? error.error.body : ''} ${error.error ? (error.error.stack ? error.error.stack : '') : '' }`; + GBLog.error(msg); + await min.conversationalService.sendText( + min, + step, + Messages[step.context.activity.locale].very_sorry_about_error + ); + await step.beginDialog('/ask', { isReturning: true }); + } + } else { const startDialog = user.hearOnDialog ? user.hearOnDialog diff --git a/packages/security.gbapp/services/SecService.ts b/packages/security.gbapp/services/SecService.ts index 48663c7f..1c10026f 100644 --- a/packages/security.gbapp/services/SecService.ts +++ b/packages/security.gbapp/services/SecService.ts @@ -179,7 +179,7 @@ export class SecService extends GBService { await CollectionUtil.asyncForEach(list, async item => { if ( item !== undefined && - agentSystemId === undefined && + !agentSystemId && item !== userSystemId && !(await this.isAgentSystemId(item)) ) {