Merge pull request #15 from jaydenchee97/feature

Feature

App.tsx

@@ -1,24 +1,44 @@
 import { Authenticator } from "@aws-amplify/ui-react-native";
 import { NavigationContainer } from "@react-navigation/native";
-import { Amplify } from "aws-amplify";
+import { Amplify, Auth } from "aws-amplify";
 import { PaperProvider } from "react-native-paper";
 import { SafeAreaProvider } from "react-native-safe-area-context";
 
 import awsExports from "./src/aws-exports";
 import HomeStack from "./src/navigation/HomeStack";
+import { useEffect, useState } from "react";
+import AppStack from "./src/navigation/AppStack";
 
-Amplify.configure(awsExports);
 
+// Amplify configuration
+Amplify.configure({
+  ...awsExports,
+  Auth: {
+    region: process.env.EXPO_PUBLIC_AMPLIFY_REGION, 
+    userPoolId: process.env.EXPO_PUBLIC_COGNITO_USER_POOL_ID,
+    userPoolWebClientId: process.env.EXPO_PUBLIC_COGNITO_USER_POOL_WEBCLIENT_ID,
+    authenticationFlowType: process.env.EXPO_PUBLIC_AUTHENTICATION_FLOW_TYPE,
+    oauth: {
+      domain: process.env.EXPO_PUBLIC_OAUTH_DOMAIN, 
+      redirectSignIn: process.env.EXPO_PUBLIC_OAUTH_REDIRECT_SIGN_IN, 
+      redirectSignOut: process.env.EXPO_PUBLIC_OAUTH_REDIRECT_SIGN_OUT, 
+      responseType: process.env.EXPO_PUBLIC_OAUTH_RESPONSE_TYPE 
+    }
+  },
+
+});
 export default function App() {
+
   return (
     <PaperProvider>
       <SafeAreaProvider>
         <NavigationContainer>
           <Authenticator.Provider>
-            <Authenticator>
-              <HomeStack />
-            </Authenticator>
+              {/* <HomeStack /> */}
+              <AppStack />
           </Authenticator.Provider>
+          {/* <AppStack /> */}
+
         </NavigationContainer>
       </SafeAreaProvider>
     </PaperProvider>

src/navigation/AppStack.tsx

@@ -0,0 +1,39 @@
+import { createStackNavigator } from '@react-navigation/stack';
+import { useEffect, useState } from 'react';
+import { Auth } from 'aws-amplify';
+import HomeStack from './HomeStack';
+
+
+const Stack = createStackNavigator();
+
+export default function AppStack() {
+  const [isAuthenticated, setIsAuthenticated] = useState<boolean | null>(null);
+  const handleAuth = async () => {
+    try {
+
+        const user = await Auth.currentAuthenticatedUser();
+        console.log('User is already authenticated:', user);
+        setIsAuthenticated(true);
+    } catch {
+      console.log('User is not authenticated, redirecting to login');
+      await Auth.federatedSignIn();
+    }
+  };
+  useEffect(() => {
+    handleAuth();
+  }, []);
+
+  if (isAuthenticated === null) {
+    return null; // Show loading spinner or splash screen
+  }
+
+  return (
+    <Stack.Navigator>
+      <Stack.Screen
+        name="HomeStack"
+        component={HomeStack}
+        options={{ headerShown: false }}
+      />
+    </Stack.Navigator>
+  );
+}

src/navigation/HomeStack.tsx

@@ -14,6 +14,9 @@ export default function HomeStack() {
       bypassCache: true,
     });
 
+    console.log("authUser");
+    console.log(authUser);
+
     const userData = await API.graphql(
       graphqlOperation(getUser, { id: authUser.attributes.sub }),
     );

src/screens/Account.tsx

@@ -1,9 +1,17 @@
 import { useAuthenticator } from "@aws-amplify/ui-react-native";
+import { Auth } from "aws-amplify";
 import { View, StyleSheet } from "react-native";
 import { Divider, List, Text } from "react-native-paper";
 
 export default function Account({ navigation }) {
-  const { signOut } = useAuthenticator((context) => [context.user]);
+
+  const handleSignOut = async () => {
+    try {
+      await Auth.signOut({ global: true });
+    } catch (error) {
+      console.log('Error signing out: ', error);
+    }
+  };
 
   return (
     <View style={styles.view}>
@@ -44,7 +52,7 @@ export default function Account({ navigation }) {
         <List.Item
           title={<Text> Sign out </Text>}
           left={() => <List.Icon icon="logout" />}
-          onPress={signOut}
+          onPress={handleSignOut}
           style={{ alignSelf: "center" }}
         />
         <Divider />

src/screens/Welcome.tsx

@@ -225,7 +225,6 @@ export default function Welcome({ props }) {
   // fetch all Listings
   useEffect(() => {
     if (isFocused) {
-      console.log("call again");
       getSavedAccommodations();
       fetch();
     }