Bläddra i källkod

Update JWT timeout

master
cyril.tsui 1 år sedan
förälder
incheckning
35cda75c96
2 ändrade filer med 25 tillägg och 7 borttagningar
  1. +24
    -7
      src/auth/index.js
  2. +1
    -0
      src/pages/authentication/auth-forms/AuthLoginCustom.js

+ 24
- 7
src/auth/index.js Visa fil

@@ -93,6 +93,7 @@ export const handleLogoutFunction = () => {
localStorage.removeItem(windowCount) localStorage.removeItem(windowCount)
localStorage.removeItem(predictProductionQty) localStorage.removeItem(predictProductionQty)
localStorage.removeItem(predictUsageCount) localStorage.removeItem(predictUsageCount)
setTimeout(()=> localStorage.removeItem("expiredAlertShown"), 5000)
} }
} }


@@ -109,11 +110,14 @@ export const SetupAxiosInterceptors = () => {
// ** If token is present add it to request's Authorization Header // ** If token is present add it to request's Authorization Header
if (isUserLoggedIn()) { if (isUserLoggedIn()) {
config.headers.Authorization = `${jwtApplicationConfig.tokenType} ${accessToken}` config.headers.Authorization = `${jwtApplicationConfig.tokenType} ${accessToken}`
config.data = config.data === undefined ? JSON.stringify({refreshToken:null}) : config.data
} }
config.headers['X-Authorization'] = process.env.REACT_APP_API_KEY config.headers['X-Authorization'] = process.env.REACT_APP_API_KEY
return config return config
}, },
error => Promise.reject(error)
error => {
Promise.reject(error)
}
) )


axios.interceptors.response.use( axios.interceptors.response.use(
@@ -124,23 +128,36 @@ export const SetupAxiosInterceptors = () => {
error => { error => {
// ** const { config, response: { status } } = error // ** const { config, response: { status } } = error
const {response} = error const {response} = error

if (error.response.status === 401) { if (error.response.status === 401) {
dispatch(handleLogoutFunction());
navigate('/login');
if (localStorage.getItem("expiredAlertShown") === null) {
localStorage.setItem("expiredAlertShown", true)
alert("登入驗證已過期,請重新登入。")
}
} }


// ** if (status === 401) { // ** if (status === 401) {
if (response.status === 401) { if (response.status === 401) {
dispatch(handleLogoutFunction());
navigate('/login');
if (localStorage.getItem("expiredAlertShown") === null) {
localStorage.setItem("expiredAlertShown", true)
alert("登入驗證已過期,請重新登入。")
}
} }


if (response && response.status === 401) { if (response && response.status === 401) {
if (localStorage.getItem("expiredAlertShown") === null) {
localStorage.setItem("expiredAlertShown", true)
alert("登入驗證已過期,請重新登入。")
}
}

if (localStorage.getItem("expiredAlertShown")) {
dispatch(handleLogoutFunction()); dispatch(handleLogoutFunction());
navigate('/login'); navigate('/login');
} }

return Promise.reject(error) return Promise.reject(error)
}
},
) )
} }

+ 1
- 0
src/pages/authentication/auth-forms/AuthLoginCustom.js Visa fil

@@ -86,6 +86,7 @@ const AuthLoginCustom = () => {
// setSuccess(true) // setSuccess(true)
dispatch(handleLogin(data)) dispatch(handleLogin(data))
navigate('/dashboard'); navigate('/dashboard');
location.reload()
// setSumitting(false) // setSumitting(false)
}) })
.catch((error) => { .catch((error) => {


Laddar…
Avbryt
Spara