From cddf8b0a82ae62aeed5eccb083e099e89cd7e667 Mon Sep 17 00:00:00 2001
From: Bereket Engida <bekacru@gmail.com>
Date: Sun, 8 Dec 2024 16:54:36 +0300
Subject: [PATCH] fix: asResponse return type not correctly inferred on
 getSession

---
 .../better-auth/src/api/routes/session-api.test.ts |  2 +-
 packages/better-auth/src/types/api.ts              | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/better-auth/src/api/routes/session-api.test.ts b/packages/better-auth/src/api/routes/session-api.test.ts
index d8dfb93c91..b778843fa6 100644
--- a/packages/better-auth/src/api/routes/session-api.test.ts
+++ b/packages/better-auth/src/api/routes/session-api.test.ts
@@ -5,7 +5,7 @@ import { getDate } from "../../utils/date";
 import { memoryAdapter, type MemoryDB } from "../../adapters/memory-adapter";
 
 describe("session", async () => {
-	const { client, testUser, sessionSetter, cookieSetter } =
+	const { client, testUser, sessionSetter, cookieSetter, auth } =
 		await getTestInstance();
 
 	it("should set cookies correctly on sign in", async () => {
diff --git a/packages/better-auth/src/types/api.ts b/packages/better-auth/src/types/api.ts
index 791f1964f0..35fe5ffdd4 100644
--- a/packages/better-auth/src/types/api.ts
+++ b/packages/better-auth/src/types/api.ts
@@ -32,16 +32,18 @@ export type InferSessionAPI<API> = API extends {
 			E extends Endpoint
 				? E["path"] extends "/get-session"
 					? {
-							getSession: ((context: {
+							getSession: <R extends boolean>(context: {
 								headers: Headers;
 								query?: {
 									disableCookieCache?: boolean;
 								};
-								asResponse?: boolean;
-							}) => Promise<PrettifyDeep<Awaited<ReturnType<E>>>>) & {
-								options: E["options"];
-								path: E["path"];
-							};
+								asResponse?: R;
+							}) => R extends true
+								? Promise<Response>
+								: Promise<PrettifyDeep<Awaited<ReturnType<E>>>> & {
+										options: E["options"];
+										path: E["path"];
+									};
 						}
 					: never
 				: never