diff --git a/.env.production b/.env.production index eaea4dd..a92aac9 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ -VITE_APP_ENV=production +VITE_APP_ENV=production VITE_APP_AUTH_PROXY_HOST='http://3.35.79.250:8090' VITE_APP_API_PROXY_HOST='http://3.35.79.250:8080' # VITE_APP_AUTH_PROXY_HOST='http://auth.nicepay.co.kr' diff --git a/docker/Dockerfile b/docker/Dockerfile index 401cb93..3294c7f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -30,7 +30,7 @@ FROM httpd:2.4-alpine AS production RUN apk add --no-cache bash # Copy built application from builder stage -COPY --from=builder /app/dist /usr/local/apache2/htdocs/ +COPY --from=builder /app/build /usr/local/apache2/htdocs/ # Copy Apache configuration COPY docker/apache.conf /usr/local/apache2/conf/httpd.conf diff --git a/index.html b/index.html index f4bc69f..6111089 100644 --- a/index.html +++ b/index.html @@ -1,10 +1,10 @@ + 나이스가맹점관리자 - 나이스가맹점관리자 diff --git a/src/app/index.tsx b/src/app/index.tsx index 151fd5c..93f72b8 100644 --- a/src/app/index.tsx +++ b/src/app/index.tsx @@ -16,12 +16,11 @@ const initApp = async () => { (async () => { await initApp(); const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement); + root.render( - - , ); // If you want to start measuring performance in your app, pass a function // to log results (for example: reportWebVitals(console.log)) diff --git a/src/pages/home/home-page.tsx b/src/pages/home/home-page.tsx index d56a9ce..fd50151 100644 --- a/src/pages/home/home-page.tsx +++ b/src/pages/home/home-page.tsx @@ -21,7 +21,7 @@ import { export const HomePage = () => { const { callLogin } = useUserInfo(); - const { openBiometricRegistrationPopup } = useAppBridge(); + const { isNativeEnvironment, openBiometricRegistrationPopup, requestToken, logout } = useAppBridge(); useSetHeaderTitle(''); useSetHeaderType(HeaderType.Home); useSetFooterMode(true); @@ -41,6 +41,51 @@ export const HomePage = () => { }; */ + const handleRequestToken = useCallback(async () =>{ + console.log('handleRequestToken'); + alert('handleRequestToken'); + requestToken() + .then((token) => { + if (!token) { + // 토큰이 null인 경우 로그아웃 처리 + console.error('Token is null, performing logout'); + useStore.getState().UserStore.resetUserInfo(); + setLoginSuccess(false); + logout(); + return; + } + console.log('token', token); + + setLocalStorage(StorageKeys.Usrid, token.usrid); + setLocalStorage(StorageKeys.TokenType, token.tokenType); + setLocalStorage(StorageKeys.AccessToken, token.accessToken); + setLocalStorage(StorageKeys.RefreshToken, token.refreshToken); + setLocalStorage(StorageKeys.AccessTokenExpiresIn, token.accessTokenExpiresIn); + setLocalStorage(StorageKeys.RefreshTokenExpiresIn, token.refreshTokenExpiresIn); + setLocalStorage(StorageKeys.MenuGrants, token.menuGrants); + + useStore.getState().UserStore.setUserInfo({ + usrid: token.usrid, + tokenType: token.tokenType, + accessToken: token.accessToken, + refreshToken: token.refreshToken, + accessTokenExpiresIn: token.accessTokenExpiresIn, + refreshTokenExpiresIn: token.refreshTokenExpiresIn, + menuGrants: token.menuGrants, + }); + + setLoginSuccess(true); + }) + .catch((error) => { + // 토큰 요청 실패 시 로그아웃 처리 + console.error('Failed to request token:', error); + useStore.getState().UserStore.resetUserInfo(); + setLoginSuccess(false); + logout(); + }); + + }, []); + const userParmas = { id: 'nictest00', password: 'nictest00' @@ -48,7 +93,7 @@ export const HomePage = () => { const handleLogin = useCallback(async () =>{ //let appStart = getLocalStorage(StorageKeys.AppStart); - + alert('handleLogin'); //if(!!appStart){ if(false){ useStore.getState().UserStore.resetUserInfo(); @@ -80,6 +125,7 @@ export const HomePage = () => { }, []); const checkBottomBannerOpen = () => { + console.log('checkBottomBannerOpen'); if(!!bannerToday){ bannerToday = bannerToday.toString(); } @@ -92,7 +138,7 @@ export const HomePage = () => { setAuthRegisterOn(true); } }).catch((e) => { - console.log('catch') + console.log('catch', e) }).finally(() => { console.log('finally') @@ -102,7 +148,17 @@ export const HomePage = () => { useEffect(() => { - handleLogin(); + // handleRequestToken(); + if (isNativeEnvironment) { + alert('isNativeEnvironment'); + console.log('isNativeEnvironment'); + handleRequestToken(); + } else { + alert('not isNativeEnvironment'); + console.log('not isNativeEnvironment'); + handleLogin(); + } + checkBottomBannerOpen(); checkAuthRegisterOpen(); }, []); @@ -133,7 +189,7 @@ export const HomePage = () => {
- { !!loginSuccess && + { loginSuccess && }
diff --git a/src/shared/configs/axios/index.ts b/src/shared/configs/axios/index.ts index e1c72b0..005f979 100644 --- a/src/shared/configs/axios/index.ts +++ b/src/shared/configs/axios/index.ts @@ -67,7 +67,7 @@ const onResponseRejected = (error: AxiosError) => { }; export const initAxios = () => { - axios.defaults.withCredentials = true; + axios.defaults.withCredentials = false; axios.defaults.timeout = 15000; axios.defaults.transitional = { clarifyTimeoutError: true, diff --git a/src/shared/constants/url.ts b/src/shared/constants/url.ts index dc224b9..74c1f0e 100644 --- a/src/shared/constants/url.ts +++ b/src/shared/constants/url.ts @@ -9,7 +9,7 @@ const getAPIBaseUrl = () => { } return rs; }; -const getAPIAuthBaseUrl = () => { +const getAPIAuthBaseUrl = () => { let rs = CURRENT_URL; console.log('VITE_APP_ENV : ', import.meta.env.VITE_APP_ENV); if(import.meta.env.VITE_APP_ENV === 'production'){ diff --git a/vite.config.mjs b/vite.config.mjs index c5aa51a..0ef6753 100644 --- a/vite.config.mjs +++ b/vite.config.mjs @@ -71,7 +71,7 @@ export default ({ mode }) => { }, }, esbuild: { - drop: ['console'], + drop: [], }, plugins: plugins, server: {