Merge pull request #3 from ad956/fix-authentication-issues

Enhance Authentication and API Handling Features with New Implementations

.github/workflows/test-and-deploy.yml

@@ -2,9 +2,9 @@ name: CI/CD Pipeline For Playwright Tests and Vercel Deployment
 
 on:
   push:
-    branches: [main, "feature/**"]
+    branches: [main, "feature/**", "fix-**"]
   pull_request:
-    branches: [main, "feature/**"]
+    branches: [main, "feature/**", "fix-**"]
 
 jobs:
   test:
@@ -43,7 +43,7 @@ jobs:
 
   deploy-preview:
     needs: test
-    if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature/'))
+    if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature/') || startsWith(github.ref, 'refs/heads/fix-'))
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

app/(pages)/(auth)/login/page.tsx

@@ -85,10 +85,11 @@ export default function Login() {
         position: "bottom-center",
       });
 
-      const isValidUser = await loginAction(formData);
+      const response = await loginAction(formData);
       toast.dismiss();
-      if (isValidUser?.unauthorized) {
-        toast.error("Invalid username | email or password. Please try again.");
+
+      if (response.error) {
+        toast.error(`${response.error.message}`);
       } else {
         const userRole = formData.get("role");
         setUserData({
@@ -103,7 +104,9 @@ export default function Login() {
         setShowOtp(true);
       }
     } catch (error) {
-      toast.error("Invalid username | email or password. Please try again.");
+      toast.dismiss();
+      console.error("Login failed:", error);
+      toast.error("An unexpected error occurred. Please try again later.");
     }
   }
 

app/(pages)/(auth)/signup/page.tsx

@@ -95,11 +95,11 @@ export default function Signup() {
         position: "bottom-center",
       });
 
-      const signUpSuccess = await signupAction(formData);
+      const response = await signupAction(formData);
       toast.dismiss();
 
-      if (signUpSuccess.failure) {
-        toast.error(signUpSuccess.msg);
+      if (response.error) {
+        toast.error(`${response.error.message}`);
       } else {
         const userRole = formData.get("role");
 
@@ -119,8 +119,9 @@ export default function Signup() {
         setShowOtp(true);
       }
     } catch (error) {
-      console.error("Error signing up");
-      toast.error("Error signing up. Please try again!");
+      toast.dismiss();
+      console.error("Signup failed:", error);
+      toast.error("An unexpected error occurred. Please try again later.");
     }
   }
 

app/(pages)/admin/add-admin/page.tsx

@@ -66,7 +66,10 @@ export default function AddAdmin() {
       const result = await addAdmin(formDataToSend);
 
       if (result.error) {
-        toast.error(result.error, { id: toastId, position: "top-center" });
+        toast.error(result.error.message, {
+          id: toastId,
+          position: "top-center",
+        });
       } else {
         toast.success("Admin added successfully!", { id: toastId });
         setFormData({

app/(pages)/admin/components/LoginForm/index.tsx

@@ -69,11 +69,12 @@ export default function LoginForm() {
 
     try {
       toast.loading("Please wait ...", { position: "bottom-center" });
-      const isValidUser = await loginAction(formData);
+
+      const response = await loginAction(formData);
       toast.dismiss();
 
-      if (isValidUser?.unauthorized) {
-        toast.error("Invalid username or email & password. Please try again.");
+      if (response.error) {
+        toast.error(`${response.error.message}`);
       } else {
         setUserData({
           usernameOrEmail,
@@ -86,7 +87,9 @@ export default function LoginForm() {
         setShowOtp(true);
       }
     } catch (error) {
-      toast.error("An error occurred. Please try again.");
+      toast.dismiss();
+      console.error("Admin Login failed:", error);
+      toast.error("An unexpected error occurred. Please try again later.");
     }
   }
 

app/(pages)/admin/hospitals/[id]/page.tsx

@@ -23,35 +23,17 @@ import {
   AiOutlineStop as BlockIcon,
 } from "react-icons/ai";
 import SpinnerLoader from "@components/SpinnerLoader";
-import { getHospitalDetails } from "@/lib/admin";
+import { getHospitalDetails } from "@lib/admin";
 import { FaExclamationCircle } from "react-icons/fa";
-
-interface UserData {
-  id: string;
-  name: string;
-  role: string;
-  username: string;
-  profile: string;
-  gender: string;
-  contact: string;
-  city: string;
-  state: string;
-}
-
-interface PaginationMetadata {
-  currentPage: number;
-  pageSize: number;
-  totalPages: number;
-  totalCount: number;
-}
+import { HospitalUserData, PaginationMetadata } from "@pft-types/admin";
 
 function UserManagement({ params }: { params: { id: string } }) {
-  const [users, setUsers] = useState<UserData[]>([]);
+  const [users, setUsers] = useState<HospitalUserData[]>([]);
   const [loading, setLoading] = useState<boolean>(false);
   const [searchTerm, setSearchTerm] = useState<string>("");
   const [selectedRole, setSelectedRole] = useState<string>("All");
 
-  const [currentUser, setCurrentUser] = useState<UserData | null>(null);
+  const [currentUser, setCurrentUser] = useState<HospitalUserData | null>(null);
   const [pagination, setPagination] = useState<PaginationMetadata>({
     currentPage: 1,
     pageSize: 10,

app/(pages)/admin/hospitals/page.tsx

@@ -24,23 +24,7 @@ import SpinnerLoader from "@components/SpinnerLoader";
 import Link from "next/link";
 import { getHospitalsList } from "@lib/admin/getHospitals";
 import { FaExclamationCircle } from "react-icons/fa";
-
-interface HospitalData {
-  id: string;
-  name: string;
-  username: string;
-  profile: string;
-  contact: string;
-  city: string;
-  state: string;
-}
-
-interface PaginationMetadata {
-  currentPage: number;
-  pageSize: number;
-  totalPages: number;
-  totalCount: number;
-}
+import { HospitalData, PaginationMetadata } from "@pft-types/admin";
 
 const HospitalManagement: React.FC = () => {
   const [hospitals, setHospitals] = useState<HospitalData[]>([]);

app/(pages)/admin/layout.tsx

@@ -1,6 +1,5 @@
 import type { Metadata } from "next";
 import { Sidebar, Header } from "./components";
-import { Admin } from "@pft-types/index";
 import { getAdminData } from "@lib/admin";
 
 export const metadata: Metadata = {
@@ -13,7 +12,7 @@ export default async function AdminLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
-  const admin: Admin = await getAdminData();
+  const admin = await getAdminData();
 
   return (
     <main className="h-screen flex flex-row">

app/(pages)/admin/transactions/page.tsx

@@ -1,9 +1,8 @@
-import { TransactionDetails } from "@pft-types/index";
 import Transactions from "../components/Transactions";
 import getTransactions from "@lib/admin/getTransactions";
 
 export default async function TransactionsPage() {
-  const transactions: TransactionDetails[] = await getTransactions();
+  const transactions = await getTransactions();
 
   return <Transactions transactions={transactions} />;
 }

app/(pages)/doctor/layout.tsx

@@ -1,6 +1,5 @@
 import { Sidebar, Headbar } from "@components/index";
 import { getDoctorData } from "@lib/doctor";
-import { Doctor } from "@pft-types/index";
 
 import type { Metadata } from "next";
 
@@ -14,7 +13,7 @@ export default async function DoctorLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
-  const doctor: Doctor = await getDoctorData();
+  const doctor = await getDoctorData();
 
   return (
     <main className="h-screen flex">

app/(pages)/hospital/layout.tsx

@@ -1,6 +1,5 @@
 import { Sidebar, Headbar } from "@components/index";
 import { getHospitalData } from "@lib/hospital";
-import { Hospital } from "@pft-types/index";
 
 import type { Metadata } from "next";
 
@@ -14,7 +13,7 @@ export default async function HospitalLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
-  const hospital: Hospital = await getHospitalData();
+  const hospital = await getHospitalData();
 
   return (
     <main className="h-screen flex">

app/(pages)/patient/appointments/page.tsx

@@ -1,10 +1,9 @@
 import { Card, Image } from "@nextui-org/react";
 import { BookAppointment } from "../components";
-import { Patient } from "@pft-types/index";
 import { getPatientData } from "@lib/patient";
 
 export default async function Appointments() {
-  const patient: Patient = await getPatientData();
+  const patient = await getPatientData();
 
   const { _id, firstname, lastname, email } = patient;
 

app/(pages)/patient/components/BookAppointment/index.tsx

@@ -29,18 +29,10 @@ import {
   getHospitals,
   getStates,
 } from "@lib/patient/misc";
-
-type Hospital = {
-  hospital_id: string;
-  hospital_name: string;
-  appointment_charge: string;
-};
-
-type BookAppointmentProps = {
-  patientId: string;
-  name: string;
-  email: string;
-};
+import {
+  BookAppointmentHospital,
+  BookAppointmentProps,
+} from "@pft-types/patient";
 
 export default function BookAppointment({
   patientId,
@@ -51,11 +43,12 @@ export default function BookAppointment({
   const [selectedState, setSelectedState] = useState("");
   const [cities, setCities] = useState<string[]>([]);
   const [selectedCity, setSelectedCity] = useState("");
-  const [selectedHospital, setSelectedHospital] = useState<Hospital>({
-    hospital_id: "",
-    hospital_name: "",
-    appointment_charge: "",
-  });
+  const [selectedHospital, setSelectedHospital] =
+    useState<BookAppointmentHospital>({
+      hospital_id: "",
+      hospital_name: "",
+      appointment_charge: "",
+    });
   const [selectedDisease, setSelectedDisease] = useState("");
   const [loadingStates, setLoadingStates] = useState(false);
   const [loadingCities, setLoadingCities] = useState(false);
@@ -64,9 +57,7 @@ export default function BookAppointment({
   const [isOpenPopover, setIsOpenPopover] = useState(false);
   const [isOpenHospitalPopover, setIsOpenHospitalPopover] = useState(false);
   const [isOpenDiseasePopover, setIsOpenDiseasePopover] = useState(false);
-  const [hospitals, setHospitals] = useState<
-    { hospital_id: string; hospital_name: string; appointment_charge: string }[]
-  >([]);
+  const [hospitals, setHospitals] = useState<BookAppointmentHospital[]>([]);
   const [diseases, setDiseases] = useState<string[]>([]);
   const [additionalNote, setAdditionalNote] = useState("");
   const [noteError, setNoteError] = useState("");
@@ -171,9 +162,8 @@ export default function BookAppointment({
   function handleHospitalChange(e: ChangeEvent<HTMLSelectElement>): void {
     const selectedId = e.target.value;
 
-    const selectedHospitalObj: Hospital | undefined = hospitals.find(
-      (hospital) => hospital.hospital_id === selectedId
-    );
+    const selectedHospitalObj: BookAppointmentHospital | undefined =
+      hospitals.find((hospital) => hospital.hospital_id === selectedId);
 
     if (selectedHospitalObj) {
       setSelectedHospital({
@@ -255,7 +245,7 @@ export default function BookAppointment({
       return;
     }
     clearSelected();
-    toast.success(response.msg);
+    toast.success(response.message);
   }
 
   function clearSelected() {

app/(pages)/patient/components/MedicalDetails/index.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { MedicalHistory } from "@pft-types/index";
+import { MedicalDetailsProps } from "@pft-types/index";
 import {
   Chip,
   Spinner,
@@ -14,10 +14,6 @@ import {
 } from "@nextui-org/react";
 import { getFormattedDate } from "@utils/getDate";
 
-type MedicalDetailsProps = {
-  medicalDetails: MedicalHistory[];
-};
-
 export default function MedicalDetails({
   medicalDetails,
 }: MedicalDetailsProps) {

app/(pages)/patient/components/PaymentDetails/index.tsx

@@ -10,24 +10,7 @@ import {
   TransactionsTable,
 } from "@components/index";
 import useFilterTransaction from "@hooks/useFilterTransaction";
-
-type Hospital = {
-  name: string;
-  profile: string;
-};
-
-type Payment = {
-  hospital: Hospital;
-  disease: string;
-  description: string;
-  date: string;
-  amount: number;
-  status: "Success" | "Failed";
-};
-
-type PaymentDetailsProps = {
-  paymentHistory: Payment[];
-};
+import { Payment, PaymentDetailsProps } from "@pft-types/patient";
 
 const statusColorMap: any = {
   Failed: "danger",

app/(pages)/patient/layout.tsx

@@ -1,6 +1,5 @@
 import Script from "next/script";
 import { Sidebar, Headbar } from "@components/index";
-import { Patient } from "@pft-types/index";
 import { getPatientData } from "@lib/patient";
 
 import type { Metadata } from "next";
@@ -15,7 +14,7 @@ export default async function PatientLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
-  const patient: Patient = await getPatientData();
+  const patient = await getPatientData();
 
   return (
     <main className="h-screen flex">

app/(pages)/patient/page.tsx

@@ -5,14 +5,12 @@ import {
   MedicineDetails,
   HealthConditions,
 } from "./components";
-import { Patient, bookedAppointments } from "@pft-types/index";
 import { getPatientData, getUpcomingAppointments } from "@lib/patient";
 
 export default async function PatientPage() {
-  const patient: Patient = await getPatientData();
+  const patient = await getPatientData();
 
-  const upcomingAppointments: bookedAppointments =
-    await getUpcomingAppointments();
+  const upcomingAppointments = await getUpcomingAppointments();
 
   return (
     <section className="bg-[#f3f6fd] p-2 overflow-y-auto">