From f0ff4534c9ee3f8a7734600821f50d79dbffba8d Mon Sep 17 00:00:00 2001
From: Alex Yang <himself65@outlook.com>
Date: Mon, 26 Jan 2026 10:47:03 -0800
Subject: [PATCH] chore: simplify type (#7618)

---
 packages/better-auth/src/types/models.ts | 26 +++++-------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/packages/better-auth/src/types/models.ts b/packages/better-auth/src/types/models.ts
index 7c663aecbb..cfdc879524 100644
--- a/packages/better-auth/src/types/models.ts
+++ b/packages/better-auth/src/types/models.ts
@@ -1,7 +1,6 @@
 import type { BetterAuthOptions, BetterAuthPlugin } from "@better-auth/core";
 import type { Session, User } from "@better-auth/core/db";
 import type { InferFieldsFromOptions, InferFieldsFromPlugins } from "../db";
-import type { Auth } from "./auth";
 import type { StripEmptyObjects, UnionToIntersection } from "./helper";
 
 export type AdditionalUserFieldsInput<Options extends BetterAuthOptions> =
@@ -20,28 +19,13 @@ export type AdditionalSessionFieldsOutput<Options extends BetterAuthOptions> =
 	InferFieldsFromPlugins<Options, "session", "output"> &
 		InferFieldsFromOptions<Options, "session", "output">;
 
-export type InferUser<O extends BetterAuthOptions | Auth> = UnionToIntersection<
-	StripEmptyObjects<
-		User &
-			(O extends BetterAuthOptions
-				? AdditionalUserFieldsOutput<O>
-				: O extends Auth
-					? AdditionalUserFieldsOutput<O["options"]>
-					: {})
-	>
+export type InferUser<O extends BetterAuthOptions> = UnionToIntersection<
+	StripEmptyObjects<User & AdditionalUserFieldsOutput<O>>
 >;
 
-export type InferSession<O extends BetterAuthOptions | Auth> =
-	UnionToIntersection<
-		StripEmptyObjects<
-			Session &
-				(O extends BetterAuthOptions
-					? AdditionalSessionFieldsOutput<O>
-					: O extends Auth
-						? AdditionalSessionFieldsOutput<O["options"]>
-						: {})
-		>
-	>;
+export type InferSession<O extends BetterAuthOptions> = UnionToIntersection<
+	StripEmptyObjects<Session & AdditionalSessionFieldsOutput<O>>
+>;
 
 export type InferPluginTypes<O extends BetterAuthOptions> =
 	O["plugins"] extends Array<infer P>