back

src/auth/index.js

@@ -25,9 +25,6 @@ export const handleLogin = data => {
             refreshToken: data['refreshToken']
         })
 
-        const loginDate = new Date()
-        loginDate.setMinutes(loginDate.getMinutes() + 60)
-
         console.log(data)
         // ** Add to user, accessToken & refreshToken to localStorage
         localStorage.setItem('userData', JSON.stringify(data))
@@ -36,7 +33,6 @@ export const handleLogin = data => {
         localStorage.setItem('axiosToken', "Bearer " + data.accessToken)
         //localStorage.setItem(config.storageUserRoleKeyName, JSON.stringify(data.role).slice(1).slice(0, -1))
         localStorage.setItem(refreshIntervalName, "60")
-        localStorage.setItem('refreshTokenExpirationTime', loginDate)
         // for demo only
         localStorage.setItem(windowCount, '0')
         localStorage.setItem(predictProductionQty, '0')
@@ -97,8 +93,6 @@ export const handleLogoutFunction = () => {
         localStorage.removeItem(windowCount)
         localStorage.removeItem(predictProductionQty)
         localStorage.removeItem(predictUsageCount)
-        localStorage.removeItem("refreshTokenExpirationTime")
-
     }
 }
 
@@ -107,7 +101,6 @@ export const SetupAxiosInterceptors = () => {
     const navigate = useNavigate()
     const dispatch = useDispatch();
     //const updateLastRequestTime = useContext(TimerContext);
-
     axios.interceptors.request.use(
         config => {
             // ** Get token from localStorage
@@ -118,7 +111,6 @@ export const SetupAxiosInterceptors = () => {
                 config.headers.Authorization = `${jwtApplicationConfig.tokenType} ${accessToken}`
             }
             config.headers['X-Authorization'] = process.env.REACT_APP_API_KEY
-
             return config
         },
         error => Promise.reject(error)

src/routes/index.js

@@ -14,36 +14,19 @@ import {
 } from "utils/Utils";
 import { Navigate } from "react-router";
 import {
-    SetupAxiosInterceptors, handleLogoutFunction,
+    SetupAxiosInterceptors,
 } from "auth/index";
 import SettingRoutes from './SettingRoutes';
-// import { useNavigate } from 'react-router-dom'
-import { useDispatch } from 'react-redux'
 // import Loadable from 'components/Loadable';
 // import { lazy } from 'react';
 // const SettingRoutes = Loadable(lazy(() => import('./SettingRoutes')));
 // ==============================|| ROUTING RENDER ||============================== //
 
 export default function ThemeRoutes() {
-    // const navigate = useNavigate()
-    const dispatch = useDispatch();
-    // let isExpired = false;
 
     if (isUserLoggedIn()) {
         //auto logout if token not valid
         SetupAxiosInterceptors();
-        if (new Date(localStorage.getItem("refreshTokenExpirationTime")) < new Date()) {
-            window.alert("登入認證已過期，請重新登入。")
-            dispatch(handleLogoutFunction());
-            // isExpired = true
-        }
-
-        // if (isExpired) {
-            // dispatch(handleLogoutFunction());
-            // console.log("first")
-            // navigate('/login')
-            // isExpired = false
-        // }
     }
     // console.log();
     return useRoutes([{