Fix loading behavior when Access Token is absent (#359)

yorkie-team · Nov 5, 2024 · d762b36 · d762b36
1 parent d636af2
commit d762b36
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/frontend/src/hooks/api/user.ts b/frontend/src/hooks/api/user.ts
@@ -67,7 +67,7 @@ export const useGetUserQuery = () => {
 		}
 	}, [dispatch, query.data, query.isError, query.isSuccess]);
 
-	return query;
+	return { ...query, isLoading: query.isLoading || !axiosInterceptorAdded };
 };
 
 export const useUpdateUserNicknameMutation = () => {

diff --git a/frontend/src/providers/AuthProvider.tsx b/frontend/src/providers/AuthProvider.tsx
@@ -9,15 +9,14 @@ interface AuthProviderProps {
 
 function AuthProvider(props: AuthProviderProps) {
 	const { children } = props;
-	const { data: user, isSuccess, isLoading, isPending } = useGetUserQuery();
+	const { data: user, isSuccess, isLoading } = useGetUserQuery();
 	const shouldChangeNickname = useMemo(
 		() => isSuccess && !user.nickname,
 		[isSuccess, user?.nickname]
 	);
-	const isAuthLoading = isLoading || isPending;
 
 	return (
-		<AuthContext.Provider value={{ isLoggedIn: isSuccess, isLoading: isAuthLoading }}>
+		<AuthContext.Provider value={{ isLoggedIn: isSuccess, isLoading }}>
 			{shouldChangeNickname ? <ChangeNicknameModal open /> : children}
 		</AuthContext.Provider>
 	);