Remove storage helpers

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- [Remove storage helpers](https://github.com/multiversx/mx-sdk-dapp-core/pull/72)
+
 ## [[0.0.0-alpha.12](https://github.com/multiversx/mx-sdk-dapp-core/pull/56)] - 2025-01-20
 
 - [Added transaction and message cancel signing handle](https://github.com/multiversx/mx-sdk-dapp-core/pull/71)

src/core/providers/DappProvider/helpers/logout/logout.ts

@@ -1,30 +1,12 @@
+import { safeWindow } from 'constants/window.constants';
 import { getAddress } from 'core/methods/account/getAddress';
 import {
   IProvider,
   ProviderTypeEnum
 } from 'core/providers/types/providerFactory.types';
 import { CrossWindowProvider } from 'lib/sdkWebWalletCrossWindowProvider';
-import { storage } from 'storage';
-import { localStorageKeys } from 'storage/local';
 import { logoutAction } from 'store/actions/sharedActions/sharedActions';
 
-const broadcastLogoutAcrossTabs = (address: string) => {
-  const storedData = storage.local?.getItem(localStorageKeys.logoutEvent);
-  const { data } = storedData ? JSON.parse(storedData) : { data: address };
-
-  if (address !== data) {
-    return;
-  }
-
-  storage.local.setItem({
-    key: localStorageKeys.logoutEvent,
-    data: address,
-    expires: 0
-  });
-
-  storage.local.removeItem(localStorageKeys.logoutEvent);
-};
-
 export type LogoutPropsType = {
   shouldAttemptReLogin?: boolean;
   shouldBroadcastLogoutAcrossTabs?: boolean;
@@ -39,6 +21,18 @@ interface IProviderLogout {
   options?: LogoutPropsType;
 }
 
+const broadcastLogoutAcrossTabs = (address: string, localStorage: Storage) => {
+  const logoutEventKey = `sdk-dapp-core-logout-event-${address}`;
+  const storedAddress = localStorage.getItem(logoutEventKey);
+
+  if (storedAddress && address !== storedAddress) {
+    return;
+  }
+
+  localStorage.setItem(logoutEventKey, address);
+  localStorage.removeItem(logoutEventKey);
+};
+
 export async function logout({
   provider,
   options = {
@@ -48,10 +42,9 @@ export async function logout({
 }: IProviderLogout) {
   let address = getAddress();
 
-  if (options.shouldBroadcastLogoutAcrossTabs) {
-    broadcastLogoutAcrossTabs(address);
+  if (options.shouldBroadcastLogoutAcrossTabs && safeWindow.localStorage) {
+    broadcastLogoutAcrossTabs(address, safeWindow.localStorage);
   }
-
   try {
     logoutAction();
 

src/store/actions/loginInfo/loginInfoActions.ts

@@ -63,3 +63,13 @@ export const setIsWalletConnectV2Initialized = (isInitialized: boolean) =>
   getStore().setState(({ loginInfo: state }) => {
     state.isWalletConnectV2Initialized = isInitialized;
   });
+
+export const removeLoginExpiresAt = () =>
+  getStore().setState(({ loginInfo: state }) => {
+    state.loginExpiresAt = null;
+  });
+
+export const addLoginExpiresAt = (expiresAt: number) =>
+  getStore().setState(({ loginInfo: state }) => {
+    state.loginExpiresAt = expiresAt;
+  });

src/store/middleware/logoutMiddleware.ts

@@ -1,12 +1,19 @@
 import { Address } from '@multiversx/sdk-core/out';
 import { WritableDraft } from 'immer';
-import { storage } from 'storage';
-import { localStorageKeys } from 'storage/local';
-import { accountInfoSelector, isLoggedInSelector } from 'store/selectors';
+import {
+  addLoginExpiresAt,
+  removeLoginExpiresAt
+} from 'store/actions/loginInfo/loginInfoActions';
+import {
+  accountInfoSelector,
+  isLoggedInSelector,
+  loginExpiresAtSelector
+} from 'store/selectors';
 import { initialState as initialAccountState } from 'store/slices/account/accountSlice';
 import { initialState as initialLoginInfoState } from 'store/slices/loginInfo/loginInfoSlice';
 import { initialState as initialToastState } from 'store/slices/toast/toastSlice';
 import { initialState as initialTrackedTransactionsState } from 'store/slices/trackedTransactions/trackedTransactionsSlice';
+import { getStore } from 'store/store';
 import { StoreType } from '../store.types';
 
 export const resetStore = (store: WritableDraft<StoreType>) => {
@@ -22,20 +29,16 @@ export function getNewLoginExpiresTimestamp() {
 
 export function setLoginExpiresAt(expiresAt: number | null) {
   if (expiresAt == null) {
-    storage.local.removeItem(localStorageKeys.loginExpiresAt);
+    removeLoginExpiresAt();
     return;
   }
-  storage.local.setItem({
-    key: localStorageKeys.loginExpiresAt,
-    data: expiresAt,
-    expires: expiresAt
-  });
+  addLoginExpiresAt(expiresAt);
 }
 
 export const logoutMiddleware = (state: StoreType) => {
   const isLoggedIn = isLoggedInSelector(state);
+  const loginTimestamp = loginExpiresAtSelector(state);
   const { address, publicKey } = accountInfoSelector(state);
-  const loginTimestamp = storage.local.getItem(localStorageKeys.loginExpiresAt);
 
   if (address && publicKey !== new Address(address).hex()) {
     resetStore(state);
@@ -56,6 +59,6 @@ export const logoutMiddleware = (state: StoreType) => {
   if (isExpired) {
     // logout
     setLoginExpiresAt(null);
-    resetStore(state);
+    getStore().setState(resetStore);
   }
 };

src/store/selectors/loginInfoSelectors.ts

@@ -13,3 +13,6 @@ export const providerTypeSelector = ({ loginInfo }: StoreType) =>
 
 export const ledgerLoginSelector = ({ loginInfo }: StoreType) =>
   loginInfo.ledgerLogin;
+
+export const loginExpiresAtSelector = ({ loginInfo }: StoreType) =>
+  loginInfo.loginExpiresAt;

src/store/slices/loginInfo/loginInfo.types.ts

@@ -30,4 +30,5 @@ export interface LoginInfoSliceType<
   crossWindowLogin: LoginInfoType | null;
   logoutRoute?: string;
   isWalletConnectV2Initialized?: boolean;
+  loginExpiresAt: number | null;
 }

src/store/slices/loginInfo/loginInfoSlice.ts

@@ -10,7 +10,8 @@ export const initialState: LoginInfoSliceType = {
   walletLogin: null,
   extensionLogin: null,
   operaLogin: null,
-  crossWindowLogin: null
+  crossWindowLogin: null,
+  loginExpiresAt: null
 };
 
 function getTokenInfoSlice(): StateCreator<