From 83aabce8cc42db800d4df5aa023036d16b0226cb Mon Sep 17 00:00:00 2001
From: Esdras Renan <monkeyesdras@gmail.com>
Date: Sat, 18 Oct 2025 22:22:11 -0300
Subject: [PATCH] fix: rely on auth API for server session lookup

---
 src/lib/auth-server.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/lib/auth-server.ts b/src/lib/auth-server.ts
index c3d71dd..fe2111c 100644
--- a/src/lib/auth-server.ts
+++ b/src/lib/auth-server.ts
@@ -1,12 +1,11 @@
 import { cookies, headers } from "next/headers"
 import { redirect } from "next/navigation"
 
-import { getCookieCache } from "better-auth/cookies"
-
 import { env } from "@/lib/env"
 import { isAdmin, isStaff } from "@/lib/authz"
+import { auth } from "@/lib/auth"
 
-type ServerSession = Awaited<ReturnType<typeof getCookieCache>>
+type ServerSession = Awaited<ReturnType<typeof auth.api.getSession>>
 
 async function serializeCookies() {
   const store = await cookies()
@@ -43,7 +42,10 @@ async function buildRequest() {
 export async function getServerSession(): Promise<ServerSession | null> {
   try {
     const request = await buildRequest()
-    const session = await getCookieCache(request)
+    const session = await auth.api.getSession({
+      headers: request.headers,
+      request,
+    })
     return session ?? null
   } catch (error) {
     console.error("Failed to read Better Auth session", error)