From 4cdabe2975d1c339ee5c3f5df7ca740c9a10fe92 Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Mon, 18 Jul 2022 08:25:29 -1000
Subject: [PATCH 1/2] Return data instead of undefined if we should not retry
 and have no request.resolve promise

---
 src/libs/Middleware/Reauthentication.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/Middleware/Reauthentication.js b/src/libs/Middleware/Reauthentication.js
index 7dc971191b87..4f346dda9563 100644
--- a/src/libs/Middleware/Reauthentication.js
+++ b/src/libs/Middleware/Reauthentication.js
@@ -42,7 +42,7 @@ function Reauthentication(response, request, isFromSequentialQueue) {
                     if (request.resolve) {
                         request.resolve(data);
                     }
-                    return;
+                    return data;
                 }
 
                 // We are already authenticating

From 273fe2d3b519369b2d92564cbfeadb1255fc6f61 Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Mon, 18 Jul 2022 08:51:28 -1000
Subject: [PATCH 2/2] Fix authToken invalidator so it destroys the token in
 storage as well

---
 src/components/TestToolMenu.js        | 3 +--
 src/libs/actions/Session/index.js     | 6 ++++++
 src/pages/settings/PreferencesPage.js | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/TestToolMenu.js b/src/components/TestToolMenu.js
index be7b7bc0f170..f04ae6a26b92 100644
--- a/src/components/TestToolMenu.js
+++ b/src/components/TestToolMenu.js
@@ -9,7 +9,6 @@ import * as Network from '../libs/actions/Network';
 import * as Session from '../libs/actions/Session';
 import ONYXKEYS from '../ONYXKEYS';
 import Button from './Button';
-import * as NetworkStore from '../libs/Network/NetworkStore';
 import TestToolRow from './TestToolRow';
 import networkPropTypes from './networkPropTypes';
 import compose from '../libs/compose';
@@ -60,7 +59,7 @@ const TestToolMenu = props => (
             <Button
                 small
                 text="Invalidate"
-                onPress={() => NetworkStore.setAuthToken('pizza')}
+                onPress={() => Session.invalidateAuthToken()}
             />
         </TestToolRow>
 
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 3223a159b223..95673cc696af 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -343,6 +343,11 @@ function invalidateCredentials() {
     Onyx.merge(ONYXKEYS.CREDENTIALS, {autoGeneratedLogin: '', autoGeneratedPassword: ''});
 }
 
+function invalidateAuthToken() {
+    NetworkStore.setAuthToken('pizza');
+    Onyx.merge(ONYXKEYS.SESSION, {authToken: 'pizza'});
+}
+
 /**
  * Clear the credentials and partial sign in session so the user can taken back to first Login step
  */
@@ -520,4 +525,5 @@ export {
     setShouldShowComposeInput,
     changePasswordAndSignIn,
     invalidateCredentials,
+    invalidateAuthToken,
 };
diff --git a/src/pages/settings/PreferencesPage.js b/src/pages/settings/PreferencesPage.js
index 9848380a96f2..6afe3859aa14 100755
--- a/src/pages/settings/PreferencesPage.js
+++ b/src/pages/settings/PreferencesPage.js
@@ -101,7 +101,7 @@ const PreferencesPage = (props) => {
                     </View>
 
                     {/* If we are in the staging environment then we enable additional test features */}
-                    {props.environment === CONST.ENVIRONMENT.STAGING && <TestToolMenu />}
+                    {_.contains([CONST.ENVIRONMENT.STAGING, CONST.ENVIRONMENT.DEV], props.environment) && <TestToolMenu />}
                 </View>
             </ScrollView>
         </ScreenWrapper>