From 1fdaafdd36b5e3e68f6918fb21adeb5678b56fb6 Mon Sep 17 00:00:00 2001 From: JamalAlabdullah Date: Wed, 3 Jul 2024 22:33:00 +0200 Subject: [PATCH 1/3] added onClose functio to toast --- frontend/packages/shared/src/contexts/ServicesContext.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/packages/shared/src/contexts/ServicesContext.tsx b/frontend/packages/shared/src/contexts/ServicesContext.tsx index 36653519d78..665c7ec135f 100644 --- a/frontend/packages/shared/src/contexts/ServicesContext.tsx +++ b/frontend/packages/shared/src/contexts/ServicesContext.tsx @@ -57,6 +57,7 @@ const handleError = ( if (unAuthorizedErrorCode) { renderToast(errorCode || 'Unauthorized', { + onClose: () => logout().then(() => window.location.assign(userLogoutAfterPath())), autoClose: LOG_OUT_TIMER_MS, }); setTimeout(() => { From 6221094a462cb7a6e5a1df0d981a267ae4dd9151 Mon Sep 17 00:00:00 2001 From: JamalAlabdullah Date: Fri, 5 Jul 2024 10:16:05 +0200 Subject: [PATCH 2/3] add logout functionality to const LogOutUser --- frontend/packages/shared/src/contexts/ServicesContext.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/packages/shared/src/contexts/ServicesContext.tsx b/frontend/packages/shared/src/contexts/ServicesContext.tsx index 665c7ec135f..5672c4646e7 100644 --- a/frontend/packages/shared/src/contexts/ServicesContext.tsx +++ b/frontend/packages/shared/src/contexts/ServicesContext.tsx @@ -55,9 +55,13 @@ const handleError = ( const errorCode = error?.response?.data?.errorCode; const unAuthorizedErrorCode = error?.response?.status === ServerCodes.Unauthorized; + const LogOutUser = () => { + logout().then(() => window.location.assign(userLogoutAfterPath())); + }; + if (unAuthorizedErrorCode) { renderToast(errorCode || 'Unauthorized', { - onClose: () => logout().then(() => window.location.assign(userLogoutAfterPath())), + onClose: LogOutUser, autoClose: LOG_OUT_TIMER_MS, }); setTimeout(() => { From 85d1b873b410e06f5d559a1586ec98682c5f0011 Mon Sep 17 00:00:00 2001 From: JamalAlabdullah Date: Fri, 5 Jul 2024 14:03:10 +0200 Subject: [PATCH 3/3] fixed comments --- frontend/packages/shared/src/contexts/ServicesContext.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/frontend/packages/shared/src/contexts/ServicesContext.tsx b/frontend/packages/shared/src/contexts/ServicesContext.tsx index 5672c4646e7..342c593b8bc 100644 --- a/frontend/packages/shared/src/contexts/ServicesContext.tsx +++ b/frontend/packages/shared/src/contexts/ServicesContext.tsx @@ -55,9 +55,7 @@ const handleError = ( const errorCode = error?.response?.data?.errorCode; const unAuthorizedErrorCode = error?.response?.status === ServerCodes.Unauthorized; - const LogOutUser = () => { - logout().then(() => window.location.assign(userLogoutAfterPath())); - }; + const LogOutUser = () => logout().then(() => window.location.assign(userLogoutAfterPath())); if (unAuthorizedErrorCode) { renderToast(errorCode || 'Unauthorized', { @@ -65,7 +63,7 @@ const handleError = ( autoClose: LOG_OUT_TIMER_MS, }); setTimeout(() => { - logout().then(() => window.location.assign(userLogoutAfterPath())); + LogOutUser(); }, LOG_OUT_TIMER_MS); return; }