From b2c60f672a8a7392fb2c29b3e89c4e9bd597d176 Mon Sep 17 00:00:00 2001 From: "focp212@naver.com" Date: Tue, 9 Sep 2025 14:26:13 +0900 Subject: [PATCH] test login --- index.html | 14 ++++++++ src/entities/user/lib/use-user-info.ts | 50 ++++++++++++++++---------- src/entities/user/model/store.ts | 4 +-- src/shared/constants/local-storage.ts | 5 +-- 4 files changed, 50 insertions(+), 23 deletions(-) diff --git a/index.html b/index.html index 28caadd..54fbd9b 100644 --- a/index.html +++ b/index.html @@ -12,6 +12,20 @@ +
diff --git a/src/entities/user/lib/use-user-info.ts b/src/entities/user/lib/use-user-info.ts index fa9c726..5219d86 100644 --- a/src/entities/user/lib/use-user-info.ts +++ b/src/entities/user/lib/use-user-info.ts @@ -1,21 +1,37 @@ import { LoginParams } from '@/entities/user/model/types'; import { StorageKeys } from '@/shared/constants/local-storage'; -import { setLocalStorage } from '@/shared/lib/web-view-bridge'; +import { setLocalStorage, getLocalStorage } from '@/shared/lib/web-view-bridge'; import { useLoginMutation } from '@/entities/user/api/use-login-mutation'; import { useStore } from '~/shared/model/store'; export const useUserInfo = () => { const { mutateAsync: login } = useLoginMutation(); const callLogin = async (params: LoginParams) => { - try{ - useStore.getState().UserStore.resetUserInfo(); - - const result = await login(params); - if(result.requires2FA){ - // 2차인증 필요 - - } - else{ + useStore.getState().UserStore.resetUserInfo(); + let appStart = getLocalStorage(StorageKeys.AppStart); + + if(!!appStart){ + let tokenType = getLocalStorage(StorageKeys.TokenType); + let accessToken = getLocalStorage(StorageKeys.AccessToken); + let refreshToken = getLocalStorage(StorageKeys.RefreshToken); + let accessTokenExpiresIn = getLocalStorage(StorageKeys.AccessTokenExpiresIn); + let refreshTokenExpiresIn = getLocalStorage(StorageKeys.RefreshTokenExpiresIn); + let menuGrants = getLocalStorage(StorageKeys.TokenType); + let usrid = getLocalStorage(StorageKeys.Usrid); + + useStore.getState().UserStore.setUserInfo({ + tokenType: tokenType, + accessToken: accessToken, + refreshToken: refreshToken, + accessTokenExpiresIn: accessTokenExpiresIn, + refreshTokenExpiresIn: refreshTokenExpiresIn, + menuGrants: menuGrants, + usrid: usrid + }); + } + /* + else{ + login(params).then((result) => { const { tokenType, accessToken, @@ -23,10 +39,9 @@ export const useUserInfo = () => { accessTokenExpiresIn, refreshTokenExpiresIn, menuGrants, - usrid, - clientAddressIP, - requires2FA + usrid } = result; + setLocalStorage(StorageKeys.TokenType, tokenType); setLocalStorage(StorageKeys.AccessToken, accessToken); setLocalStorage(StorageKeys.RefreshToken, refreshToken); @@ -34,15 +49,12 @@ export const useUserInfo = () => { setLocalStorage(StorageKeys.RefreshTokenExpiresIn, refreshTokenExpiresIn); setLocalStorage(StorageKeys.MenuGrants, menuGrants); setLocalStorage(StorageKeys.Usrid, usrid); - setLocalStorage(StorageKeys.ClientAddressIP, clientAddressIP); - setLocalStorage(StorageKeys.Requires2FA, requires2FA); useStore.getState().UserStore.setUserInfo(result); - } - } - catch(e: any){ - + }); } + */ + }; return { callLogin, diff --git a/src/entities/user/model/store.ts b/src/entities/user/model/store.ts index 2968f7d..5e0e9c9 100644 --- a/src/entities/user/model/store.ts +++ b/src/entities/user/model/store.ts @@ -32,8 +32,8 @@ export const createUserInfoStore = lens((set, get) => ({ window.localStorage.removeItem(StorageKeys.RefreshTokenExpiresIn); window.localStorage.removeItem(StorageKeys.MenuGrants); window.localStorage.removeItem(StorageKeys.Usrid); - window.localStorage.removeItem(StorageKeys.ClientAddressIP); - window.localStorage.removeItem(StorageKeys.Requires2FA); + // window.localStorage.removeItem(StorageKeys.ClientAddressIP); + // window.localStorage.removeItem(StorageKeys.Requires2FA); set(initialState); }, })); diff --git a/src/shared/constants/local-storage.ts b/src/shared/constants/local-storage.ts index 12f8ba7..78b62ab 100644 --- a/src/shared/constants/local-storage.ts +++ b/src/shared/constants/local-storage.ts @@ -1,4 +1,5 @@ export enum StorageKeys { + AppStart = 'APP_START', TokenType = 'TOKEN_TYPE', AccessToken = 'ACCESS_TOKEN', RefreshToken = 'REFRESH_TOKEN', @@ -6,8 +7,8 @@ export enum StorageKeys { RefreshTokenExpiresIn = 'REFRESH_TOKEN_EXPIRES_IN', MenuGrants = 'MENU_GRANTS', Usrid = 'USRID', - ClientAddressIP = 'ClIENT_ADDRESS_IP', - Requires2FA = 'REQUIRES_2FA', + // ClientAddressIP = 'ClIENT_ADDRESS_IP', + // Requires2FA = 'REQUIRES_2FA', BottomBannerClose = 'BOTTOM_BANNER_CLOSE', RootStore = 'ROOT_STORE',