From 03f243d9061e79f49ae291bc912868b2bd9b0b8c Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.io>
Date: Wed, 12 Jun 2024 23:25:51 +0200
Subject: [PATCH] fix: return authToken as is from NetworkStore

---
 src/libs/Network/NetworkStore.ts      | 4 ++--
 src/libs/Network/enhanceParameters.ts | 2 +-
 src/libs/actions/Session/index.ts     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libs/Network/NetworkStore.ts b/src/libs/Network/NetworkStore.ts
index e942976ed6d1..dd1290b6565e 100644
--- a/src/libs/Network/NetworkStore.ts
+++ b/src/libs/Network/NetworkStore.ts
@@ -93,8 +93,8 @@ function isOffline(): boolean {
     return offline;
 }
 
-function getAuthToken(): string | null {
-    return authToken ?? null;
+function getAuthToken(): string | null | undefined {
+    return authToken;
 }
 
 function isSupportRequest(command: string): boolean {
diff --git a/src/libs/Network/enhanceParameters.ts b/src/libs/Network/enhanceParameters.ts
index 5c4590baded3..712d76db927c 100644
--- a/src/libs/Network/enhanceParameters.ts
+++ b/src/libs/Network/enhanceParameters.ts
@@ -17,7 +17,7 @@ export default function enhanceParameters(command: string, parameters: Record<st
     const finalParameters = {...parameters};
 
     if (isAuthTokenRequired(command) && !parameters.authToken) {
-        finalParameters.authToken = NetworkStore.getAuthToken();
+        finalParameters.authToken = NetworkStore.getAuthToken() ?? null;
     }
 
     finalParameters.referer = CONFIG.EXPENSIFY.EXPENSIFY_CASH_REFERER;
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index fc6a12bd6fb5..85baad7a0f0e 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -170,7 +170,7 @@ function signOut() {
     Log.info('Flushing logs before signing out', true, {}, true);
     const params = {
         // Send current authToken because we will immediately clear it once triggering this command
-        authToken: NetworkStore.getAuthToken(),
+        authToken: NetworkStore.getAuthToken() ?? null,
         partnerUserID: credentials?.autoGeneratedLogin ?? '',
         partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
         partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,