From 2ac31fa825b518dccf5e1e5ebf192d377054bb2d Mon Sep 17 00:00:00 2001
From: Arjun Patel <patel.arjun50@gmail.com>
Date: Thu, 13 Jan 2022 00:50:07 -0800
Subject: [PATCH] everything works

---
 contexts/authContext.js   | 34 ++++++++++++----------------------
 pages/teams/dashboard.tsx | 24 +++++++++++++++++++-----
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/contexts/authContext.js b/contexts/authContext.js
index 7623496..1068fbf 100644
--- a/contexts/authContext.js
+++ b/contexts/authContext.js
@@ -1,6 +1,5 @@
-import { getAuth, GoogleAuthProvider, onAuthStateChanged, signInWithPopup, User } from "firebase/auth";
+import { getAuth, GoogleAuthProvider, onAuthStateChanged, signInWithPopup, signOut, User } from "firebase/auth";
 import React, { useContext, useEffect, useState } from "react";
-import { useRouter } from 'next/router'
 import firebase from '../services/firebase'
 
 const AuthContext = React.createContext(null);
@@ -9,31 +8,29 @@ const googleProvider = new GoogleAuthProvider()
 const auth = getAuth();
 
 export function AuthProvider({ children }) {
-  const [currUser, setCurrUser] = useState(null);
+  const [currUser, setCurrUser] = useState();
   const [loading, setLoading] = useState(true)
 
-  const router = useRouter()
-
   useEffect(() => {
     const unsubscribe = onAuthStateChanged(auth, user => {
-      setLoading(false)
-
-      console.log(user)
+      console.log('change in auth')
 
       // will be null or the firebase logged in user
       setCurrUser(user)
+
+      setLoading(false)
     });
 
     return unsubscribe
   }, [])
 
   const signInGoogle = () => {
-    signInWithPopup(auth, googleProvider).then((res) => {
+    return signInWithPopup(auth, googleProvider).then((res) => {
       // This gives you a Google Access Token. You can use it to access the Google API.
-      const credential = GoogleAuthProvider.credentialFromResult(result);
+      const credential = GoogleAuthProvider.credentialFromResult(res);
       const token = credential.accessToken;
       // The signed-in user info.
-      const user = result.user;
+      const user = res.user;
 
       setCurrUser(user)
 
@@ -47,27 +44,20 @@ export function AuthProvider({ children }) {
       // The AuthCredential type that was used.
       const credential = GoogleAuthProvider.credentialFromError(error);
       console.log(error)
+      throw error
     })
   }
 
-  const signOut = () => {
+  const logOut = () => {
     console.log('logging user out')
-    
-    signOut(auth).then(() => {
-      // Sign-out successful.      
-      console.log("signed out fine, redirecting to proper place")
 
-      router.push('/')
-    }).catch((error) => {
-      // An error happened.
-      console.log(error)
-    });
+    return signOut(auth)
   }
 
   const value = {
     currUser,
     signInGoogle,
-    signOut
+    logOut
   }
 
   return (
diff --git a/pages/teams/dashboard.tsx b/pages/teams/dashboard.tsx
index 3a7260e..a74aeb9 100644
--- a/pages/teams/dashboard.tsx
+++ b/pages/teams/dashboard.tsx
@@ -5,21 +5,35 @@ import { useEffect } from 'react'
 import { useAuth } from '../../contexts/authContext'
 
 export default function Dashboard() {
-  const { currUser, signOut } = useAuth()
+  const { currUser, logOut } = useAuth()
   const router = useRouter()
-  
+
+  console.log("in dashboard " + currUser)
+
   useEffect(() => {
     // if not authed, go to home    
     if (!currUser) {
-      console.log('routing from dashboard to teams home')
+      console.log('not authenticated...routing from dashboard to teams home')
       router.push('/teams')
     }
-  }, [])
+  }, [currUser])
+
+  async function handleSignOut() {
+    console.log("clicked log out button")
+
+    try {
+      await logOut()
+
+      router.push('/teams')
+    } catch(error) {
+      console.log(error)
+    }
+  }
 
   return (
     <div>
       <h1 className='text-white'>This is the dashboard</h1>
-      <button onClick={signOut} className='mt-10 text-sm text-orange-500 font-semibold py-1 px-4 bg-orange-200 rounded'>👋 Logout</button>
+      <button onClick={handleSignOut} className='mt-10 text-sm text-orange-500 font-semibold py-1 px-4 bg-orange-200 rounded'>👋 Logout</button>
     </div>
   )
 }
\ No newline at end of file