fix: store errors

jedwards1230 · Apr 20, 2024 · 84bc87c · 84bc87c
1 parent a13388c
commit 84bc87c
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 24 deletions.
diff --git a/client/src/app/(auth)/_layout.tsx b/client/src/app/(auth)/_layout.tsx
@@ -1,12 +1,12 @@
-import { useUser } from "@/hooks/useUser";
 import { Redirect, Stack, useLocalSearchParams } from "expo-router";
 
+import { useUserData } from "@/hooks/stores/useUserData";
+
 export default function AuthLayout() {
     const params = useLocalSearchParams();
-    const { loading, data } = useUser();
+    const session = useUserData.use.session();
 
-    if (loading) return null;
-    if (data?.session) return <Redirect href={{ pathname: "/(main)", params }} />;
+    if (session) return <Redirect href={{ pathname: "/(main)", params }} />;
     return (
         <Stack screenOptions={{ headerShown: false }}>
             <Stack.Screen name="index" />

diff --git a/client/src/app/(main)/_layout.tsx b/client/src/app/(main)/_layout.tsx
@@ -1,13 +1,13 @@
-import Drawer from "@/components/DrawerNav/Drawer";
-import { useUser } from "@/hooks/useUser";
 import { Redirect, useLocalSearchParams } from "expo-router";
 
+import Drawer from "@/components/DrawerNav/Drawer";
+import { useUserData } from "@/hooks/stores/useUserData";
+
 export default function HomeLayout() {
     const params = useLocalSearchParams();
-    const { loading, data } = useUser();
+    const session = useUserData.use.session();
 
-    if (loading) return null;
-    if (!data?.session) return <Redirect href={{ pathname: "/(auth)", params }} />;
+    if (!session) return <Redirect href={{ pathname: "/(auth)", params }} />;
     return <Drawer />;
 }
 

diff --git a/client/src/hooks/fetchers/User/useUserPost.ts b/client/src/hooks/fetchers/User/useUserPost.ts
@@ -8,7 +8,7 @@ import { User } from "@/types";
 type PostOpts = { email: string; password: string };
 
 const postUser = (opts: PostOpts, apiKey: string) =>
-    fetcher<User>(`/user/`, {
+    fetcher<User>(`/user`, {
         method: "POST",
         apiKey,
         body: JSON.stringify(opts),

diff --git a/client/src/hooks/useUser.ts b/client/src/hooks/useUser.ts
@@ -3,6 +3,7 @@ import { useUserData } from "./stores/useUserData";
 import Toast from "react-native-toast-message";
 import { useIsRestoring } from "@tanstack/react-query";
 import { useEffect } from "react";
+import { isFetchError } from "@/lib/fetcher";
 
 export function useUser() {
     const { session, setSession, setUser } = useUserData();
@@ -13,10 +14,21 @@ export function useUser() {
     useEffect(() => {
         if (userQuery.isPending) return;
         if (userQuery.isError) {
+            if (isFetchError(userQuery.error)) {
+                if (userQuery.error.status === 401) {
+                    setUser(null);
+                    setSession(null);
+                    return Toast.show({
+                        type: "error",
+                        text1: "User Error",
+                        text2: "Unauthorized.",
+                    });
+                }
+            }
             return Toast.show({
                 type: "error",
                 text1: "User Error",
-                text2: "Failed to fetch user.",
+                text2: userQuery.error.message,
             });
         }
         if (userQuery.data) {
@@ -27,10 +39,20 @@ export function useUser() {
     useEffect(() => {
         if (userSessionQuery.isPending) return;
         if (userSessionQuery.isError) {
+            if (isFetchError(userQuery.error)) {
+                if (userQuery.error.status === 401) {
+                    setSession(null);
+                    return Toast.show({
+                        type: "error",
+                        text1: "User Error",
+                        text2: "Unauthorized.",
+                    });
+                }
+            }
             return Toast.show({
                 type: "error",
                 text1: "Session Error",
-                text2: "Failed to fetch user session.",
+                text2: userSessionQuery.error.message,
             });
         }
         if (userSessionQuery.data) {
@@ -42,18 +64,16 @@ export function useUser() {
         return { error: "No session" };
     }
 
+    if (loading) return { loading: true } as const;
+
     if (userQuery.isError) {
-        console.log("User Query Error", userQuery.error);
         return { error: userQuery.error };
     }
 
     if (userSessionQuery.isError) {
-        console.log("User Session Query Error", userSessionQuery.error);
         return { error: userSessionQuery.error };
     }
 
-    if (loading) return { loading: true } as const;
-
     if (!userQuery.data || !userSessionQuery.data) {
         return { loading: true } as const;
     }

diff --git a/client/src/providers/QueryClientProvider.tsx b/client/src/providers/QueryClientProvider.tsx
@@ -40,11 +40,14 @@ const queryClient = new QueryClient({
     }),
     mutationCache: new MutationCache({
         onError: (error) => {
-            Toast.show({
-                type: "error",
-                text1: error.name,
-                text2: error.message,
-            });
+            if (!isFetchError(error)) return;
+            if (error.status && error.status >= 500) {
+                Toast.show({
+                    type: "error",
+                    text1: error.name,
+                    text2: error.message,
+                });
+            }
         },
     }),
 });

diff --git a/client/src/views/chat/ChatHeader/Dropdown.tsx b/client/src/views/chat/ChatHeader/Dropdown.tsx
@@ -1,10 +1,10 @@
 import { useState } from "react";
 
-import { useUser } from "@/hooks/useUser";
 import { useAction } from "@/hooks/useAction";
 import { useThreadQuery } from "@/hooks/fetchers/Thread/useThreadQuery";
 import { useAgentQuery } from "@/hooks/fetchers/Agent/useAgentQuery";
 import { useMessagesQuery } from "@/hooks/fetchers/Message/useMessagesQuery";
+import { useUserQuery } from "@/hooks/fetchers/User/useUserQuery";
 
 import {
     DropdownMenu,
@@ -28,8 +28,8 @@ export function Dropdown({
     threadId: string | null;
 }) {
     const threadQuery = useThreadQuery(threadId);
-    const { data } = useUser();
-    const currentAgent = threadId ? threadQuery.data?.agent : data?.user?.defaultAgent;
+    const { data } = useUserQuery();
+    const currentAgent = threadId ? threadQuery.data?.agent : data?.defaultAgent;
     const agentQuery = useAgentQuery(currentAgent?.id || "");
 
     const [open, setOpen] = useState(false);