refactor middleware logic for prod env

ayusharma-ctrl · ayusharma-ctrl · commit 9007d9891092 · 2025-03-17T15:26:38.000+05:30
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -6,7 +6,6 @@ import { type Metadata } from "next";
 import { TRPCReactProvider } from "@/trpc/react";
 import { AuthProvider } from "@/components/AuthProvider";
 import { Toaster } from "@/components/ui/sonner";
-import { ThemeProvider } from "@/components/ThemeProvider";
 
 export const metadata: Metadata = {
   title: "WorkNest",
@@ -22,7 +21,6 @@ export default function RootLayout({
       <body>
         <AuthProvider>
           <TRPCReactProvider>
-            <ThemeProvider attribute="class" defaultTheme="system" enableSystem disableTransitionOnChange>
               {children}
               <Toaster
                 toastOptions={{
@@ -31,7 +29,6 @@ export default function RootLayout({
                   },
                 }}
               />
-            </ThemeProvider>
           </TRPCReactProvider>
         </AuthProvider>
       </body>
diff --git a/src/middleware.ts b/src/middleware.ts
@@ -2,10 +2,15 @@ import { NextResponse, type NextRequest } from "next/server";
 import { getToken } from "next-auth/jwt";
 
 export async function middleware(req: NextRequest) {
-    const token = await getToken({ req, secret: process.env.AUTH_SECRET! });
-    const isAuthenticated = !!token;
+    const token = await getToken({ 
+        req, 
+        secret: process.env.AUTH_SECRET!,
+        cookieName: "next-auth.session-token",
+    });
 
+    const isAuthenticated = !!token;
     const path = req.nextUrl.pathname;
+
     const publicPaths = ["/", "/organizing-projects-animate.svg", "/feedback-animate.svg"]; // including svgs
     const isPublicPath = publicPaths.includes(path) || path.startsWith("/api/");
 
diff --git a/src/server/auth/config.ts b/src/server/auth/config.ts
@@ -58,4 +58,16 @@ export const authConfig = {
       },
     }),
   },
+  cookies: {
+    sessionToken: {
+      name: "next-auth.session-token",
+      options: {
+        httpOnly: true,
+        sameSite: "lax",
+        path: "/",
+        secure: true,
+        domain: ".cloudfront.net",
+      }
+    }
+  },
 } satisfies NextAuthConfig;
