diff --git a/src/App.js b/src/App.js index d15ba88..1b702d0 100644 --- a/src/App.js +++ b/src/App.js @@ -1,4 +1,4 @@ -import { useEffect } from 'react'; +import { useEffect, useState } from 'react'; import { BrowserRouter } from 'react-router-dom'; import Routes from './routes'; import { createI18n, setLocaleData } from '@wordpress/i18n'; @@ -14,21 +14,25 @@ const i18n = createI18n({}, 'gepafin'); function App() { const role = useStore().main.getRole(); + const isAsyncRequest = useStore().main.isAsyncRequest(); + const [isMeRequest, setIsMeRequest] = useState(false) const callback = (data) => { - storeSet.main.unsetAsyncRequest(); if (data.status === 'SUCCESS') { storeSet.main.userData(data.data); } else { console.log('logout 1', data) storeSet.main.doLogout(); } + storeSet.main.unsetAsyncRequest(); + setIsMeRequest(false); } const errCallback = (data) => { - console.log('logout 2', data) + console.log('logout 2', data, 'token:', storeGet.main.token(), isAsyncRequest, 'isMeRequest:', isMeRequest) storeSet.main.doLogout(); storeSet.main.unsetAsyncRequest(); + setIsMeRequest(false); } const companyCallback = (data) => { @@ -42,6 +46,7 @@ function App() { console.log('logout 3', data) storeSet.main.doLogout(); storeSet.main.unsetAsyncRequest(); + setIsMeRequest(false); } useEffect(() => { @@ -53,6 +58,7 @@ function App() { }, [role]) useEffect(() => { + setIsMeRequest(true); storeSet.main.setAsyncRequest(); AuthenticationService.me(callback, errCallback);