refactor: split fetching me function

frouriojs · Nov 6, 2024 · 3b03560 · 3b03560
1 parent 034c147
commit 3b03560
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/client/features/auth/AuthLoader.tsx b/client/features/auth/AuthLoader.tsx
@@ -1,4 +1,4 @@
-import { fetchAuthSession, signOut } from 'aws-amplify/auth';
+import { fetchAuthSession, getCurrentUser, signOut } from 'aws-amplify/auth';
 import { Hub } from 'aws-amplify/utils';
 import { isAxiosError } from 'axios';
 import { useLoading } from 'components/loading/useLoading';
@@ -12,6 +12,10 @@ export const AuthLoader = () => {
   const { user, setUser } = useUser();
   const { setLoading } = useLoading();
   const { setAlert } = useAlert();
+  const fetchMe = useCallback(
+    () => apiClient.private.me.$get().catch(catchApiErr).then(setUser),
+    [setUser],
+  );
   const updateCookie = useCallback(async () => {
     const tokens = await fetchAuthSession()
       .then((e) => e.tokens)
@@ -25,14 +29,14 @@ export const AuthLoader = () => {
       })
       .catch(catchApiErr);
 
-    if (result?.status === 'success') {
-      await apiClient.private.me.$get().catch(catchApiErr).then(setUser);
-    }
-  }, [setUser]);
+    if (result?.status === 'success') await fetchMe();
+  }, [setUser, fetchMe]);
 
   useEffect(() => {
-    updateCookie();
-  }, [updateCookie]);
+    getCurrentUser()
+      .then(fetchMe)
+      .catch(() => setUser(null));
+  }, [fetchMe, setUser]);
 
   useEffect(() => {
     // eslint-disable-next-line complexity