Merge pull request #9 from kpcode11/feat-rbac-fixes

Pranit-DC · web-flow · commit 4a518f01107c · 2026-01-23T19:42:05.000+05:30
Implement role-based redirection and add Providers component for sess…
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,7 +1,7 @@
-import type { Metadata } from "next";
-import { Inter } from "next/font/google";
-import "./globals.css";
-import { Toaster } from "@/components/ui/toaster";
+import type { Metadata } from 'next';
+import { Inter } from 'next/font/google';
+import './globals.css';
+import { Providers } from './providers';
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -19,8 +19,7 @@ export default function RootLayout({
   return (
     <html lang="en">
       <body className={inter.className}>
-        {children}
-        <Toaster />
+        <Providers>{children}</Providers>
       </body>
     </html>
   );
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -5,8 +5,32 @@ import { BenefitsSection } from '@/components/landing/benefits-section';
 import { SecuritySection } from '@/components/landing/security-section';
 import { CTASection } from '@/components/landing/cta-section';
 import { Footer } from '@/components/landing/footer';
+import { getServerSession } from 'next-auth/next';
+import { authOptions } from '@/lib/auth';
+import { redirect } from 'next/navigation';
+
+export default async function Home() {
+  // Server-side session check
+  const session = await getServerSession(authOptions);
+  
+  // If user is authenticated, redirect based on role
+  if (session?.user) {
+    const redirectMap: Record<string, string> = {
+      admin: '/admin',
+      doctor: '/doctor',
+      nurse: '/nurse',
+      pharmacist: '/pharmacist',
+      'lab-tech': '/lab-tech',
+      receptionist: '/receptionist',
+      emergency: '/emergency',
+    };
+
+    const role = session.user.role?.toLowerCase() || 'admin';
+    const redirectPath = redirectMap[role] || '/admin';
+    
+    redirect(redirectPath);
+  }
 
-export default function Home() {
   return (
     <main className="overflow-hidden">
       <HeroSection />
diff --git a/src/app/providers.tsx b/src/app/providers.tsx
@@ -0,0 +1,7 @@
+'use client';
+
+import { SessionProvider } from 'next-auth/react';
+
+export function Providers({ children }: { children: React.ReactNode }) {
+  return <SessionProvider>{children}</SessionProvider>;
+}
diff --git a/src/components/auth-page.tsx b/src/components/auth-page.tsx
@@ -30,7 +30,7 @@ export function AuthPage() {
 				email,
 				password,
 				redirect: true,
-				callbackUrl: "/admin",
+				callbackUrl: "/",
 			});
 
 			if (!result?.ok) {
diff --git a/src/components/landing/landing-page-wrapper.tsx b/src/components/landing/landing-page-wrapper.tsx
@@ -0,0 +1,49 @@
+'use client';
+
+import { useEffect } from 'react';
+import { useSession } from 'next-auth/react';
+import { useRouter } from 'next/navigation';
+
+/**
+ * Wrapper component that redirects authenticated users to their respective dashboards.
+ * This prevents users from seeing the landing page after logging in.
+ */
+export function LandingPageWrapper({ children }: { children: React.ReactNode }) {
+  const { data: session, status } = useSession();
+  const router = useRouter();
+
+  useEffect(() => {
+    // Only redirect if we're certain the user is authenticated with valid data
+    if (status === 'authenticated' && session?.user?.id && session.user.role) {
+      // Redirect based on user role
+      const redirectMap: Record<string, string> = {
+        admin: '/admin',
+        doctor: '/doctor',
+        nurse: '/nurse',
+        pharmacist: '/pharmacist',
+        'lab-tech': '/lab-tech',
+        receptionist: '/receptionist',
+        emergency: '/emergency',
+      };
+
+      const role = session.user.role.toLowerCase();
+      const redirectPath = redirectMap[role] || '/admin';
+
+      // Use replace to prevent back button issues
+      router.replace(redirectPath);
+    }
+  }, [status, session, router]);
+
+  // While session is loading, show nothing
+  if (status === 'loading') {
+    return null;
+  }
+
+  // If authenticated, show nothing (effect will handle redirect)
+  if (status === 'authenticated') {
+    return null;
+  }
+
+  // Only show landing page for unauthenticated users
+  return <>{children}</>;
+}
