From e57893b1b2a9b1cc825909855834b641c373e7dd Mon Sep 17 00:00:00 2001 From: Sabir Hassan Date: Wed, 20 Mar 2024 09:44:10 +0500 Subject: [PATCH] chore: no need to expire auth token --- src/controllers/AuthController.ts | 22 ++++------------------ src/types/auth.ts | 4 ---- src/types/index.ts | 1 - src/utils/localStorage.ts | 21 +++------------------ 4 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 src/types/auth.ts diff --git a/src/controllers/AuthController.ts b/src/controllers/AuthController.ts index 4992274..8e488c5 100644 --- a/src/controllers/AuthController.ts +++ b/src/controllers/AuthController.ts @@ -10,7 +10,7 @@ import { saveAuthToken } from '../utils' import { appPrivateRoutes } from '../routes' -import { AuthToken, SignedEvent } from '../types' +import { SignedEvent } from '../types' export class AuthController { private nostrController: NostrController @@ -76,8 +76,8 @@ export class AuthController { checkSession() { const savedAuthToken = getAuthToken() - if (savedAuthToken && this.isTokenValid(savedAuthToken)) { - const signedEvent = base64DecodeAuthToken(savedAuthToken.token) + if (savedAuthToken) { + const signedEvent = base64DecodeAuthToken(savedAuthToken) store.dispatch( setAuthState({ @@ -97,25 +97,11 @@ export class AuthController { ) } - private isTokenValid(authToken: AuthToken): boolean { - const timeNow = Math.round(Date.now() / 1000) - const eventExpiresAt = authToken.expiresAt - const timeDifference = eventExpiresAt - timeNow - - // check if previous authToken has expired or not - if (timeDifference > 0) { - return true - } - - return false - } - private createAndSaveAuthToken(signedAuthEvent: SignedEvent) { const base64Encoded = base64EncodeSignedEvent(signedAuthEvent) // save newly created auth token (base64 nostr singed event) in local storage along with expiry time - const createdAt = Math.round(Date.now() / 1000) - saveAuthToken(base64Encoded, createdAt + 3600) // 3600 secs = 1 hour + saveAuthToken(base64Encoded) return base64Encoded } } diff --git a/src/types/auth.ts b/src/types/auth.ts deleted file mode 100644 index 1bffb49..0000000 --- a/src/types/auth.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface AuthToken { - token: string - expiresAt: number -} diff --git a/src/types/index.ts b/src/types/index.ts index 0f820f1..3002541 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -1,3 +1,2 @@ -export * from './auth' export * from './nostr' export * from './profile' diff --git a/src/utils/localStorage.ts b/src/utils/localStorage.ts index a20fffb..15c17db 100644 --- a/src/utils/localStorage.ts +++ b/src/utils/localStorage.ts @@ -1,5 +1,4 @@ import { State } from '../store/rootReducer' -import { AuthToken } from '../types' export const saveState = (state: object) => { try { @@ -55,26 +54,12 @@ export const getVisitedLink = () => { } } -export const saveAuthToken = (token: string, expiresAt: number) => { - localStorage.setItem( - 'authToken', - JSON.stringify({ - token, - expiresAt - }) - ) +export const saveAuthToken = (token: string) => { + localStorage.setItem('authToken', token) } export const getAuthToken = () => { - const serializedAuthDetail = localStorage.getItem('authToken') - - if (!serializedAuthDetail) return null - - try { - return JSON.parse(serializedAuthDetail) as AuthToken - } catch { - return null - } + return localStorage.getItem('authToken') } export const clearAuthToken = () => {