Merge pull request #104 from CS3219-AY2324S1/edit-auth

ensure auth.currentUser is being maintained

Author: szelongq

AuthService/src/auth/auth.service.ts

@@ -11,6 +11,13 @@ import { firebaseConfig } from "../firebase/firebase.config";
 
 initializeApp(firebaseConfig);
 const auth = getAuth();
+auth.onAuthStateChanged(function(user) { // Include to prevent loss of auth.currentUser upon page refresh
+  if (user) {
+    // User is signed in.
+  } else {
+    // No user is signed in.
+  }
+});
 
 interface SignupCredential {
   user: UserCredential;

frontend/src/auth/auth.context.tsx

@@ -133,9 +133,7 @@ export function AuthContextProvider({ children }: AuthContextProviderProps) {
 
   const removeAccount = useCallback(async () => {
     try {
-      if (activeUser) {
-        await deleteUser();
-      }
+      await deleteUser();
       setUser(undefined);
       setActiveUser(undefined);
       navigate("/", { replace: true });
@@ -146,7 +144,7 @@ export function AuthContextProvider({ children }: AuthContextProviderProps) {
         setError(e.message);
       }
     }
-  }, [setUser, navigate, activeUser]);
+  }, [setUser, navigate]);
 
   const authContextProviderValue = useMemo(
     () => ({

frontend/src/components/UserService/AccountDeletionForm.tsx

@@ -22,12 +22,12 @@ const style = {
 };
 
 const AccountDeletionForm = React.forwardRef(function AccountDeletionForm() {
-  const { activeUser, removeAccount } = useAuth();
+  const { user, removeAccount } = useAuth();
 
   const handleDelete = async () => {
     try {
-      if (activeUser?.email) {
-        await deleteActiveUser(activeUser.email);
+      if (user?.email) {
+        await deleteActiveUser(user.email);
         await removeAccount();
       }
     } catch (e) {