From 799715a9ee77606afcbcaf72a545d0ce473bd5e9 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Mon, 20 Mar 2023 16:14:58 -0300 Subject: [PATCH 1/5] fix(core.gblib): SSR fixing about botId. --- packages/core.gbapp/services/GBMinService.ts | 22 ++++++++++--------- packages/core.gbapp/services/GBSSR.ts | 4 +++- .../services/WhatsappDirectLine.ts | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index a358a7db..3ec46ead 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -773,16 +773,18 @@ export class GBMinService { await min.whatsAppDirectLine.setup(true); } else { const minBoot = GBServer.globals.minBoot as any; - min.whatsAppDirectLine = new WhatsappDirectLine( - min, - min.botId, - min.instance.whatsappBotKey, - minBoot.instance.whatsappServiceKey, - minBoot.instance.whatsappServiceNumber, - minBoot.instance.whatsappServiceUrl, - group - ); - await min.whatsAppDirectLine.setup(false); + if (min !== minBoot) { + min.whatsAppDirectLine = new WhatsappDirectLine( + min, + min.botId, + min.instance.whatsappBotKey, + minBoot.instance.whatsappServiceKey, + minBoot.instance.whatsappServiceNumber, + minBoot.instance.whatsappServiceUrl, + group + ); + await min.whatsAppDirectLine.setup(false); + } } // Setups default BOT Framework dialogs. diff --git a/packages/core.gbapp/services/GBSSR.ts b/packages/core.gbapp/services/GBSSR.ts index f196a89c..00ddc8ad 100644 --- a/packages/core.gbapp/services/GBSSR.ts +++ b/packages/core.gbapp/services/GBSSR.ts @@ -295,7 +295,9 @@ export class GBSSR { if (!min) { min = req.url === '/' ? minBoot - : GBServer.globals.minInstances.filter(p => p.instance.activationCode.toLowerCase() === botId.toLowerCase())[0]; + : GBServer.globals.minInstances.filter(p => + p.instance.activationCode ? p.instance.activationCode.toLowerCase() === botId.toLowerCase() + : null)[0]; } if (!min) { botId = minBoot.botId; diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts index 04c36998..27f731a3 100644 --- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts +++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts @@ -1042,7 +1042,7 @@ export class WhatsappDirectLine extends GBService { } } - // Detects if the welcome message is enabled.z + // Detects if the welcome message is enabled. if (process.env.WHATSAPP_WELCOME_DISABLED !== 'true') { // Tries to find if user wants to switch bots. From df3bcd5f6c7a64b3f16d76dc1ddca4bdd596b97c Mon Sep 17 00:00:00 2001 From: Zuilho Segundo Date: Mon, 20 Mar 2023 16:35:01 -0300 Subject: [PATCH 2/5] fix(core.gbapp:using direct prop from singleton) --- packages/core.gbapp/services/GBSSR.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core.gbapp/services/GBSSR.ts b/packages/core.gbapp/services/GBSSR.ts index f196a89c..d7125794 100644 --- a/packages/core.gbapp/services/GBSSR.ts +++ b/packages/core.gbapp/services/GBSSR.ts @@ -283,7 +283,7 @@ export class GBSSR { // Tries to find botId from URL. - const minBoot = GBServer.globals.minInstances[0]; + const minBoot = GBServer.globals.minBoot; let botId = req.originalUrl && req.originalUrl === '/' ? minBoot.botId : From 1074ef7240879007a2838ec814192b7bf727c0ce Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Tue, 21 Mar 2023 13:32:27 -0300 Subject: [PATCH 3/5] fix(azuredeployer.gblib): FREE flag for database. --- packages/azuredeployer.gbapp/services/AzureDeployerService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index 38683641..5345df5d 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -803,7 +803,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { private async createStorage(group: string, serverName: string, name: string, location: string) { const params = { - sku: { name: 'Basic' }, + sku: { name: 'Free' }, createMode: 'Default', location: location }; From 6c9d12452407faa0ad3eb6c0e8e61abd87331020 Mon Sep 17 00:00:00 2001 From: phpussente Date: Tue, 21 Mar 2023 16:06:02 -0300 Subject: [PATCH 4/5] fix(azuredeployer.gbapp): Adding Resource Providers (.Web/.Sql) --- packages/azuredeployer.gbapp/services/AzureDeployerService.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index 5345df5d..8ed0442b 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -359,6 +359,8 @@ export class AzureDeployerService implements IGBInstallationDeployer { GBLog.info(`Enabling resource providers...`); await this.enableResourceProviders('Microsoft.BotService'); + await this.enableResourceProviders('Microsoft.Web'); + await this.enableResourceProviders('Microsoft.Sql'); GBLog.info(`Deploying Deploy Group (It may take a few minutes)...`); await this.createDeployGroup(name, instance.cloudLocation); From 0ed600edc3709a6a17ffe2072d22c1ff4b83782a Mon Sep 17 00:00:00 2001 From: Alan Perdomo Date: Tue, 21 Mar 2023 18:09:11 -0300 Subject: [PATCH 5/5] fix(azuredeployer.gbapp): Create DB with basic cost. --- packages/azuredeployer.gbapp/services/AzureDeployerService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index 8ed0442b..a4e8202c 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -805,7 +805,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { private async createStorage(group: string, serverName: string, name: string, location: string) { const params = { - sku: { name: 'Free' }, + sku: { name: 'Basic' }, createMode: 'Default', location: location };