From 52137ba9e59cb51fee80e33be497e8bd3df9dfc2 Mon Sep 17 00:00:00 2001
From: Prakash Senthil Vel <23444145+prakashsvmx@users.noreply.github.com>
Date: Sat, 10 Feb 2024 03:06:56 +0530
Subject: [PATCH] Logout state clean up (#3219)

---
 web-app/src/screens/LogoutPage/LogoutPage.tsx | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/web-app/src/screens/LogoutPage/LogoutPage.tsx b/web-app/src/screens/LogoutPage/LogoutPage.tsx
index 1bd70791b..5d71995ef 100644
--- a/web-app/src/screens/LogoutPage/LogoutPage.tsx
+++ b/web-app/src/screens/LogoutPage/LogoutPage.tsx
@@ -28,25 +28,24 @@ const LogoutPage = () => {
   const dispatch = useAppDispatch();
   const navigate = useNavigate();
   useEffect(() => {
+    const deleteSession = () => {
+      dispatch(userLogged(false));
+      // Disconnect OB Websocket
+      dispatch({ type: "socket/OBDisconnect" });
+      localStorage.setItem("userLoggedIn", "");
+      localStorage.setItem("redirect-path", "");
+      dispatch(resetSession());
+      clearSession();
+
+      navigate("/login");
+      window.location.reload(); //reset-all redux states etc. by force reloading.
+    };
+
     const logout = () => {
-      const deleteSession = () => {
-        clearSession();
-        dispatch(userLogged(false));
-
-        // Disconnect OB Websocket
-        dispatch({ type: "socket/OBDisconnect" });
-
-        localStorage.setItem("userLoggedIn", "");
-        localStorage.setItem("redirect-path", "");
-        dispatch(resetSession());
-        navigate(`/login`);
-      };
       const state = localStorage.getItem("auth-state");
       api
         .invoke("POST", `/api/v1/logout`, { state })
-        .then(() => {
-          deleteSession();
-        })
+        .then(deleteSession)
         .catch((err: ErrorResponseHandler) => {
           console.error(err);
           deleteSession();