fix: auth

Author: AgustinOberg

app/(app)/(tabs)/_layout.tsx

@@ -10,6 +10,7 @@ import { isNewUser } from '@/utils/user.utils';
 const _layout = () => {
   const { styles } = useStyles(stylesheet);
   const { data: user } = useUserProfile();
+
   if (isNewUser(user)) {
     return <Redirect href="/(app)/(challenge)/creation" />;
   }

app/(auth)/_layout.tsx

@@ -1,7 +1,11 @@
-import { Stack } from 'expo-router';
+import { Redirect, Stack } from 'expo-router';
 import React from 'react';
 
+import { useUser } from '@/data/state/user.store';
+
 const _layout = () => {
+  const { isAuthenticated } = useUser();
+  if (isAuthenticated) return <Redirect href="/(app)" />;
   return (
     <Stack screenOptions={{ headerShown: false }}>
       <Stack.Screen name="index" />

data/fetchers/auth.fetcher.ts

@@ -1,5 +1,7 @@
 import { useMutation, useQuery } from '@tanstack/react-query';
 
+import { queryClient } from '@/config/query.config';
+
 import { getUserProfile, googleAuth, refreshToken } from '../api/auth.api';
 import { useUser } from '../state/user.store';
 
@@ -10,6 +12,7 @@ export const useAuthWithGoogle = () => {
     onSuccess: (data) => {
       if (data) {
         setToken(data.token);
+        queryClient.invalidateQueries({ queryKey: ['user-profile'] });
         //router.replace('/(app)');
       }
     },

data/state/user.store.tsx

@@ -1,4 +1,4 @@
-import { router } from 'expo-router';
+import { GoogleSignin } from '@react-native-google-signin/google-signin';
 import { Alert, Linking } from 'react-native';
 import type { StateCreator } from 'zustand';
 import { create } from 'zustand';
@@ -7,6 +7,7 @@ import { immer } from 'zustand/middleware/immer';
 
 import { Analytics } from '@/analytics';
 import { Prefix } from '@/analytics/events';
+import { queryClient } from '@/config/query.config';
 import { DELETE_ACCOUNT_URL } from '@/constants/url.constants';
 import { asyncStoragePersistConfig } from '@/utils/storage.utils';
 
@@ -35,6 +36,7 @@ const storeApi: StateCreator<UserStore, [['zustand/immer', never]]> = (
   // Methods
   setToken: (token) => {
     set((state) => {
+      GoogleSignin.signOut();
       state.token = token;
       state.isAuthenticated = true;
     });
@@ -43,6 +45,7 @@ const storeApi: StateCreator<UserStore, [['zustand/immer', never]]> = (
     set(() => initialState);
   },
   logout: () => {
+    GoogleSignin.signOut();
     useUserStore.getState().resetState();
   },
 });
@@ -65,9 +68,9 @@ export const useUser = () => {
   const logoutState = useUserStore((state) => state.logout);
 
   const logout = () => {
+    queryClient.removeQueries({ queryKey: ['user-profile'] });
     Analytics.trackEvent(Prefix.System.default + 'logout');
     Analytics.reset();
-    router.replace('/(auth)');
     logoutState();
   };