Fix cleanSessionStorage on every logout way

src/context/SessionContext.tsx

@@ -1,10 +1,10 @@
-import React, { createContext, useContext } from 'react';
+import React, { createContext, useContext, useEffect } from 'react';
 
 import StatusContext from './StatusContext';
 import { BackendApi, useApi } from '../api';
 import { KeystoreEvent, useLocalStorageKeystore } from '../services/LocalStorageKeystore';
 import type { LocalStorageKeystore } from '../services/LocalStorageKeystore';
-
+import keystoreEvents from '../services/keystoreEvents';
 
 type SessionContextValue = {
 	api: BackendApi,
@@ -23,17 +23,19 @@ const SessionContext: React.Context<SessionContextValue> = createContext({
 export const SessionContextProvider = ({ children }) => {
 	const { isOnline } = useContext(StatusContext);
 	const api = useApi(isOnline);
-	const keystoreEvents = new EventTarget();
 	const keystore = useLocalStorageKeystore(keystoreEvents);
 
-	const logout = async () => {
-		// Clear URL parameters
+	const clearSession = async () => {
 		sessionStorage.setItem('freshLogin', 'true');
 		api.clearSession();
+	};
+
+	const logout = async () => {
+		clearSession();
 		await keystore.close();
 	};
 
-	keystoreEvents.addEventListener(KeystoreEvent.Close, logout, { once: true });
+		keystoreEvents.addEventListener(KeystoreEvent.CloseTabLocal, clearSession, {once: true});
 
 	const value: SessionContextValue = {
 		api,

src/services/LocalStorageKeystore.ts

@@ -102,11 +102,11 @@ export function useLocalStorageKeystore(eventTarget: EventTarget): LocalStorageK
 	}, []));
 
 	const closeTabLocal = useCallback(
-		() => {
-			clearSessionStorage();
+		async (): Promise<void> => {
 			eventTarget.dispatchEvent(new CustomEvent(KeystoreEvent.CloseTabLocal));
+			clearSessionStorage();
 		},
-		[clearSessionStorage],
+		[clearSessionStorage, eventTarget],
 	);
 
 	const close = useCallback(
@@ -115,7 +115,6 @@ export function useLocalStorageKeystore(eventTarget: EventTarget): LocalStorageK
 			clearPrivateData();
 			clearGlobalUserHandleB64u();
 			closeTabLocal();
-			eventTarget.dispatchEvent(new CustomEvent(KeystoreEvent.Close));
 		},
 		[closeTabLocal, idb, clearGlobalUserHandleB64u, clearPrivateData],
 	);

src/services/keystoreEvents.ts

@@ -0,0 +1,3 @@
+// keystoreEvents.js
+const keystoreEvents = new EventTarget();
+export default keystoreEvents;