Skip to content

Commit 46a8edc

Browse files
authored
Merge pull request #240 from manNomi/fix/login
fix : localStoradge 사용하는 코드 제거했습니다
2 parents 3e09d04 + 0ec6109 commit 46a8edc

File tree

5 files changed

+14
-17
lines changed

5 files changed

+14
-17
lines changed

src/api/mentors/client/queryKey.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export enum queryKey {
1+
export enum QueryKeys {
22
mentorDetail = "mentorDetail",
33
mentoringNewCount = "mentoringNewCount",
44
mentorList = "mentorList",

src/app/mentor/_ui/MentorClient/_hooks/useRouterHandler.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@ import { UserRole } from "@/types/mentor";
88
const useRouterHandler = (): boolean => {
99
const userRole = getUserRoleFromJwt();
1010

11-
const router = useRouter();
12-
13-
useEffect(() => {
14-
if (!userRole) {
15-
alert("로그인이 필요합니다.");
16-
router.push("/login");
17-
}
18-
}, [userRole, router]);
19-
2011
const isMentor = userRole === UserRole.MENTOR;
2112
return isMentor;
2213
};

src/app/mentor/_ui/MentorClient/_ui/MyMentorSection/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import MentorCard from "@/components/mentor/MentorCard";
55
import useGetMyMentorProfile from "@/api/mentor/client/useGetMentorMyProfile";
66

77
const MyMentorSection = () => {
8-
const { myMentorProfile } = useGetMyMentorProfile();
8+
const { data: myMentorProfile } = useGetMyMentorProfile();
99

1010
return (
1111
<>

src/app/mentor/_ui/MentorClient/index.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
"use client";
22

3-
import useRouterHandler from "./_hooks/useRouterHandler";
3+
import { getUserRoleFromJwt } from "@/utils/jwtUtils";
4+
45
import MenteePageTabs from "./_ui/MenteePageTabs";
56
import MentorFindSection from "./_ui/MentorFindSection";
6-
import MentorPageTabs from "./_ui/MentorPageTabs";
7-
import MyMentorSection from "./_ui/MyMentorSection";
7+
8+
import { UserRole } from "@/types/mentor";
9+
10+
// import MentorPageTabs from "./_ui/MentorPageTabs";
11+
// import MyMentorSection from "./_ui/MyMentorSection";
812

913
const MentorClient = () => {
10-
const isMentor = useRouterHandler();
14+
const userRole = getUserRoleFromJwt();
15+
const isMentor = userRole === UserRole.MENTOR;
16+
1117
return (
1218
<>
1319
{isMentor ? (

src/utils/jwtUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const base64UrlDecode = (input: string): string => {
2626
}
2727
};
2828

29-
export const isTokenExpired = (token: string): boolean => {
29+
export const isTokenExpired = (token: string | null): boolean => {
3030
if (!token) {
3131
return true;
3232
}
@@ -91,7 +91,7 @@ export const isCurrentTokenExpiredSync = (): boolean => {
9191
};
9292

9393
export const getUserRoleFromJwt = (): string | null => {
94-
const token = localStorage.getItem("accessToken");
94+
const token = getAccessToken();
9595
if (!token) return null;
9696

9797
const decoded = parseJwt(token);

0 commit comments

Comments
 (0)