fixed no user signed in error

cornell-dti · May 23, 2024 · 0399557 · 0399557
1 parent 3247eb6
commit 0399557
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -107,7 +107,7 @@ const App = (): ReactElement => {
 
   return (
     <ThemeProvider theme={theme}>
-      <ModalProvider>
+      <ModalProvider user={user} setUser={setUser}>
         <NavBar headersData={headersData} user={user} setUser={setUser} />
         <div className="root">
           <Switch>

diff --git a/frontend/src/components/utils/Footer/ContactModalContext.tsx b/frontend/src/components/utils/Footer/ContactModalContext.tsx
@@ -1,4 +1,6 @@
 import React, { createContext, useContext, useState, ReactNode } from 'react';
+import { getUser } from '../../../utils/firebase';
+import Toast from '../Toast';
 
 interface ModalContextType {
   modalOpen: boolean;
@@ -26,6 +28,8 @@ const useModal = (): ModalContextType => {
 
 interface Props {
   children: ReactNode;
+  user: firebase.User | null;
+  setUser: React.Dispatch<React.SetStateAction<firebase.User | null>>;
 }
 
 /**
@@ -38,10 +42,25 @@ interface Props {
  * @param children – Child components that will receive access to the modal state
  * @returns
  */
-const ModalProvider = ({ children }: Props) => {
+const ModalProvider = ({ children, user, setUser }: Props) => {
   const [modalOpen, setModalOpen] = useState(false);
+  const toastTime = 3500;
+
+  const openModal = async () => {
+    let user = await getUser(true);
+    setUser(user);
+    if (!user) {
+      <Toast
+        isOpen={true}
+        severity="error"
+        message="Error: Please sign in with a Cornell email."
+        time={toastTime}
+      />;
+      return;
+    }
+    setModalOpen(true);
+  };
 
-  const openModal = () => setModalOpen(true);
   const closeModal = () => setModalOpen(false);
 
   return (