fix: force logout when me query returns null (#15)

Co-authored-by: rot1024 <[email protected]>
reearth · Jun 16, 2021 · 339d613 · 339d613
1 parent ec261a3
commit 339d613
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/components/pages/TopPage/hooks.ts b/src/components/pages/TopPage/hooks.ts
@@ -14,7 +14,7 @@ export default () => {
 
   const [{ currentTeam }, setLocalState] = useLocalState(s => ({ currentTeam: s.currentTeam }));
 
-  const { data } = useTeamsQuery({ skip: !isAuthenticated });
+  const { data, loading } = useTeamsQuery({ skip: !isAuthenticated });
   const teamId = currentTeam?.id || data?.me?.myTeam.id;
 
   useEffect(() => {
@@ -24,10 +24,10 @@ export default () => {
   }, [isAuthenticated, navigate, currentTeam, setLocalState, data, teamId]);
 
   useEffect(() => {
-    if (authError) {
+    if (authError || (!loading && !data?.me)) {
       logout();
     }
-  }, [authError, logout]);
+  }, [authError, data?.me, loading, logout]);
 
   return {
     isLoading,