Skip to content

Commit 5aa8661

Browse files
authored
Improve/move list (#100)
* feat(move-list): added line suggestion * chore(move-list): added translations * feat(controls): change behaviour of the display line button * fix(auth): fix refresh
1 parent f7e6726 commit 5aa8661

File tree

1 file changed

+35
-33
lines changed

1 file changed

+35
-33
lines changed

src/api/index.ts

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import axios from 'axios';
2+
import { useAuthStore } from '@/store/auth.ts';
3+
import { refreshTokens } from '@/api/auth.ts';
24
// import { useAuthStore } from '@/store/auth.ts';
35
// import { refreshTokens } from '@/api/auth.ts';
46

@@ -9,45 +11,45 @@ export const api = axios.create({
911
},
1012
});
1113

12-
// api.interceptors.request.use(
13-
// (request) => {
14-
// const accessToken = useAuthStore.getState().accessToken;
14+
api.interceptors.request.use(
15+
(request) => {
16+
const accessToken = useAuthStore.getState().accessToken;
1517

16-
// if (accessToken) request.headers['Authorization'] = `Bearer ${accessToken}`;
18+
if (accessToken) request.headers['Authorization'] = `Bearer ${accessToken}`;
1719

18-
// return request;
19-
// },
20-
// (error) => {
21-
// return Promise.reject(error);
22-
// },
23-
// );
20+
return request;
21+
},
22+
(error) => {
23+
return Promise.reject(error);
24+
},
25+
);
2426

25-
// api.interceptors.response.use(
26-
// (response) => response,
27-
// async (error) => {
28-
// const originalRequest = error.config;
29-
// if (error.response.status === 401 && !originalRequest._retry) {
30-
// originalRequest._retry = true;
31-
// try {
32-
// const response = await refreshTokens();
33-
// const { accessToken, refreshToken: newRefreshToken } = response.data;
27+
api.interceptors.response.use(
28+
(response) => response,
29+
async (error) => {
30+
const originalRequest = error.config;
31+
if (error.response.status === 401 && !originalRequest._retry) {
32+
originalRequest._retry = true;
33+
try {
34+
const response = await refreshTokens();
35+
const { accessToken, refreshToken: newRefreshToken } = response.data;
3436

35-
// useAuthStore.getState().setAccessToken(accessToken);
36-
// useAuthStore.getState().setRefreshToken(newRefreshToken);
37+
useAuthStore.getState().setAccessToken(accessToken as string);
38+
useAuthStore.getState().setRefreshToken(newRefreshToken as string);
3739

38-
// api.defaults.headers.common['Authorization'] = `Bearer ${accessToken}`;
40+
api.defaults.headers.common['Authorization'] = `Bearer ${accessToken}`;
3941

40-
// return api(originalRequest);
41-
// } catch (refreshError) {
42-
// console.error('Token refresh failed:', refreshError);
42+
return api(originalRequest);
43+
} catch (refreshError) {
44+
console.error('Token refresh failed:', refreshError);
4345

44-
// useAuthStore.getState().logout();
46+
useAuthStore.getState().logout();
4547

46-
// window.location.href = '/login';
48+
window.location.href = '/login';
4749

48-
// return Promise.reject(refreshError);
49-
// }
50-
// }
51-
// return Promise.reject(error);
52-
// },
53-
// );
50+
return Promise.reject(refreshError);
51+
}
52+
}
53+
return Promise.reject(error);
54+
},
55+
);

0 commit comments

Comments
 (0)