test
This commit is contained in:
25
client/package-lock.json
generated
25
client/package-lock.json
generated
@@ -19,6 +19,7 @@
|
||||
"@types/react-dom": "^19.0.4",
|
||||
"antd": "^5.24.7",
|
||||
"axios": "^1.9.0",
|
||||
"axios-retry": "^4.5.0",
|
||||
"i18next": "^25.0.1",
|
||||
"i18next-browser-languagedetector": "^8.0.5",
|
||||
"react": "^18.3.1",
|
||||
@@ -5275,6 +5276,18 @@
|
||||
"proxy-from-env": "^1.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/axios-retry": {
|
||||
"version": "4.5.0",
|
||||
"resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-4.5.0.tgz",
|
||||
"integrity": "sha512-aR99oXhpEDGo0UuAlYcn2iGRds30k366Zfa05XWScR9QaQD4JYiP3/1Qt1u7YlefUOK+cn0CcwoL1oefavQUlQ==",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"is-retry-allowed": "^2.2.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"axios": "0.x || 1.x"
|
||||
}
|
||||
},
|
||||
"node_modules/axios/node_modules/form-data": {
|
||||
"version": "4.0.3",
|
||||
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz",
|
||||
@@ -10092,6 +10105,18 @@
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/is-retry-allowed": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz",
|
||||
"integrity": "sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/is-root": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
|
||||
|
@@ -14,6 +14,7 @@
|
||||
"@types/react-dom": "^19.0.4",
|
||||
"antd": "^5.24.7",
|
||||
"axios": "^1.9.0",
|
||||
"axios-retry": "^4.5.0",
|
||||
"i18next": "^25.0.1",
|
||||
"i18next-browser-languagedetector": "^8.0.5",
|
||||
"react": "^18.3.1",
|
||||
|
@@ -2,12 +2,13 @@ import React from 'react';
|
||||
import { Route, Routes } from 'react-router-dom';
|
||||
import MainLayout from './pages/MainLayout';
|
||||
import ProtectedRoute from './pages/ProtectedRoute';
|
||||
import LoginPage from './pages/LoginPage';
|
||||
|
||||
function App() {
|
||||
return (
|
||||
<div className="App">
|
||||
<Routes>
|
||||
<Route path="/login" element={<div>login</div>} />
|
||||
<Route path="/login" element={<LoginPage />} />
|
||||
<Route element={<ProtectedRoute />}>
|
||||
<Route path="*" element={<MainLayout />}></Route>
|
||||
</Route>
|
||||
|
@@ -1,5 +1,8 @@
|
||||
import axios from 'axios';
|
||||
import { Access, Auth } from '../types/auth';
|
||||
import { User } from '../types/user';
|
||||
import { AuthService } from '../services/auth';
|
||||
import axiosRetry from 'axios-retry';
|
||||
|
||||
const baseURL = `${process.env.REACT_APP_HTTP_PROTOCOL}://${process.env.REACT_APP_API_URL}/api/v1`;
|
||||
|
||||
@@ -11,20 +14,75 @@ const base = axios.create({
|
||||
},
|
||||
});
|
||||
|
||||
// base.interceptors.request.use((config) => {
|
||||
// const token = localStorage.getItem('accessToken');
|
||||
// if (token) {
|
||||
// config.headers.Authorization = `Bearer ${token}`;
|
||||
// }
|
||||
// return config;
|
||||
base.interceptors.request.use((config) => {
|
||||
const token = localStorage.getItem('accessToken');
|
||||
if (token) {
|
||||
config.headers.Authorization = `Bearer ${token}`;
|
||||
}
|
||||
return config;
|
||||
});
|
||||
|
||||
// axiosRetry(base, {
|
||||
// retries: 3,
|
||||
// retryDelay: (retryCount: number) => {
|
||||
// console.log(`retry attempt: ${retryCount}`);
|
||||
// return retryCount * 2000;
|
||||
// },
|
||||
// retryCondition: async (error: any) => {
|
||||
// if (error.code === 'ERR_CANCELED') {
|
||||
// return true;
|
||||
// }
|
||||
// return false;
|
||||
// },
|
||||
// });
|
||||
|
||||
base.interceptors.response.use(
|
||||
(response) => {
|
||||
return response;
|
||||
},
|
||||
async function (error) {
|
||||
console.log('error', error);
|
||||
const originalRequest = error.response.config;
|
||||
console.log('originalRequest._retry', originalRequest);
|
||||
const urlTokens = error?.request?.responseURL.split('/');
|
||||
const url = urlTokens[urlTokens.length - 1];
|
||||
console.log('url', url);
|
||||
if (
|
||||
error.response.status === 401 &&
|
||||
!(originalRequest?._retry != null) &&
|
||||
url !== 'login' &&
|
||||
url !== 'refresh' &&
|
||||
url !== 'logout'
|
||||
) {
|
||||
originalRequest._retry = true;
|
||||
const res = await AuthService.refresh().catch(async () => {
|
||||
await AuthService.logout();
|
||||
});
|
||||
console.log('res', res);
|
||||
return await base(originalRequest);
|
||||
}
|
||||
return await Promise.reject(error);
|
||||
}
|
||||
);
|
||||
|
||||
const api = {
|
||||
// auth
|
||||
async login(auth: Auth): Promise<Access> {
|
||||
console.log(auth);
|
||||
const response = await base.post<Access>('/auth', auth);
|
||||
return response.data;
|
||||
},
|
||||
|
||||
async refreshToken(): Promise<Access> {
|
||||
const response = await base.post<Access>('/auth/refresh');
|
||||
return response.data;
|
||||
},
|
||||
|
||||
// user
|
||||
async getProfile(): Promise<User> {
|
||||
const response = await base.get<User>('/profile');
|
||||
return response.data;
|
||||
},
|
||||
};
|
||||
|
||||
export default api;
|
||||
|
@@ -9,6 +9,8 @@ import RunningProcessesPage from './RunningProcessesPage';
|
||||
import AccountsPage from './AccountsPage';
|
||||
import EventsListPage from './EventsListPage';
|
||||
import ConfigurationPage from './ConfigurationPage';
|
||||
import { useSetUserSelector } from '../store/user';
|
||||
import { UserService } from '../services/user';
|
||||
|
||||
export default function MainLayout() {
|
||||
const navigate = useNavigate();
|
||||
@@ -19,6 +21,8 @@ export default function MainLayout() {
|
||||
const [width, setWidth] = useState<number | string>('15%');
|
||||
const [collapsedWidth, setCollapsedWidth] = useState(50);
|
||||
|
||||
const setUser = useSetUserSelector()
|
||||
|
||||
const calculateWidths = () => {
|
||||
const windowWidth = window.innerWidth;
|
||||
const expanded = Math.min(Math.max(windowWidth * 0.15, 180), 240);
|
||||
@@ -54,6 +58,21 @@ export default function MainLayout() {
|
||||
navigate(key);
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
const token = localStorage.getItem('accessToken');
|
||||
if (!token) {
|
||||
navigate('/login');
|
||||
} else {
|
||||
if (localStorage.getItem('user')) {
|
||||
setUser(JSON.parse(localStorage.getItem('user') as string))
|
||||
} else {
|
||||
UserService.getProfile().then((user) => {
|
||||
setUser(user);
|
||||
});
|
||||
}
|
||||
}
|
||||
}, [])
|
||||
|
||||
return (
|
||||
<Layout style={{ minHeight: '100vh' }}>
|
||||
<Sider
|
||||
|
@@ -1,8 +1,19 @@
|
||||
/* eslint-disable react-hooks/exhaustive-deps */
|
||||
// ProtectedRoute.js
|
||||
import { Outlet } from 'react-router-dom';
|
||||
import React from 'react';
|
||||
import { Outlet, useNavigate } from 'react-router-dom';
|
||||
import React, { useEffect } from 'react';
|
||||
import { useUserSelector } from '../store/user';
|
||||
|
||||
const ProtectedRoute = (): React.JSX.Element => {
|
||||
const user = useUserSelector();
|
||||
const navigate = useNavigate();
|
||||
|
||||
useEffect(() => {
|
||||
if (user.id === null) {
|
||||
navigate('/login');
|
||||
}
|
||||
}, [user]);
|
||||
|
||||
return <Outlet />;
|
||||
};
|
||||
export default ProtectedRoute;
|
||||
|
@@ -11,6 +11,7 @@ type UserStoreState = {
|
||||
|
||||
type UserStoreActions = {
|
||||
setUser: (user: User) => void;
|
||||
removeUser: () => void;
|
||||
};
|
||||
|
||||
type UserStore = UserStoreState & UserStoreActions;
|
||||
@@ -22,6 +23,7 @@ export const useUserStore = create<UserStore>()(
|
||||
user: userInfo != null ? JSON.parse(userInfo) : ({} as User),
|
||||
loading: false,
|
||||
setUser: (user: User) => set({ user }),
|
||||
removeUser: () => set({ user: {} as User }),
|
||||
}),
|
||||
{ name: 'userInfo' }
|
||||
)
|
||||
|
Reference in New Issue
Block a user