Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions src/_queries/auth/reissue-queries.ts

This file was deleted.

4 changes: 2 additions & 2 deletions src/_queries/auth/user-queries.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { useQuery } from '@tanstack/react-query';
import { getUser } from '@/src/_apis/auth/user-apis';
import { authStore } from '@/src/store/use-auth-store';
import { useAuthStore } from '@/src/store/use-auth-store';

export function useUser() {
const { token } = authStore.getState();
const token = useAuthStore((state) => state.token);
return useQuery({
queryKey: ['user'],
queryFn: getUser,
Expand Down
26 changes: 18 additions & 8 deletions src/components/client-provider.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
'use client';

import { ReactNode, useState } from 'react';
import { usePathname, useRouter } from 'next/navigation';
import { QueryCache, QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
import { ReactQueryStreamedHydration } from '@tanstack/react-query-next-experimental';
import { reissue } from '../_apis/auth/reissue-apis';
import { useAuthStore } from '../store/use-auth-store';
import { ApiError } from '../utils/api';

export default function ClientProvider({ children }: { children: ReactNode }) {
const setToken = useAuthStore((state) => state.setToken);
const redirect = usePathname();
const router = useRouter();

const [queryClient] = useState(
() =>
Expand All @@ -25,16 +29,22 @@ export default function ClientProvider({ children }: { children: ReactNode }) {
},
},
},
// accessToken μ—λŸ¬ -> reissue() -> refetch()
queryCache: new QueryCache({
onError: async (error, query) => {
if (error.message === '토큰이 μ˜¬λ°”λ₯΄μ§€ μ•ŠμŠ΅λ‹ˆλ‹€.') {
const { token } = await reissue();
if (token) setToken(token.replace(/^Bearer\s/, ''));
await Promise.all([
queryClient.refetchQueries({ queryKey: query.queryKey }),
queryClient.refetchQueries({ queryKey: ['user'] }),
]);
const apiError = error as ApiError;
if (apiError.status === 401) {
try {
const { token } = await reissue();
if (token) {
setToken(token.replace(/^Bearer\s/, ''));
await Promise.all([
queryClient.refetchQueries({ queryKey: query.queryKey }),
queryClient.refetchQueries({ queryKey: ['user'] }),
]);
}
} catch {
router.push(`/login?redirect=${redirect}`);
}
Comment on lines +34 to +47
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

토큰 μž¬λ°œκΈ‰ 둜직 κ°œμ„ μ΄ ν•„μš”ν•©λ‹ˆλ‹€

ν˜„μž¬ κ΅¬ν˜„μ—μ„œ λ‹€μŒκ³Ό 같은 κ°œμ„ μ‚¬ν•­λ“€μ΄ ν•„μš”ν•΄ λ³΄μž…λ‹ˆλ‹€:

  1. 토큰 μž¬λ°œκΈ‰ 쀑 λ‘œλ”© μƒνƒœ μ²˜λ¦¬κ°€ μ—†μŠ΅λ‹ˆλ‹€
  2. 토큰이 계속 μœ νš¨ν•˜μ§€ μ•Šμ„ 경우 λ¬΄ν•œ 루프가 λ°œμƒν•  수 μžˆμŠ΅λ‹ˆλ‹€
  3. API μ—λŸ¬ νƒ€μž… μΊμŠ€νŒ… μ‹œ 검증이 ν•„μš”ν•©λ‹ˆλ‹€
  4. μ—¬λŸ¬ 쿼리 λ™μ‹œ 리페치둜 μΈν•œ 레이슀 μ»¨λ””μ…˜ κ°€λŠ₯성이 μžˆμŠ΅λ‹ˆλ‹€

λ‹€μŒκ³Ό 같은 κ°œμ„ λœ κ΅¬ν˜„μ„ μ œμ•ˆλ“œλ¦½λ‹ˆλ‹€:

- const apiError = error as ApiError;
- if (apiError.status === 401) {
+ if (error instanceof ApiError && error.status === 401) {
+   const isReissuing = useRef(false);
+   if (isReissuing.current) return;
+   isReissuing.current = true;
    try {
      const { token } = await reissue();
      if (token) {
        setToken(token.replace(/^Bearer\s/, ''));
-       await Promise.all([
-         queryClient.refetchQueries({ queryKey: query.queryKey }),
-         queryClient.refetchQueries({ queryKey: ['user'] }),
-       ]);
+       // 순차적으둜 쿼리 리페치
+       await queryClient.refetchQueries({ queryKey: ['user'] });
+       await queryClient.refetchQueries({ queryKey: query.queryKey });
      }
    } catch {
      router.push(`/login?redirect=${redirect}`);
+   } finally {
+     isReissuing.current = false;
    }
  }

Committable suggestion skipped: line range outside the PR's diff.

}
},
}),
Expand Down
Loading