From ab76ae7745a8463f17e950c530f67c243a06af19 Mon Sep 17 00:00:00 2001 From: Christopher Bisom Date: Wed, 18 Sep 2024 12:51:50 -0400 Subject: [PATCH 1/2] do not attempt to sign user out if client needs to refresh --- .../sequences/signOutUserInitiatedSequence.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/web-client/src/presenter/sequences/signOutUserInitiatedSequence.ts b/web-client/src/presenter/sequences/signOutUserInitiatedSequence.ts index 11b98db2233..982f722f59b 100644 --- a/web-client/src/presenter/sequences/signOutUserInitiatedSequence.ts +++ b/web-client/src/presenter/sequences/signOutUserInitiatedSequence.ts @@ -1,13 +1,20 @@ import { BROADCAST_MESSAGES } from '@shared/business/entities/EntityConstants'; +import { checkClientNeedsToRefresh } from '@web-client/presenter/actions/checkClientNeedsToRefresh'; import { navigateToLoginSequence } from '@web-client/presenter/sequences/Login/navigateToLoginSequence'; import { setLogoutTypeAction } from '@web-client/presenter/actions/setLogoutTypeAction'; import { signOutSequence } from '@web-client/presenter/sequences/signOutSequence'; // The sequence to call when the user voluntarily decides to sign out export const signOutUserInitiatedSequence = [ - setLogoutTypeAction(BROADCAST_MESSAGES.userLogout), - signOutSequence, - navigateToLoginSequence, + checkClientNeedsToRefresh, + { + no: [ + setLogoutTypeAction(BROADCAST_MESSAGES.userLogout), + signOutSequence, + navigateToLoginSequence, + ], + yes: [], + }, ] as unknown as (props: { skipBroadcast?: boolean; fromModal?: boolean; From a77efe0e3b0c5b3b8fccaec367da3b212669dc63 Mon Sep 17 00:00:00 2001 From: Christopher Bisom Date: Wed, 18 Sep 2024 13:15:45 -0400 Subject: [PATCH 2/2] use correct path names for checkClientNeedsToRefresh --- .../src/presenter/sequences/signOutUserInitiatedSequence.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web-client/src/presenter/sequences/signOutUserInitiatedSequence.ts b/web-client/src/presenter/sequences/signOutUserInitiatedSequence.ts index 982f722f59b..1682dc3593c 100644 --- a/web-client/src/presenter/sequences/signOutUserInitiatedSequence.ts +++ b/web-client/src/presenter/sequences/signOutUserInitiatedSequence.ts @@ -8,12 +8,12 @@ import { signOutSequence } from '@web-client/presenter/sequences/signOutSequence export const signOutUserInitiatedSequence = [ checkClientNeedsToRefresh, { - no: [ + clientDoesNotNeedToRefresh: [ setLogoutTypeAction(BROADCAST_MESSAGES.userLogout), signOutSequence, navigateToLoginSequence, ], - yes: [], + clientNeedsToRefresh: [], }, ] as unknown as (props: { skipBroadcast?: boolean;