Skip to content

Commit f534fcc

Browse files
authored
Merge pull request #29 from team-aliens/fix/28-android-webview-network-error
fix : axios 파일 수정
2 parents 8e3e0b3 + 3bf0d68 commit f534fcc

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

src/apis/axios.ts

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
1-
import axios, {AxiosError} from "axios";
2-
import { getCookie } from "../utils/cookies";
3-
import { setCookie } from "../utils/cookies";
4-
import { reIssueToken } from "./auth";
1+
import axios, { AxiosError } from 'axios';
2+
import { getCookie } from '../utils/cookies';
3+
import { setCookie } from '../utils/cookies';
4+
import { reIssueToken } from './auth';
55

66
export const instance = axios.create({
7-
baseURL: `https://dev-api.dms-dsm.com`,
7+
baseURL: process.env.REACT_APP_BASE_URL,
88
timeout: 10000,
99
});
1010

1111
instance.interceptors.request.use(
1212
(config) => {
1313
const accessToken = getCookie('access_token');
14-
const returnConfig = {
15-
...config,
16-
};
1714
if (accessToken) {
18-
// @ts-ignore
19-
returnConfig.headers = {
20-
Authorization: `Bearer ${accessToken}`,
21-
};
15+
config.headers = config.headers ?? {};
16+
config.headers.Authorization = `Bearer ${accessToken}`;
2217
}
23-
return returnConfig;
18+
return config;
2419
},
2520
(error: AxiosError) => Promise.reject(error),
2621
);
@@ -29,7 +24,7 @@ instance.interceptors.response.use(
2924
(response) => response,
3025
async (error: AxiosError<AxiosError>) => {
3126
if (axios.isAxiosError(error) && error.response) {
32-
const {config} = error;
27+
const { config } = error;
3328
const refreshToken = getCookie('refresh_token');
3429
if (error.response.data.message === 'Expired Token') {
3530
if (refreshToken) {
@@ -47,8 +42,8 @@ instance.interceptors.response.use(
4742
});
4843

4944
if (config?.headers)
50-
config.headers['Authorization'] = `Bearer ${res.access_token}`
51-
45+
config.headers['Authorization'] = `Bearer ${res.access_token}`;
46+
5247
return axios(config!);
5348
} catch (error) {
5449
return Promise.reject(error);
@@ -61,5 +56,5 @@ instance.interceptors.response.use(
6156
}
6257
}
6358
return Promise.reject(error);
64-
}
59+
},
6560
);

0 commit comments

Comments
 (0)