diff --git a/src/widgets/sub-layout/index.tsx b/src/widgets/sub-layout/index.tsx index 6cf299b..2de960b 100644 --- a/src/widgets/sub-layout/index.tsx +++ b/src/widgets/sub-layout/index.tsx @@ -93,8 +93,7 @@ export const SubLayout = () => { clientAddressIP: token.clientAddressIP, requires2FA: token.requires2FA, }); - setHeaderNavigationKey(headerNavigationKey + 1); - setLoginSuccess(true); + callHomeGroups(); }).catch((error) => { // 토큰 요청 실패 시 로그아웃 처리 console.error('Failed to request token:', error); @@ -130,37 +129,9 @@ export const SubLayout = () => { const handleLogin = useCallback(async () =>{ - //let appStart = getLocalStorage(StorageKeys.AppStart); - //if(!!appStart){ - if(false){ - useStore.getState().UserStore.resetUserInfo(); - 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 - }); - setLoginSuccess(true); + callLogin(userParmas).then(() => { callHomeGroups(); - } - else{ - callLogin(userParmas).then(() => { - - callHomeGroups(); - }); - } - + }); }, []); const tokenTimeCheck = () => { @@ -168,15 +139,13 @@ export const SubLayout = () => { } useEffect(() => { - handleLogin(); - // handleRequestToken(); - /* - if (isNativeEnvironment) { + console.log('isNativeEnvironment : ['+isNativeEnvironment+']'); + if(isNativeEnvironment){ handleRequestToken(); - } else { + } + else{ handleLogin(); } - */ }, []); return (