fixed invalid login routing issue

TritonSE · Apr 8, 2024 · ce4ac44 · ce4ac44
1 parent 62fa369
commit ce4ac44
Show file tree

Hide file tree

Showing 3 changed files with 126 additions and 5 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/firebase/firebase.ts b/frontend/src/firebase/firebase.ts
@@ -16,3 +16,7 @@ export const initFirebase = () => {
 
   return { app, auth };
 };
+
+const { app, auth } = initFirebase();
+
+export { app, auth };
diff --git a/frontend/src/pages/login.tsx b/frontend/src/pages/login.tsx
@@ -9,7 +9,7 @@ import { GET } from "@/api/requests";
 import Landing from "@/components/Landing";
 import { Textfield } from "@/components/Textfield";
 import { Button } from "@/components/ui/button";
-import { initFirebase } from "@/firebase/firebase";
+import { auth } from "@/firebase/firebase";
 import { useWindowSize } from "@/hooks/useWindowSize";
 import { cn } from "@/lib/utils";
 
@@ -24,7 +24,6 @@ export default function Login() {
 
   const [firebaseError, setFirebaseError] = useState("");
 
-  const { auth } = initFirebase();
   const router = useRouter();
 
   const login = async (email: string, password: string) => {
@@ -59,11 +58,11 @@ export default function Login() {
     login(data.email as string, data.password as string)
       .then((token: string) => {
         void sendTokenToBackend(token);
+        router.push("/home");
       })
       .catch((_) => {
         setFirebaseError("Invalid login. Please check your username and password.");
       });
-    router.push("/home");
   };
   const { isMobile, isTablet } = useWindowSize();