From 316b5262eea4cb1b8d8e5d271ef56dbad0cd25c5 Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Fri, 3 Nov 2023 11:39:50 -0300
Subject: [PATCH] fix(whatsapp.gblib): Applied WhatsApp-web-js patch.

---
 package.json                                                  | 2 +-
 packages/azuredeployer.gbapp/services/AzureDeployerService.ts | 2 +-
 packages/core.gbapp/services/GBMinService.ts                  | 4 ++--
 packages/whatsapp.gblib/services/WhatsappDirectLine.ts        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index dae4e5da..d092f005 100644
--- a/package.json
+++ b/package.json
@@ -181,7 +181,7 @@
     "vm2-process": "2.1.1",
     "walk-promise": "0.2.0",
     "washyourmouthoutwithsoap": "1.0.2",
-    "whatsapp-web.js": "1.16.4-alpha.0",
+    "whatsapp-web.js": "https://github.com/Julzk/whatsapp-web.js/tarball/jkr_hotfix_7",
     "winston": "3.8.2",
     "winston-logs-display": "1.0.0",
     "ws": "8.12.1",
diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
index 6326db8d..5b686d60 100644
--- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
+++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
@@ -607,7 +607,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
         const resChannel = await httpClient.sendRequest(req);
         const key = JSON.parse(resChannel.bodyAsText).properties.properties.sites[0].key;
         instance.webchatKey = key;
-        instance.whatsappBotKey = key;
+        instance.webchatKey = key;
         resolve(instance);
       } catch (error) {
         reject(error);
diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
index 2c090a22..9199ab44 100644
--- a/packages/core.gbapp/services/GBMinService.ts
+++ b/packages/core.gbapp/services/GBMinService.ts
@@ -746,7 +746,7 @@ export class GBMinService {
       min.whatsAppDirectLine = new WhatsappDirectLine(
         min,
         min.botId,
-        min.instance.whatsappBotKey,
+        min.instance.webchatKey,
         min.instance.whatsappServiceKey,
         min.instance.whatsappServiceNumber,
         min.instance.whatsappServiceUrl,
@@ -759,7 +759,7 @@ export class GBMinService {
         min.whatsAppDirectLine = new WhatsappDirectLine(
           min,
           min.botId,
-          min.instance.whatsappBotKey,
+          min.instance.webchatKey,
           minBoot.instance.whatsappServiceKey,
           minBoot.instance.whatsappServiceNumber,
           minBoot.instance.whatsappServiceUrl,
diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
index 1484fe57..b2ed2312 100644
--- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
+++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
@@ -123,7 +123,7 @@ export class WhatsappDirectLine extends GBService {
     const client = await new SwaggerClient({
       spec: JSON.parse(Fs.readFileSync('directline-3.0.json', 'utf8')),
       requestInterceptor: req => {
-        req.headers['Authorization'] = `Bearer ${this.min.instance.whatsappBotKey}`;
+        req.headers['Authorization'] = `Bearer ${this.min.instance.webchatKey}`;
       }
     });
     this.directLineClient = client;
@@ -318,7 +318,7 @@ export class WhatsappDirectLine extends GBService {
         // If there is a number specified, checks if it
         // is related to a custom bot and reroutes immediately.
 
-        if (newThis !== this && newThis.min.botId !== GBServer.globals.minBoot.botId) {
+        if (newThis && newThis !== this && newThis.min.botId !== GBServer.globals.minBoot.botId) {
           await newThis.received(req, res);
 
           return;