Merge pull request #21 from akirachix/develop

Develop

Author: hunterachieng

biopima/src/app/hooks/useFetchLogin.test.tsx

@@ -4,6 +4,8 @@ import * as fetchLoginModule from "../utils/fetchLogin";
 
 interface FakeUser {
   user_type: string;
+  token?: string;
+  user_id?: number;
 }
 
 describe("useLogin hook", () => {
@@ -45,7 +47,11 @@ describe("useLogin hook", () => {
   });
 
   it("returns result when login succeeds", async () => {
-    const fakeUser: FakeUser = { user_type: "admin" };
+    const fakeUser: FakeUser = {
+      user_type: "admin",
+      token: "token123",
+      user_id: 1,
+    };
     mockLoginUser.mockResolvedValue(fakeUser);
 
     const { result } = renderHook(() => useLogin());
@@ -90,7 +96,7 @@ describe("useLogin hook", () => {
     });
 
     expect(response).toBeNull();
-    expect(result.current.error).toBe("Cannot read properties of undefined (reading 'role')");
+    expect(result.current.error).toBe("This account does not have access to this role."); 
     expect(result.current.loading).toBe(false);
   });
 });

biopima/src/app/hooks/useFetchLogin.ts

@@ -1,41 +1,31 @@
-'use client';
+"use client";
 import { useState } from 'react';
 import { loginUser } from '../utils/fetchLogin';
 
-
 export function useLogin() {
- const [loading, setLoading] = useState(false);
- const [error, setError] = useState<string | null>(null);
-
-
- async function handleLogin(email: string, password: string, expectedRole?: string) {
-   setLoading(true);
-   setError(null);
-   try {
-     const result = await loginUser(email, password);
-
-
-     if (expectedRole && result.user.role !== expectedRole) {
-       setError("This account does not have access to this role.");
-       return null;
-     }
-    
-     return result;
-
-
-   } catch (error) {
-     setError((error as Error).message);
-     return null;
-   } finally {
-     setLoading(false);
-   }
- }
-
-
- return { handleLogin, loading, error };
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  async function handleLogin(email: string, password: string, expectedRole?: string) {
+    setLoading(true);
+    setError(null);
+    try {
+      const result = await loginUser(email, password);
+
+      if (expectedRole && result.user_type !== expectedRole) {
+        setError("This account does not have access to this role.");
+        return null;
+      }
+
+      return result;
+
+    } catch (error) {
+      setError((error as Error).message);
+      return null;
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  return { handleLogin, loading, error };
 }
-
-
-
-
-

biopima/src/app/login/login.tsx

@@ -25,10 +25,10 @@ export default function SignInForm() {
         localStorage.setItem("userId", userId);
         localStorage.setItem("token", result.token);
         localStorage.setItem("email", email);
-        localStorage.setItem("role", role || "");
+        localStorage.setItem("role", result.user_type);
       }
 
-      if (role?.toLowerCase() === "institutional operator") {
+      if (result.user_type.toLowerCase() === "institutional operator") {
         router.push("/dashboard");
       } else {
         router.push("/institution");

biopima/src/app/login/page.test.tsx

@@ -17,69 +17,28 @@ describe("SignInForm", () => {
   beforeEach(() => {
     jest.clearAllMocks();
     (useRouter as jest.Mock).mockReturnValue({ push: mockPush });
-    (useSearchParams as jest.Mock).mockReturnValue({
-      get: jest.fn().mockReturnValue(null),
-    });
-  });
-
-  it("renders all input fields", () => {
-    mockUseLogin.mockReturnValue({ handleLogin: jest.fn(), loading: false, error: null });
-    render(<SignInForm />);
-
-    expect(screen.getByPlaceholderText("Enter your email")).toBeInTheDocument();
-    expect(screen.getByPlaceholderText("Enter your password")).toBeInTheDocument();
-  });
-
-  it("updates input fields on change", () => {
-    mockUseLogin.mockReturnValue({ handleLogin: jest.fn(), loading: false, error: null });
-    render(<SignInForm />);
-
-    const emailInput = screen.getByPlaceholderText("Enter your email");
-    fireEvent.change(emailInput, { target: { value: "amanda123@example.com" } });
-    expect(emailInput).toHaveValue("amanda123@example.com");
-
-    const passwordInput = screen.getByPlaceholderText("Enter your password");
-    fireEvent.change(passwordInput, { target: { value: "amanda@job" } });
-    expect(passwordInput).toHaveValue("amanda@job");
+    (useSearchParams as jest.Mock).mockReturnValue({ get: jest.fn().mockReturnValue(null) });
   });
 
   it("calls handleLogin and redirects on successful login", async () => {
-    const mockHandleLogin = jest.fn().mockResolvedValue({});
+    const mockHandleLogin = jest.fn().mockResolvedValue({
+      user_type: "user",  
+      token: "abc",
+      user_id: 1,
+    });
     mockUseLogin.mockReturnValue({ handleLogin: mockHandleLogin, loading: false, error: null });
 
     render(<SignInForm />);
-
     fireEvent.change(screen.getByPlaceholderText("Enter your email"), {
       target: { value: "amanda123@example.com" },
     });
     fireEvent.change(screen.getByPlaceholderText("Enter your password"), {
       target: { value: "amanda@job" },
     });
-
     fireEvent.click(screen.getByRole("button", { name: /sign in|signing in/i }));
 
-    await screen.findByPlaceholderText("Enter your email"); 
-    expect(mockHandleLogin).toHaveBeenCalledWith(
-      "amanda123@example.com",
-      "amanda@job",
-      undefined
-    );
-    expect(mockPush).toHaveBeenCalledWith("/institution");
-  });
-
-  it("shows error message if login fails", () => {
-    mockUseLogin.mockReturnValue({ handleLogin: jest.fn(), loading: false, error: "Login failed" });
-    render(<SignInForm />);
-
-    const errorMessage = screen.getByText(/login failed/i);
-    expect(errorMessage).toBeInTheDocument();
-  });
-
-  it("disables submit button while loading", () => {
-    mockUseLogin.mockReturnValue({ handleLogin: jest.fn(), loading: true, error: null });
-    render(<SignInForm />);
-
-    const button = screen.getByRole("button", { name: /sign in|signing in/i });
-    expect(button).toBeDisabled();
+    await screen.findByPlaceholderText("Enter your email");
+    expect(mockHandleLogin).toHaveBeenCalledWith("amanda123@example.com", "amanda@job", undefined);
+    expect(mockPush).toHaveBeenCalledWith("/institution"); 
   });
 });