Skip to content

Commit e11ebeb

Browse files
authored
Merge pull request #106 from boostcampwm-2024/refactor-fe-#27
Fix: 403 에러 제거
2 parents bb59a1f + b617d84 commit e11ebeb

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

apps/frontend/src/features/auth/model/authQueries.ts

+3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@ import { useQuery } from "@tanstack/react-query";
33
import { getUser, getUserStatus } from "../api/authApi";
44

55
export const useGetUser = () => {
6+
const { data: loggedIn } = useGetUserStatus();
7+
68
return useQuery({
79
queryKey: ["user"],
810
queryFn: getUser,
911
retry: false,
1012
refetchOnWindowFocus: false,
13+
enabled: !!loggedIn,
1114
});
1215
};
1316

apps/frontend/src/features/workspace/model/workspaceQuries.ts

+2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ import { useGetUser, useGetUserStatus } from "@/features/auth";
55
import { useWorkspace } from "@/shared/lib/useWorkspace";
66

77
export const useUserWorkspace = () => {
8+
const { data: loggedIn } = useGetUserStatus();
89
return useQuery({
910
queryKey: ["userWorkspace"],
1011
queryFn: getUserWorkspaces,
12+
enabled: !!loggedIn,
1113
});
1214
};
1315

apps/frontend/src/features/workspace/ui/WorkspacePanel/index.tsx

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import { useState } from "react";
22
import { UserProfile } from "@/entities/user";
3-
import { Logout, useGetUser, LoginForm } from "@/features/auth";
3+
import {
4+
Logout,
5+
useGetUser,
6+
LoginForm,
7+
useGetUserStatus,
8+
} from "@/features/auth";
49
import {
510
WorkspaceAddButton,
611
WorkspaceForm,
@@ -9,6 +14,7 @@ import {
914
import { Divider } from "@/shared/ui";
1015

1116
export default function WorkspacePanel() {
17+
const { data: loggedIn } = useGetUserStatus();
1218
const { data } = useGetUser();
1319
const [isModalOpen, setIsModalOpen] = useState(false);
1420

@@ -21,7 +27,7 @@ export default function WorkspacePanel() {
2127
};
2228
return (
2329
<div className="w-[280px] px-4 py-4">
24-
{data ? (
30+
{loggedIn && data ? (
2531
<div className="flex flex-col gap-1">
2632
<UserProfile nickname={data.snowflakeId ?? "123"} />
2733
<Divider direction="horizontal" className="h-0.5" />

0 commit comments

Comments
 (0)