better-auth 1.6.25 → 1.6.27

package/dist/db/internal-adapter.mjs

@@ -17,6 +17,8 @@ const createInternalAdapter = (adapter, ctx) => {
 	const logger = ctx.logger;
 	const options = ctx.options;
 	const secondaryStorage = options.secondaryStorage;
+	const databaseStoresSessions = !secondaryStorage || options.session?.storeSessionInDatabase === true;
+	const preservesDatabaseSessions = secondaryStorage !== void 0 && options.session?.preserveSessionInDatabase === true;
 	const verificationConsumeLocks = /* @__PURE__ */ new Map();
 	let warnedNonAtomicConsume = false;
 	const sessionExpiration = options.session?.expiresIn || 3600 * 24 * 7;
@@ -55,6 +57,20 @@ const createInternalAdapter = (adapter, ctx) => {
 			if (verificationConsumeLocks.get(key) === next) verificationConsumeLocks.delete(key);
 		}
 	}
+	const deleteSecondaryStorageSessions = async (userId) => {
+		if (!secondaryStorage) return;
+		const activeSession = await secondaryStorage.get(`active-sessions-${userId}`);
+		const sessions = activeSession ? safeJSONParse(activeSession) : [];
+		if (!sessions) return;
+		for (const session of sessions) await secondaryStorage.delete(session.token);
+		await secondaryStorage.delete(`active-sessions-${userId}`);
+	};
+	const deleteDatabaseSessions = async (userId) => {
+		await deleteManyWithHooks([{
+			field: "userId",
+			value: userId
+		}], "session", void 0);
+	};
 	return {
 		createOAuthUser: async (user, account) => {
 			return runWithTransaction(adapter, async () => {
@@ -146,10 +162,8 @@ const createInternalAdapter = (adapter, ctx) => {
 			return total;
 		},
 		deleteUser: async (userId) => {
-			if (!secondaryStorage || options.session?.storeSessionInDatabase) await deleteManyWithHooks([{
-				field: "userId",
-				value: userId
-			}], "session", void 0);
+			await deleteSecondaryStorageSessions(userId);
+			if (databaseStoresSessions) await deleteDatabaseSessions(userId);
 			await deleteManyWithHooks([{
 				field: "userId",
 				value: userId
@@ -271,7 +285,7 @@ const createInternalAdapter = (adapter, ctx) => {
 					const sessionStringified = await secondaryStorage.get(sessionToken);
 					if (sessionStringified) try {
 						const s = typeof sessionStringified === "string" ? JSON.parse(sessionStringified) : sessionStringified;
-						if (!s) return [];
+						if (!s) continue;
 						const expiresAt = new Date(s.session.expiresAt);
 						if (options?.onlyActiveSessions && expiresAt <= /* @__PURE__ */ new Date()) continue;
 						const session = {
@@ -377,9 +391,8 @@ const createInternalAdapter = (adapter, ctx) => {
 					} else logger.error("Active sessions list not found in secondary storage");
 				}
 				await secondaryStorage.delete(token);
-				if (!options.session?.storeSessionInDatabase || ctx.options.session?.preserveSessionInDatabase) return;
 			}
-			await deleteWithHooks([{
+			if (databaseStoresSessions && !preservesDatabaseSessions) await deleteWithHooks([{
 				field: "token",
 				value: token
 			}], "session", void 0);
@@ -402,25 +415,14 @@ const createInternalAdapter = (adapter, ctx) => {
 			}], "account", void 0);
 		},
 		deleteUserSessions: async (userId) => {
-			if (secondaryStorage) {
-				const activeSession = await secondaryStorage.get(`active-sessions-${userId}`);
-				const sessions = activeSession ? safeJSONParse(activeSession) : [];
-				if (!sessions) return;
-				for (const session of sessions) await secondaryStorage.delete(session.token);
-				await secondaryStorage.delete(`active-sessions-${userId}`);
-				if (!options.session?.storeSessionInDatabase || ctx.options.session?.preserveSessionInDatabase) return;
-			}
-			await deleteManyWithHooks([{
-				field: "userId",
-				value: userId
-			}], "session", void 0);
+			await deleteSecondaryStorageSessions(userId);
+			if (databaseStoresSessions && !preservesDatabaseSessions) await deleteDatabaseSessions(userId);
 		},
 		deleteSessions: async (sessionTokens) => {
 			if (secondaryStorage) {
 				for (const sessionToken of sessionTokens) if (await secondaryStorage.get(sessionToken)) await secondaryStorage.delete(sessionToken);
-				if (!options.session?.storeSessionInDatabase || ctx.options.session?.preserveSessionInDatabase) return;
 			}
-			await deleteManyWithHooks([{
+			if (databaseStoresSessions && !preservesDatabaseSessions) await deleteManyWithHooks([{
 				field: "token",
 				value: sessionTokens,
 				operator: "in"

package/dist/integrations/next-js.d.mts

@@ -14,11 +14,11 @@ declare const nextCookies: () => {
   hooks: {
     before: {
       matcher(ctx: import("@better-auth/core").HookEndpointContext): boolean;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
     after: {
       matcher(ctx: import("@better-auth/core").HookEndpointContext): true;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
   };
 };

package/dist/integrations/next-js.mjs

@@ -16,6 +16,20 @@ function toNextJsHandler(auth) {
 		DELETE: handler
 	};
 }
+let nextHeadersModulePromise;
+/**
+* Cache ESM resolution while leaving the request-scoped `headers()` and
+* `cookies()` calls uncached.
+*
+* @see https://github.com/better-auth/better-auth/issues/10466
+*/
+const loadNextHeadersModule = () => {
+	nextHeadersModulePromise ??= import("next/headers.js").catch((error) => {
+		nextHeadersModulePromise = void 0;
+		throw error;
+	});
+	return nextHeadersModulePromise;
+};
 const nextCookies = () => {
 	let hasWarned = false;
 	return {
@@ -34,7 +48,7 @@ const nextCookies = () => {
 					if ("_flag" in ctx && ctx._flag === "router") return;
 					let headersStore;
 					try {
-						const { headers } = await import("next/headers.js");
+						const { headers } = await loadNextHeadersModule();
 						headersStore = await headers();
 					} catch {
 						return;
@@ -68,7 +82,7 @@ const nextCookies = () => {
 						const parsed = parseSetCookieHeader(setCookies);
 						let cookieHelper;
 						try {
-							const { cookies } = await import("next/headers.js");
+							const { cookies } = await loadNextHeadersModule();
 							cookieHelper = await cookies();
 						} catch (error) {
 							if (error instanceof Error && (error.message.startsWith("`cookies` was called outside a request scope.") || error.message.includes("Cannot find module"))) return;

package/dist/integrations/svelte-kit.d.mts

@@ -23,7 +23,7 @@ declare const sveltekitCookies: (getRequestEvent: () => RequestEvent<any, any>)
   hooks: {
     after: {
       matcher(): true;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
   };
 };

package/dist/integrations/tanstack-start-solid.d.mts

@@ -22,7 +22,7 @@ declare const tanstackStartCookies: () => {
   hooks: {
     after: {
       matcher(ctx: import("@better-auth/core").HookEndpointContext): true;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
   };
 };

package/dist/integrations/tanstack-start.d.mts

@@ -22,7 +22,7 @@ declare const tanstackStartCookies: () => {
   hooks: {
     after: {
       matcher(ctx: import("@better-auth/core").HookEndpointContext): true;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
   };
 };

package/dist/package.mjs

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "1.6.25";
+var version = "1.6.27";
 //#endregion
 export { version };

package/dist/plugins/admin/admin.d.mts

@@ -59,7 +59,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
   hooks: {
     after: {
       matcher(context: import("@better-auth/core").HookEndpointContext): boolean;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<SessionWithImpersonatedBy[] | undefined>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<SessionWithImpersonatedBy[] | undefined>>;
     }[];
   };
   endpoints: {
@@ -70,7 +70,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
         role: import("zod").ZodUnion<readonly [import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString>]>;
       }, import("zod/v4/core").$strip>;
       requireHeaders: true;
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           user: UserWithRole;
           session: {
@@ -84,7 +84,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
             userAgent?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           operationId: string;
@@ -123,7 +123,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
       query: import("zod").ZodObject<{
         id: import("zod").ZodString;
       }, import("zod/v4/core").$strip>;
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           user: UserWithRole;
           session: {
@@ -137,7 +137,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
             userAgent?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           operationId: string;
@@ -214,7 +214,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
         userId: import("zod").ZodCoercedString<unknown>;
         data: import("zod").ZodRecord<import("zod").ZodAny, import("zod").ZodAny>;
       }, import("zod/v4/core").$strip>;
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           user: UserWithRole;
           session: {
@@ -228,7 +228,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
             userAgent?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           operationId: string;
@@ -256,7 +256,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
     }, UserWithRole>;
     listUsers: import("better-call").StrictEndpoint<"/admin/list-users", {
       method: "GET";
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           user: UserWithRole;
           session: {
@@ -270,7 +270,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
             userAgent?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       query: import("zod").ZodObject<{
         searchValue: import("zod").ZodOptional<import("zod").ZodString>;
         searchField: import("zod").ZodOptional<import("zod").ZodEnum<{
@@ -348,7 +348,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
     }>;
     listUserSessions: import("better-call").StrictEndpoint<"/admin/list-user-sessions", {
       method: "POST";
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           user: UserWithRole;
           session: {
@@ -362,7 +362,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
             userAgent?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       body: import("zod").ZodObject<{
         userId: import("zod").ZodCoercedString<unknown>;
       }, import("zod/v4/core").$strip>;
@@ -401,7 +401,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
       body: import("zod").ZodObject<{
         userId: import("zod").ZodCoercedString<unknown>;
       }, import("zod/v4/core").$strip>;
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           user: UserWithRole;
           session: {
@@ -415,7 +415,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
             userAgent?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           operationId: string;
@@ -450,7 +450,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
         banReason: import("zod").ZodOptional<import("zod").ZodString>;
         banExpiresIn: import("zod").ZodOptional<import("zod").ZodNumber>;
       }, import("zod/v4/core").$strip>;
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           user: UserWithRole;
           session: {
@@ -464,7 +464,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
             userAgent?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           operationId: string;
@@ -497,7 +497,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
       body: import("zod").ZodObject<{
         userId: import("zod").ZodCoercedString<unknown>;
       }, import("zod/v4/core").$strip>;
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           user: UserWithRole;
           session: {
@@ -511,7 +511,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
             userAgent?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           operationId: string;
@@ -581,7 +581,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
       body: import("zod").ZodObject<{
         sessionToken: import("zod").ZodString;
       }, import("zod/v4/core").$strip>;
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           user: UserWithRole;
           session: {
@@ -595,7 +595,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
             userAgent?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           operationId: string;
@@ -628,7 +628,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
       body: import("zod").ZodObject<{
         userId: import("zod").ZodCoercedString<unknown>;
       }, import("zod/v4/core").$strip>;
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           user: UserWithRole;
           session: {
@@ -642,7 +642,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
             userAgent?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           operationId: string;
@@ -675,7 +675,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
       body: import("zod").ZodObject<{
         userId: import("zod").ZodCoercedString<unknown>;
       }, import("zod/v4/core").$strip>;
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           user: UserWithRole;
           session: {
@@ -689,7 +689,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
             userAgent?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           operationId: string;
@@ -723,7 +723,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
         newPassword: import("zod").ZodString;
         userId: import("zod").ZodCoercedString<unknown>;
       }, import("zod/v4/core").$strip>;
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           user: UserWithRole;
           session: {
@@ -737,7 +737,7 @@ declare const admin: <O extends AdminOptions>(options?: O | undefined) => {
             userAgent?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           operationId: string;

package/dist/plugins/anonymous/index.d.mts

@@ -52,7 +52,7 @@ declare const anonymous: (options?: AnonymousOptions | undefined) => {
     }>;
     deleteAnonymousUser: import("better-call").StrictEndpoint<"/delete-anonymous-user", {
       method: "POST";
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           session: Record<string, any> & {
             id: string;
@@ -74,7 +74,7 @@ declare const anonymous: (options?: AnonymousOptions | undefined) => {
             image?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           description: string;
@@ -136,7 +136,7 @@ declare const anonymous: (options?: AnonymousOptions | undefined) => {
   hooks: {
     after: {
       matcher(ctx: import("@better-auth/core").HookEndpointContext): boolean;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
   };
   options: AnonymousOptions | undefined;

package/dist/plugins/anonymous/index.mjs

@@ -154,7 +154,6 @@ const anonymous = (options) => {
 				const newSessionIsAnonymous = Boolean(newSessionUser?.isAnonymous);
 				if (options?.disableDeleteAnonymousUser || isSameUser || newSessionIsAnonymous) return;
 				try {
-					await ctx.context.internalAdapter.deleteUserSessions(session.user.id);
 					await ctx.context.internalAdapter.deleteUser(session.user.id);
 				} catch (error) {
 					ctx.context.logger.error("Failed to clean up anonymous user during post-link cleanup", {

package/dist/plugins/bearer/index.d.mts

@@ -25,15 +25,15 @@ declare const bearer: (options?: BearerOptions | undefined) => {
   hooks: {
     before: {
       matcher(context: import("@better-auth/core").HookEndpointContext): boolean;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         context: {
           headers: Headers;
         };
-      } | undefined>;
+      } | undefined>>;
     }[];
     after: {
       matcher(context: import("@better-auth/core").HookEndpointContext): true;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
   };
   options: BearerOptions | undefined;

package/dist/plugins/custom-session/index.d.mts

@@ -24,7 +24,7 @@ declare const customSession: <Returns extends Record<string, any>, O extends Bet
   hooks: {
     after: {
       matcher: (ctx: import("@better-auth/core").HookEndpointContext) => boolean;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<Awaited<Returns>[] | undefined>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<Awaited<Returns>[] | undefined>>;
     }[];
   };
   endpoints: {

package/dist/plugins/email-otp/index.d.mts

@@ -24,7 +24,7 @@ declare const emailOTP: (options: EmailOTPOptions) => {
   endpoints: {
     sendVerificationOTP: import("better-call").StrictEndpoint<"/email-otp/send-verification-otp", {
       method: "POST";
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>)[];
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>[];
       body: import("zod").ZodObject<{
         email: import("zod").ZodString;
         type: import("zod").ZodEnum<{
@@ -385,7 +385,7 @@ declare const emailOTP: (options: EmailOTPOptions) => {
         newEmail: import("zod").ZodString;
         otp: import("zod").ZodOptional<import("zod").ZodString>;
       }, import("zod/v4/core").$strip>;
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           session: Record<string, any> & {
             id: string;
@@ -407,7 +407,7 @@ declare const emailOTP: (options: EmailOTPOptions) => {
             image?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           operationId: string;
@@ -440,7 +440,7 @@ declare const emailOTP: (options: EmailOTPOptions) => {
         newEmail: import("zod").ZodString;
         otp: import("zod").ZodString;
       }, import("zod/v4/core").$strip>;
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           session: Record<string, any> & {
             id: string;
@@ -462,7 +462,7 @@ declare const emailOTP: (options: EmailOTPOptions) => {
             image?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           operationId: string;
@@ -493,7 +493,7 @@ declare const emailOTP: (options: EmailOTPOptions) => {
   hooks: {
     after: {
       matcher(context: import("@better-auth/core").HookEndpointContext): boolean;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
   };
   rateLimit: ({

package/dist/plugins/email-otp/index.mjs

@@ -56,7 +56,7 @@ const emailOTP = (options) => {
 				if (email) {
 					const otp = opts.generateOTP({
 						email,
-						type: ctx.body.type
+						type: "email-verification"
 					}, ctx) || defaultOTPGenerator(opts);
 					const storedOTP = await storeOTP(ctx, opts, otp);
 					await ctx.context.internalAdapter.createVerificationValue({

package/dist/plugins/email-otp/routes.mjs

@@ -235,7 +235,6 @@ const checkVerificationOTP = (opts) => createAuthEndpoint("/email-otp/check-veri
 }, async (ctx) => {
 	const email = ctx.body.email.toLowerCase();
 	if (!z.email().safeParse(email).success) throw APIError$1.from("BAD_REQUEST", BASE_ERROR_CODES.INVALID_EMAIL);
-	if (!await ctx.context.internalAdapter.findUserByEmail(email)) throw APIError$1.from("BAD_REQUEST", BASE_ERROR_CODES.USER_NOT_FOUND);
 	const identifier = toOTPIdentifier(ctx.body.type, email);
 	const verificationValue = await ctx.context.internalAdapter.findVerificationValue(identifier);
 	if (!verificationValue) throw APIError$1.from("BAD_REQUEST", EMAIL_OTP_ERROR_CODES.INVALID_OTP);
@@ -253,6 +252,12 @@ const checkVerificationOTP = (opts) => createAuthEndpoint("/email-otp/check-veri
 		await ctx.context.internalAdapter.updateVerificationByIdentifier(identifier, { value: `${otpValue}:${parseInt(attempts || "0") + 1}` });
 		throw APIError$1.from("BAD_REQUEST", EMAIL_OTP_ERROR_CODES.INVALID_OTP);
 	}
+	if (!await ctx.context.internalAdapter.findUserByEmail(email))
+ /**
+	* safe to leak the existence of a user, given the user has already the OTP from the
+	* email
+	*/
+	throw APIError$1.from("BAD_REQUEST", BASE_ERROR_CODES.USER_NOT_FOUND);
 	return ctx.json({ success: true });
 });
 const verifyEmailOTPBodySchema = z.object({
@@ -574,13 +579,13 @@ const resetPasswordEmailOTP = (opts) => createAuthEndpoint("/email-otp/reset-pas
 	} }
 }, async (ctx) => {
 	const email = ctx.body.email.toLowerCase();
-	await atomicVerifyOTP(ctx, opts, toOTPIdentifier("forget-password", email), ctx.body.otp);
-	const user = await ctx.context.internalAdapter.findUserByEmail(email, { includeAccounts: true });
-	if (!user) throw APIError$1.from("BAD_REQUEST", BASE_ERROR_CODES.USER_NOT_FOUND);
 	const minPasswordLength = ctx.context.password.config.minPasswordLength;
 	if (ctx.body.password.length < minPasswordLength) throw APIError$1.from("BAD_REQUEST", BASE_ERROR_CODES.PASSWORD_TOO_SHORT);
 	const maxPasswordLength = ctx.context.password.config.maxPasswordLength;
 	if (ctx.body.password.length > maxPasswordLength) throw APIError$1.from("BAD_REQUEST", BASE_ERROR_CODES.PASSWORD_TOO_LONG);
+	await atomicVerifyOTP(ctx, opts, toOTPIdentifier("forget-password", email), ctx.body.otp);
+	const user = await ctx.context.internalAdapter.findUserByEmail(email, { includeAccounts: true });
+	if (!user) throw APIError$1.from("BAD_REQUEST", BASE_ERROR_CODES.USER_NOT_FOUND);
 	const passwordHash = await ctx.context.password.hash(ctx.body.password);
 	if (!user.accounts?.find((account) => account.providerId === "credential")) await ctx.context.internalAdapter.createAccount({
 		userId: user.user.id,

package/dist/plugins/generic-oauth/index.d.mts

@@ -123,7 +123,7 @@ declare const genericOAuth: (options: GenericOAuthOptions) => {
         scopes: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString>>;
         errorCallbackURL: import("zod").ZodOptional<import("zod").ZodString>;
       }, import("zod/v4/core").$strip>;
-      use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+      use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
         session: {
           session: Record<string, any> & {
             id: string;
@@ -145,7 +145,7 @@ declare const genericOAuth: (options: GenericOAuthOptions) => {
             image?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           description: string;

package/dist/plugins/jwt/adapter.mjs

@@ -1,17 +1,18 @@
+import { getCurrentAdapter } from "@better-auth/core/context";
 //#region src/plugins/jwt/adapter.ts
-const getJwksAdapter = (adapter, options) => {
+const getJwksAdapter = (baseAdapter, options) => {
 	return {
 		getAllKeys: async (ctx) => {
 			if (options?.adapter?.getJwks) return await options.adapter.getJwks(ctx);
-			return await adapter.findMany({ model: "jwks" });
+			return await (await getCurrentAdapter(baseAdapter)).findMany({ model: "jwks" });
 		},
 		getLatestKey: async (ctx) => {
 			if (options?.adapter?.getJwks) return (await options.adapter.getJwks(ctx))?.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())[0];
-			return (await adapter.findMany({ model: "jwks" }))?.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())[0];
+			return (await (await getCurrentAdapter(baseAdapter)).findMany({ model: "jwks" }))?.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())[0];
 		},
 		createJwk: async (ctx, webKey) => {
 			if (options?.adapter?.createJwk) return await options.adapter.createJwk(webKey, ctx);
-			return await adapter.create({
+			return await (await getCurrentAdapter(baseAdapter)).create({
 				model: "jwks",
 				data: {
 					...webKey,

package/dist/plugins/jwt/client.d.mts

@@ -1,6 +1,8 @@
 import { JWKOptions, JWSAlgorithms, Jwk, JwtOptions } from "./types.mjs";
 import { jwt } from "./index.mjs";
+import { BetterAuthClientOptions, ClientFetchOption, ClientStore } from "@better-auth/core";
 import { JSONWebKeySet } from "jose";
+import { BetterFetch } from "@better-fetch/fetch";
 //#region src/plugins/jwt/client.d.ts
 interface JwtClientOptions {
   jwks?: {
@@ -20,8 +22,8 @@ declare const jwtClient: (options?: JwtClientOptions) => {
   pathMethods: {
     [x: string]: "GET";
   };
-  getActions: ($fetch: import("@better-fetch/fetch").BetterFetch) => {
-    jwks: (fetchOptions?: any) => Promise<{
+  getActions: ($fetch: BetterFetch, _$store: ClientStore, _options: BetterAuthClientOptions | undefined) => {
+    jwks: (fetchOptions?: ClientFetchOption) => Promise<{
       data: null;
       error: {
         message?: string | undefined;