From 934345ab1f789e7c6f3d44ebdfa1636a4cdb6248 Mon Sep 17 00:00:00 2001
From: Aditya Pawar <aditya.pawar@warriorlife.net>
Date: Sat, 21 Oct 2023 10:23:48 -0700
Subject: [PATCH 1/3] Replace router.push with router.replace for auth actions

---
 src/app/auth/index.tsx      | 7 +++++--
 src/app/auth/onboarding.tsx | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/auth/index.tsx b/src/app/auth/index.tsx
index b33a3c23..22156936 100644
--- a/src/app/auth/index.tsx
+++ b/src/app/auth/index.tsx
@@ -8,8 +8,11 @@ function LoginScreen() {
   return (
     <SafeAreaView style={globalStyles.container}>
       <Text style={globalStyles.h1}>Auth</Text>
-      <Button title="Login" onPress={() => router.push('/auth/onboarding')} />
-      <Button title="Sign Up" onPress={() => router.push('/auth/signup')} />
+      <Button
+        title="Login"
+        onPress={() => router.replace('/auth/onboarding')}
+      />
+      <Button title="Sign Up" onPress={() => router.replace('/auth/signup')} />
       <Button title="[temp] Home" onPress={() => router.push('/home')} />
     </SafeAreaView>
   );
diff --git a/src/app/auth/onboarding.tsx b/src/app/auth/onboarding.tsx
index 78b16b02..4a19ef01 100644
--- a/src/app/auth/onboarding.tsx
+++ b/src/app/auth/onboarding.tsx
@@ -153,7 +153,7 @@ function OnboardingScreen() {
         />
       </View>
       <View style={globalStyles.verticallySpaced}>
-        <Button title="Skip" onPress={() => router.push('/home')} />
+        <Button title="Skip" onPress={() => router.replace('/home')} />
       </View>
     </ScrollView>
   );

From 9d1fb82e032089f8e2516dab84ebf22cf18bf4a8 Mon Sep 17 00:00:00 2001
From: Aditya Pawar <aditya.pawar@warriorlife.net>
Date: Sat, 21 Oct 2023 10:30:48 -0700
Subject: [PATCH 2/3] Fix all eslint warnings and errors :)

---
 src/app/auth/login.tsx      | 10 ++++------
 src/app/auth/onboarding.tsx | 17 +++++++++--------
 src/app/auth/signup.tsx     |  7 ++++---
 src/app/index.tsx           |  1 +
 src/app/settings.tsx        |  3 ++-
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/app/auth/login.tsx b/src/app/auth/login.tsx
index 4015aabd..50ebdb54 100644
--- a/src/app/auth/login.tsx
+++ b/src/app/auth/login.tsx
@@ -1,9 +1,10 @@
-import React, { useState } from 'react';
 import { Redirect, Link } from 'expo-router';
+import React, { useState } from 'react';
 import { Alert, View } from 'react-native';
 import { Button, Input } from 'react-native-elements';
-import { useSession } from '../../utils/AuthContext';
+
 import globalStyles from '../../styles/globalStyles';
+import { useSession } from '../../utils/AuthContext';
 
 function LoginScreen() {
   const sessionHandler = useSession();
@@ -17,10 +18,7 @@ function LoginScreen() {
 
   const signInWithEmail = async () => {
     setLoading(true);
-    const { error, data } = await sessionHandler.signInWithEmail(
-      email,
-      password,
-    );
+    const { error } = await sessionHandler.signInWithEmail(email, password);
 
     if (error) Alert.alert(error.message);
     setLoading(false);
diff --git a/src/app/auth/onboarding.tsx b/src/app/auth/onboarding.tsx
index 4a19ef01..7f3e914e 100644
--- a/src/app/auth/onboarding.tsx
+++ b/src/app/auth/onboarding.tsx
@@ -1,15 +1,16 @@
+import DateTimePicker from '@react-native-community/datetimepicker';
+import { Redirect, router } from 'expo-router';
 import { useState, useEffect } from 'react';
 import { View, Alert, ScrollView, Platform } from 'react-native';
 import { Button, Input } from 'react-native-elements';
-import DateTimePicker from '@react-native-community/datetimepicker';
-import { Redirect, router } from 'expo-router';
-import supabase from '../../utils/supabase';
+
 import UserStringInput from '../../components/UserStringInput';
-import { useSession } from '../../utils/AuthContext';
 import globalStyles from '../../styles/globalStyles';
+import { useSession } from '../../utils/AuthContext';
+import supabase from '../../utils/supabase';
 
 function OnboardingScreen() {
-  const { session, signOut } = useSession();
+  const { session } = useSession();
   const [loading, setLoading] = useState(true);
   const [firstName, setFirstName] = useState('');
   const [lastName, setLastName] = useState('');
@@ -29,7 +30,7 @@ function OnboardingScreen() {
         .eq('user_id', session?.user.id)
         .single();
 
-      if (error && status !== 406) {
+      if (error && status !== 406 && error instanceof Error) {
         throw error;
       }
 
@@ -81,12 +82,12 @@ function OnboardingScreen() {
           .eq('user_id', session?.user.id)
           .select('*');
 
-        if (error) throw error;
+        if (error && error instanceof Error) throw error;
       } else {
         // Create user if they don't exist
         const { error } = await supabase.from('profiles').insert(updates);
 
-        if (error) throw error;
+        if (error && error instanceof Error) throw error;
       }
 
       Alert.alert('Succesfully updated user!');
diff --git a/src/app/auth/signup.tsx b/src/app/auth/signup.tsx
index 94db3d4f..ca4e275b 100644
--- a/src/app/auth/signup.tsx
+++ b/src/app/auth/signup.tsx
@@ -1,9 +1,10 @@
-import React, { useEffect, useState } from 'react';
 import { Redirect, Link, router } from 'expo-router';
-import { Alert, View, Text } from 'react-native';
+import React, { useState } from 'react';
+import { Alert, View } from 'react-native';
 import { Button, Input } from 'react-native-elements';
-import { useSession } from '../../utils/AuthContext';
+
 import globalStyles from '../../styles/globalStyles';
+import { useSession } from '../../utils/AuthContext';
 
 function SignUpScreen() {
   const { session, signUp, signInWithEmail } = useSession();
diff --git a/src/app/index.tsx b/src/app/index.tsx
index d834a1a6..283f48d0 100644
--- a/src/app/index.tsx
+++ b/src/app/index.tsx
@@ -1,4 +1,5 @@
 import { Redirect } from 'expo-router';
+
 import { useSession } from '../utils/AuthContext';
 
 function StartPage() {
diff --git a/src/app/settings.tsx b/src/app/settings.tsx
index 9528acc6..c4d7aeb4 100644
--- a/src/app/settings.tsx
+++ b/src/app/settings.tsx
@@ -2,8 +2,9 @@ import { Redirect, router } from 'expo-router';
 import { Text, View } from 'react-native';
 import { Button } from 'react-native-elements';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import { useSession } from '../utils/AuthContext';
+
 import globalStyles from '../styles/globalStyles';
+import { useSession } from '../utils/AuthContext';
 
 function SettingsScreen() {
   const { session, signOut } = useSession();

From 8b22289c4e50d73feff5bfb8fb632a5848efbccc Mon Sep 17 00:00:00 2001
From: Aditya Pawar <aditya.pawar@warriorlife.net>
Date: Sat, 21 Oct 2023 15:32:14 -0700
Subject: [PATCH 3/3] Clear router stack when on home and logging in/signing up

---
 src/app/auth/login.tsx    | 15 +++++++++++----
 src/app/settings.tsx      | 15 +++++++++++++--
 src/utils/AuthContext.tsx |  2 +-
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/app/auth/login.tsx b/src/app/auth/login.tsx
index 50ebdb54..e8039e51 100644
--- a/src/app/auth/login.tsx
+++ b/src/app/auth/login.tsx
@@ -1,4 +1,4 @@
-import { Redirect, Link } from 'expo-router';
+import { Link, router } from 'expo-router';
 import React, { useState } from 'react';
 import { Alert, View } from 'react-native';
 import { Button, Input } from 'react-native-elements';
@@ -12,9 +12,12 @@ function LoginScreen() {
   const [password, setPassword] = useState('');
   const [loading, setLoading] = useState(false);
 
-  if (sessionHandler.session) {
-    return <Redirect href="/home" />;
-  }
+  const resetAndPushToRouter = (path: string) => {
+    while (router.canGoBack()) {
+      router.back();
+    }
+    router.replace(path);
+  };
 
   const signInWithEmail = async () => {
     setLoading(true);
@@ -24,6 +27,10 @@ function LoginScreen() {
     setLoading(false);
   };
 
+  if (sessionHandler.session) {
+    resetAndPushToRouter('/home');
+  }
+
   return (
     <View style={globalStyles.auth_container}>
       <View style={[globalStyles.verticallySpaced, globalStyles.mt20]}>
diff --git a/src/app/settings.tsx b/src/app/settings.tsx
index c4d7aeb4..bc6c5754 100644
--- a/src/app/settings.tsx
+++ b/src/app/settings.tsx
@@ -1,4 +1,5 @@
-import { Redirect, router } from 'expo-router';
+import { router } from 'expo-router';
+import { useEffect } from 'react';
 import { Text, View } from 'react-native';
 import { Button } from 'react-native-elements';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -9,7 +10,17 @@ import { useSession } from '../utils/AuthContext';
 function SettingsScreen() {
   const { session, signOut } = useSession();
 
-  if (!session) return <Redirect href="/auth/login" />;
+  const resetAndPushToRouter = (path: string) => {
+    while (router.canGoBack()) {
+      router.back();
+    }
+    router.replace(path);
+  };
+
+  useEffect(() => {
+    if (!session) resetAndPushToRouter('/auth/login');
+  }, [session]);
+
   return (
     <SafeAreaView style={globalStyles.container}>
       <Text style={globalStyles.h1}>Settings</Text>
diff --git a/src/utils/AuthContext.tsx b/src/utils/AuthContext.tsx
index c3081d0a..c4f68672 100644
--- a/src/utils/AuthContext.tsx
+++ b/src/utils/AuthContext.tsx
@@ -44,7 +44,7 @@ export function AuthContextProvider({
       setSession(newSession);
     });
 
-    supabase.auth.onAuthStateChange((event, newSession) => {
+    supabase.auth.onAuthStateChange((_event, newSession) => {
       setSession(newSession);
     });
   }, []);