Add logout listener

src/store/actions/loginInfo/loginInfoActions.ts

@@ -50,3 +50,15 @@ export const setIsWalletConnectV2Initialized = (isInitialized: boolean) =>
   store.setState(({ loginInfo: state }) => {
     state.isWalletConnectV2Initialized = isInitialized;
   });
+
+// reset by passing null
+export const updateLoginExpiresAt = (data?: null) =>
+  store.setState(({ loginInfo: state }) => {
+    if (data === null) {
+      state.loginExpiresAt = null;
+      return;
+    }
+
+    const loginExpiresAt = new Date().setHours(new Date().getHours() + 24);
+    state.loginExpiresAt = loginExpiresAt;
+  });

src/store/actions/sharedActions/sharedActions.ts

@@ -1,13 +1,36 @@
 import { Address } from '@multiversx/sdk-core/out';
 import { initialState as initialAccountState } from 'store/slices/account/accountSlice';
 import { initialState as initialLoginInfoState } from 'store/slices/loginInfo/loginInfoSlice';
-import { store } from '../../store';
+import { getState, store } from '../../store';
 import { LoginMethodsEnum } from 'types/enums.types';
+import { updateLoginExpiresAt } from '../loginInfo/loginInfoActions';
+
+store.subscribe(
+  (state) => ({ account: state.account, network: state.network }), // only listen to changes in account and network
+  ({ account }) => {
+    const isLoggedIn = Boolean(account.address);
+    const loginTimestamp = getState().loginInfo.loginExpiresAt;
+
+    if (!isLoggedIn || loginTimestamp == null) {
+      return;
+    }
+
+    const isExpired = loginTimestamp - Date.now() < 0;
+
+    if (isExpired) {
+      logoutAction();
+      return;
+    }
+
+    updateLoginExpiresAt();
+  }
+);
 
 export const logoutAction = () =>
   store.setState((store) => {
     store.account = initialAccountState;
     store.loginInfo = initialLoginInfoState;
+    store.loginInfo.loginExpiresAt = null;
   });
 
 export interface LoginActionPayloadType {
@@ -20,5 +43,5 @@ export const loginAction = ({ address, loginMethod }: LoginActionPayloadType) =>
     account.address = address;
     account.publicKey = new Address(address).hex();
     loginInfo.loginMethod = loginMethod;
-    // setLoginExpiresAt(getNewLoginExpiresTimestamp());
+    updateLoginExpiresAt();
   });

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

@@ -22,6 +22,7 @@ export interface LoginInfoSliceType {
   walletConnectLogin: WalletConnectLoginType | null;
   ledgerLogin: LedgerLoginType | null;
   tokenLogin: TokenLoginType | null;
+  loginExpiresAt: number | null;
   walletLogin: LoginInfoType | null;
   extensionLogin: LoginInfoType | null;
   operaLogin: LoginInfoType | null;

src/store/slices/loginInfo/loginInfoSlice.ts

@@ -8,6 +8,7 @@ export const initialState: LoginInfoSliceType = {
   walletConnectLogin: null,
   ledgerLogin: null,
   tokenLogin: null,
+  loginExpiresAt: null,
   walletLogin: null,
   extensionLogin: null,
   operaLogin: null,

src/store/store.ts

@@ -1,5 +1,10 @@
 import { createStore } from 'zustand/vanilla';
-import { createJSONStorage, devtools, persist } from 'zustand/middleware';
+import {
+  createJSONStorage,
+  devtools,
+  persist,
+  subscribeWithSelector
+} from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
 import { networkSlice } from './slices/network/networkSlice';
 import { accountSlice } from './slices/account/accountSlice';
@@ -8,29 +13,33 @@ import { loginInfoSlice } from './slices/loginInfo';
 import { StoreType } from './store.types';
 
 export type MutatorsIn = [
+  ['zustand/subscribeWithSelector', never],
   ['zustand/devtools', never],
   ['zustand/persist', unknown],
   ['zustand/immer', never]
 ];
 
 export type MutatorsOut = [
+  ['zustand/subscribeWithSelector', never],
   ['zustand/devtools', never],
   ['zustand/persist', StoreType],
   ['zustand/immer', never]
 ];
 
 export const store = createStore<StoreType, MutatorsOut>(
-  devtools(
-    persist(
-      immer((...args) => ({
-        network: networkSlice(...args),
-        account: accountSlice(...args),
-        loginInfo: loginInfoSlice(...args)
-      })),
-      {
-        name: 'sdk-dapp-store',
-        storage: createJSONStorage(() => localStorage)
-      }
+  subscribeWithSelector(
+    devtools(
+      persist(
+        immer((...args) => ({
+          network: networkSlice(...args),
+          account: accountSlice(...args),
+          loginInfo: loginInfoSlice(...args)
+        })),
+        {
+          name: 'sdk-dapp-store',
+          storage: createJSONStorage(() => localStorage)
+        }
+      )
     )
   )
 );