From 799715a9ee77606afcbcaf72a545d0ce473bd5e9 Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Mon, 20 Mar 2023 16:14:58 -0300
Subject: [PATCH] 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.