Skip to content

Commit 63e946a

Browse files
authored
Merge branch 'master' into expired-object-all-versions
2 parents 1c8c059 + 52137ba commit 63e946a

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

web-app/src/screens/LogoutPage/LogoutPage.tsx

+13-14
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,24 @@ const LogoutPage = () => {
2828
const dispatch = useAppDispatch();
2929
const navigate = useNavigate();
3030
useEffect(() => {
31-
const logout = () => {
32-
const deleteSession = () => {
33-
clearSession();
34-
dispatch(userLogged(false));
31+
const deleteSession = () => {
32+
dispatch(userLogged(false));
33+
// Disconnect OB Websocket
34+
dispatch({ type: "socket/OBDisconnect" });
35+
localStorage.setItem("userLoggedIn", "");
36+
localStorage.setItem("redirect-path", "");
37+
dispatch(resetSession());
38+
clearSession();
3539

36-
// Disconnect OB Websocket
37-
dispatch({ type: "socket/OBDisconnect" });
40+
navigate("/login");
41+
window.location.reload(); //reset-all redux states etc. by force reloading.
42+
};
3843

39-
localStorage.setItem("userLoggedIn", "");
40-
localStorage.setItem("redirect-path", "");
41-
dispatch(resetSession());
42-
navigate(`/login`);
43-
};
44+
const logout = () => {
4445
const state = localStorage.getItem("auth-state");
4546
api
4647
.invoke("POST", `/api/v1/logout`, { state })
47-
.then(() => {
48-
deleteSession();
49-
})
48+
.then(deleteSession)
5049
.catch((err: ErrorResponseHandler) => {
5150
console.error(err);
5251
deleteSession();

0 commit comments

Comments
 (0)