Skip to content

Commit

Permalink
Merge pull request #479 from TEAM-BEAT/fix/#469
Browse files Browse the repository at this point in the history 
fix: 리프레시 토큰 재발급 오류 수정
  • Loading branch information
@pepperdad
pepperdad authored Dec 29, 2024
2 parents b1c9856 + d17817c commit f383e26
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 78 deletions.
2 changes: 1 addition & 1 deletion src/apis/domains/users/api.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { components } from "@typings/api/schema";
import { ApiResponseType } from "@typings/commonType";
import { AxiosResponse } from "axios";

type LoginSuccessResponse = components["schemas"]["LoginSuccessResponse"];
type LoginSuccessResponse = components["schemas"]["MemberLoginResponse"];

export const postKakaoLogin = async (authCode: string): Promise<LoginSuccessResponse | null> => {
try {
Expand Down
2 changes: 1 addition & 1 deletion src/apis/domains/users/queries.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const QUERY_KEY = {
KAKAO_LOGIN: "kakaoLogin",
};

type LoginSuccessResponse = components["schemas"]["LoginSuccessResponse"];
type LoginSuccessResponse = components["schemas"]["MemberLoginResponse"];

export const usePostKakaoLogin = () => {
const [, setUserData] = useAtom(userAtom);
Expand Down
107 changes: 51 additions & 56 deletions src/hooks/useTokenRefresher.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
import { instance } from "@apis/index";
import axios, { AxiosResponse } from "axios";
import { useEffect } from "react";
import { useNavigate } from "react-router-dom";
import { useLocation, useNavigate } from "react-router-dom";
import useModal from "./useModal";

export default function TokenRefresher() {
const location = useLocation();
const navigate = useNavigate();
const { openAlert } = useModal();

useEffect(() => {
const user = localStorage.getItem("user");

const getCookie = (name: string): string | undefined => {
const value = `; ${document.cookie}`;
const parts = value.split(`; ${name}=`);
if (parts.length === 2) {
return parts.pop()?.split(";").shift();
}
};

if (user) {
if (!JSON.parse(user)?.role) {
const userString = localStorage.getItem("user");
if (userString) {
if (!JSON.parse(userString)?.role) {
// 기존에 존재하던 유저 role 유무로 임시로 토큰 제거 후 리로드
localStorage.clear();
openAlert({ title: "다시 로그인 해주세요." });
window.location.reload();
openAlert({
title: "다시 로그인 해주세요.",
okCallback: () => {
localStorage.clear();
if (location.pathname === "/main") {
window.location.reload();
} else {
navigate("/main");
}
},
});

return;
}
}
Expand All @@ -34,53 +37,45 @@ export default function TokenRefresher() {
const originalConfig = error.config;
const status = error?.response?.status;

// if (status === 401 && user) {
// try {
// const refreshToken = getCookie("refreshToken");

// const response: AxiosResponse<{ data: { accessToken: string } }> = await axios.get(
// `${import.meta.env.VITE_API_BASE_URL}/users/refresh-token`,
// {
// headers: {
// Authorization_Refresh: `Bearer ${refreshToken}`,
// },
// }
// );
if (status === 401 && userString) {
try {
const response: AxiosResponse<{ data: { accessToken: string } }> = await axios.get(
`${import.meta.env.VITE_API_BASE_URL}/users/refresh-token`,
{
withCredentials: true,
}
);

// const newAccessToken = response.data?.data?.accessToken;
const newAccessToken = response.data?.data?.accessToken;

// if (newAccessToken) {
// localStorage.setItem("accessToken", `Bearer ${newAccessToken}`);
// originalConfig.headers["Authorization"] = `Bearer ${newAccessToken}`;
// return instance(originalConfig);
// }
// throw new Error("Failed to refresh access token");
// } catch (refreshError) {
// if (refreshError.response?.status === 404) {
// // 리프레시 토큰도 없다? 다시 로그인
// // 그렇지 않으면 요청이 성공하겠찌.. ?
// }
// console.error("Token refresh failed:", refreshError);
// // localStorage.clear();
// // navigate("/main");
// openAlert({ title: "장시간 미활동으로 인해 \n자동으로 로그아웃 되었습니다." });
// // window.location.reload();
// }
// } else if (status === 500) {
// openAlert({
// title: "서버에 문제가 발생했습니다. 잠시 후 다시 시도해주세요.",
// });
// }

if (status === 401) {
const user = JSON.parse(userString);
user.accessToken = newAccessToken;
if (newAccessToken) {
localStorage.setItem("user", JSON.stringify(user));
originalConfig.headers["Authorization"] = `Bearer ${newAccessToken}`;
return instance(originalConfig);
}
throw new Error("Failed to refresh access token");
} catch (refreshError) {
if (refreshError.response?.status === 401) {
openAlert({
title: "장시간 미활동으로 인해 \n자동으로 로그아웃 되었습니다.",
okCallback: () => {
localStorage.clear();
if (location.pathname === "/main") {
window.location.reload();
} else {
navigate("/main");
}
},
});
}
}
} else if (status === 500) {
openAlert({
title: "서버에 문제가 발생했습니다. 잠시 후 다시 시도해주세요.",
});
localStorage.clear();
navigate("/main");
}

console.error("응답 에러:", error);
return Promise.reject(error);
}
);
Expand Down
39 changes: 19 additions & 20 deletions src/typings/api/schema/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -790,17 +790,16 @@ export interface components {
/** @enum {string} */
socialType: "KAKAO";
};
LoginSuccessResponse: {
MemberLoginResponse: {
accessToken?: string;
refreshToken?: string;
nickname?: string;
role?: string;
};
SuccessResponseLoginSuccessResponse: {
SuccessResponseMemberLoginResponse: {
/** Format: int32 */
status?: number;
message?: string;
data?: components["schemas"]["LoginSuccessResponse"];
data?: components["schemas"]["MemberLoginResponse"];
};
CastRequest: {
castName?: string;
Expand Down Expand Up @@ -1095,14 +1094,14 @@ export interface components {
message?: string;
data?: components["schemas"]["BookingCancelResponse"];
};
AccessTokenGetSuccess: {
AccessTokenGenerateResponse: {
accessToken?: string;
};
SuccessResponseAccessTokenGetSuccess: {
SuccessResponseAccessTokenGenerateResponse: {
/** Format: int32 */
status?: number;
message?: string;
data?: components["schemas"]["AccessTokenGetSuccess"];
data?: components["schemas"]["AccessTokenGenerateResponse"];
};
SuccessResponseTicketRetrieveResponse: {
/** Format: int32 */
Expand Down Expand Up @@ -1596,7 +1595,7 @@ export interface operations {
"application/json;charset=UTF-8": components["schemas"]["SuccessResponsePerformanceModifyResponse"];
};
};
/** @description 예매자가 존재하여 가격을 수정할 수 없습니다. */
/** @description 티켓 가격은 음수일 수 없습니다. */
400: {
headers: {
[name: string]: unknown;
Expand Down Expand Up @@ -1718,7 +1717,7 @@ export interface operations {
"application/json;charset=UTF-8": components["schemas"]["SuccessResponseCarouselHandleAllResponse"];
};
};
/** @description 회원이 없습니다. */
/** @description 해당 공연 정보를 찾을 수 없습니다. */
404: {
headers: {
[name: string]: unknown;
Expand Down Expand Up @@ -1750,7 +1749,7 @@ export interface operations {
[name: string]: unknown;
};
content: {
"application/json;charset=UTF-8": components["schemas"]["SuccessResponseLoginSuccessResponse"];
"application/json;charset=UTF-8": components["schemas"]["SuccessResponseMemberLoginResponse"];
};
};
/** @description 로그인 요청이 유효하지 않습니다. */
Expand Down Expand Up @@ -1824,7 +1823,7 @@ export interface operations {
"application/json;charset=UTF-8": components["schemas"]["SuccessResponseMemberBookingResponse"];
};
};
/** @description 잘못된 데이터 형식입니다. */
/** @description 필수 데이터가 누락되었습니다. */
400: {
headers: {
[name: string]: unknown;
Expand All @@ -1833,7 +1832,7 @@ export interface operations {
"application/json;charset=UTF-8": components["schemas"]["ErrorResponse"];
};
};
/** @description 회차 정보를 찾을 수 없습니다. */
/** @description 회원 정보를 찾을 수 없습니다. */
404: {
headers: {
[name: string]: unknown;
Expand Down Expand Up @@ -1866,7 +1865,7 @@ export interface operations {
"application/json;charset=UTF-8": components["schemas"]["SuccessResponseGuestBookingResponse"];
};
};
/** @description 잘못된 데이터 형식입니다. */
/** @description 필수 데이터가 누락되었습니다. */
400: {
headers: {
[name: string]: unknown;
Expand Down Expand Up @@ -2008,11 +2007,11 @@ export interface operations {
issueAccessTokenUsingRefreshToken: {
parameters: {
query?: never;
header: {
Authorization_Refresh: string;
};
header?: never;
path?: never;
cookie?: never;
cookie: {
refreshToken: string;
};
};
requestBody?: never;
responses: {
Expand All @@ -2022,7 +2021,7 @@ export interface operations {
[name: string]: unknown;
};
content: {
"application/json;charset=UTF-8": components["schemas"]["SuccessResponseAccessTokenGetSuccess"];
"application/json;charset=UTF-8": components["schemas"]["SuccessResponseAccessTokenGenerateResponse"];
};
};
/** @description 유효하지 않은 토큰입니다. */
Expand Down Expand Up @@ -2059,7 +2058,7 @@ export interface operations {
"application/json;charset=UTF-8": components["schemas"]["SuccessResponseTicketRetrieveResponse"];
};
};
/** @description 입력하신 정보와 일치하는 예매자 목록이 없습니다. */
/** @description 회차 정보를 찾을 수 없습니다. */
404: {
headers: {
[name: string]: unknown;
Expand Down Expand Up @@ -2094,7 +2093,7 @@ export interface operations {
"application/json;charset=UTF-8": components["schemas"]["SuccessResponseTicketRetrieveResponse"];
};
};
/** @description 입력하신 정보와 일치하는 예매자 목록이 없습니다. */
/** @description 회차 정보를 찾을 수 없습니다. */
404: {
headers: {
[name: string]: unknown;
Expand Down

0 comments on commit f383e26

Please sign in to comment.