@better-auth/core 1.6.0-beta.0 → 1.6.1

package/dist/api/index.d.mts

@@ -4,15 +4,13 @@ import { createLogger } from "../env/logger.mjs";
 import { AuthContext } from "../types/context.mjs";
 import { OAuthProvider } from "../oauth2/oauth-provider.mjs";
 import * as better_call0 from "better-call";
-import { Endpoint, EndpointContext, EndpointMetadata, HTTPMethod, Middleware, ResolveBodyInput, ResolveErrorInput, ResolveMetaInput, ResolveQueryInput, StandardSchemaV1 } from "better-call";
+import { EndpointContext, EndpointOptions, StrictEndpoint } from "better-call";
 import * as _better_auth_core0 from "@better-auth/core";
 
 //#region src/api/index.d.ts
-declare const optionsMiddleware: Middleware<(inputContext: Record<string, any>) => Promise<AuthContext>>;
+declare const optionsMiddleware: <InputCtx extends better_call0.MiddlewareInputContext<better_call0.MiddlewareOptions>>(inputContext: InputCtx) => Promise<AuthContext>;
 declare const createAuthMiddleware: {
-  <R>(options: {
-    use?: Middleware[];
-  }, handler: (ctx: better_call0.MiddlewareContext<{
+  <Options extends better_call0.MiddlewareOptions, R>(options: Options, handler: (ctx: better_call0.MiddlewareContext<Options, {
     returned?: unknown | undefined;
     responseHeaders?: Headers | undefined;
   } & _better_auth_core0.PluginContext<_better_auth_core0.BetterAuthOptions> & _better_auth_core0.InfoContext & {
@@ -140,8 +138,8 @@ declare const createAuthMiddleware: {
     skipCSRFCheck: boolean;
     runInBackground: (promise: Promise<unknown>) => void;
     runInBackgroundOrAwait: (promise: Promise<unknown> | void) => _better_auth_core0.Awaitable<unknown>;
-  }>) => Promise<R>): Middleware<(inputContext: Record<string, any>) => Promise<R>>;
-  <R>(handler: (ctx: better_call0.MiddlewareContext<{
+  }>) => Promise<R>): (inputContext: better_call0.MiddlewareInputContext<Options>) => Promise<R>;
+  <Options extends better_call0.MiddlewareOptions, R_1>(handler: (ctx: better_call0.MiddlewareContext<Options, {
     returned?: unknown | undefined;
     responseHeaders?: Headers | undefined;
   } & _better_auth_core0.PluginContext<_better_auth_core0.BetterAuthOptions> & _better_auth_core0.InfoContext & {
@@ -269,40 +267,12 @@ declare const createAuthMiddleware: {
     skipCSRFCheck: boolean;
     runInBackground: (promise: Promise<unknown>) => void;
     runInBackgroundOrAwait: (promise: Promise<unknown> | void) => _better_auth_core0.Awaitable<unknown>;
-  }>) => Promise<R>): Middleware<(inputContext: Record<string, any>) => Promise<R>>;
+  }>) => Promise<R_1>): (inputContext: better_call0.MiddlewareInputContext<Options>) => Promise<R_1>;
 };
-type BodyOption<M, B extends object | undefined = undefined> = M extends "GET" | "HEAD" | ("GET" | "HEAD")[] ? {
-  body?: never;
-} : {
-  body?: B;
-};
-type AuthEndpointOptions<Method extends HTTPMethod | HTTPMethod[] | "*", BodySchema extends object | undefined, QuerySchema extends object | undefined, Use extends Middleware[], ReqHeaders extends boolean, ReqRequest extends boolean, Meta extends EndpointMetadata | undefined, ErrorSchema extends StandardSchemaV1 | undefined = undefined> = {
-  method: Method;
-} & BodyOption<Method, BodySchema> & {
-  query?: QuerySchema;
-  use?: [...Use];
-  requireHeaders?: ReqHeaders;
-  requireRequest?: ReqRequest;
-  error?: ErrorSchema;
-  cloneRequest?: boolean;
-  disableBody?: boolean;
-  metadata?: Meta;
-  [key: string]: any;
-};
-/**
- * Normalize readonly tuples produced by `const` type parameters
- * into mutable arrays so downstream `M extends Array<any>` checks work.
- */
-type NormalizeMethod<M> = M extends readonly (infer E)[] ? E[] : M;
-declare function createAuthEndpoint<Path extends string, const Method extends HTTPMethod | HTTPMethod[] | "*", BodySchema extends object | undefined = undefined, QuerySchema extends object | undefined = undefined, Use extends Middleware[] = [], ReqHeaders extends boolean = false, ReqRequest extends boolean = false, R = unknown, Meta extends EndpointMetadata | undefined = undefined, ErrorSchema extends StandardSchemaV1 | undefined = undefined>(path: Path, options: AuthEndpointOptions<Method, BodySchema, QuerySchema, Use, ReqHeaders, ReqRequest, Meta, ErrorSchema>, handler: (ctx: EndpointContext<Path, Method, BodySchema, QuerySchema, Use, ReqHeaders, ReqRequest, AuthContext, Meta>) => Promise<R>): Endpoint<Path, NormalizeMethod<Method>, ResolveBodyInput<BodySchema, Meta>, ResolveQueryInput<QuerySchema, Meta>, Use, R, ResolveMetaInput<Meta>, ResolveErrorInput<ErrorSchema, Meta>>;
-declare function createAuthEndpoint<const Method extends HTTPMethod | HTTPMethod[] | "*", BodySchema extends object | undefined = undefined, QuerySchema extends object | undefined = undefined, Use extends Middleware[] = [], ReqHeaders extends boolean = false, ReqRequest extends boolean = false, R = unknown, Meta extends EndpointMetadata | undefined = undefined, ErrorSchema extends StandardSchemaV1 | undefined = undefined>(options: AuthEndpointOptions<Method, BodySchema, QuerySchema, Use, ReqHeaders, ReqRequest, Meta, ErrorSchema>, handler: (ctx: EndpointContext<string, Method, BodySchema, QuerySchema, Use, ReqHeaders, ReqRequest, AuthContext, Meta>) => Promise<R>): Endpoint<string, NormalizeMethod<Method>, ResolveBodyInput<BodySchema, Meta>, ResolveQueryInput<QuerySchema, Meta>, Use, R, ResolveMetaInput<Meta>, ResolveErrorInput<ErrorSchema, Meta>>;
-type AuthEndpoint = ReturnType<typeof createAuthEndpoint>;
-/**
- * The handler type for plugin hooks.
- *
- * Accepts both `Middleware` instances (from `createAuthMiddleware`)
- * and plain async functions for better-call v1/v2 compatibility.
- */
-type AuthMiddleware = (inputContext: Record<string, any>) => Promise<unknown>;
+type EndpointHandler<Path extends string, Options extends EndpointOptions, R> = (context: EndpointContext<Path, Options, AuthContext>) => Promise<R>;
+declare function createAuthEndpoint<Path extends string, Options extends EndpointOptions, R>(path: Path, options: Options, handler: EndpointHandler<Path, Options, R>): StrictEndpoint<Path, Options, R>;
+declare function createAuthEndpoint<Path extends string, Options extends EndpointOptions, R>(options: Options, handler: EndpointHandler<Path, Options, R>): StrictEndpoint<Path, Options, R>;
+type AuthEndpoint<Path extends string, Opts extends EndpointOptions, R> = ReturnType<typeof createAuthEndpoint<Path, Opts, R>>;
+type AuthMiddleware = ReturnType<typeof createAuthMiddleware>;
 //#endregion
 export { AuthEndpoint, AuthMiddleware, createAuthEndpoint, createAuthMiddleware, optionsMiddleware };

package/dist/context/endpoint-context.d.mts

@@ -3,7 +3,7 @@ import { EndpointContext, InputContext } from "better-call";
 import { AsyncLocalStorage } from "@better-auth/core/async_hooks";
 
 //#region src/context/endpoint-context.d.ts
-type AuthEndpointContext = Partial<InputContext<string, any, any, any, any, any> & EndpointContext<string, any, any, any, any, any, any, AuthContext>> & {
+type AuthEndpointContext = Partial<InputContext<string, any> & EndpointContext<string, any>> & {
   context: AuthContext;
 };
 /**

package/dist/context/global.mjs

@@ -2,7 +2,7 @@
 const symbol = Symbol.for("better-auth:global");
 let bind = null;
 const __context = {};
-const __betterAuthVersion = "1.6.0-beta.0";
+const __betterAuthVersion = "1.6.1";
 /**
 * We store context instance in the globalThis.
 *

package/dist/instrumentation/tracer.mjs

@@ -1,7 +1,7 @@
 import { ATTR_HTTP_RESPONSE_STATUS_CODE } from "./attributes.mjs";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 //#region src/instrumentation/tracer.ts
-const tracer = trace.getTracer("better-auth", "1.6.0-beta.0");
+const tracer = trace.getTracer("better-auth", "1.6.1");
 /**
 * Better-auth uses `throw ctx.redirect(url)` for flow control (e.g. OAuth
 * callbacks). These are APIErrors with 3xx status codes and should not be

package/dist/types/context.d.mts

@@ -50,7 +50,9 @@ type InferPluginOptions<O extends BetterAuthOptions, ID extends BetterAuthPlugin
  */
 interface BetterAuthPluginRegistry<AuthOptions, Options> {}
 type BetterAuthPluginRegistryIdentifier = keyof BetterAuthPluginRegistry<unknown, unknown>;
-type GenericEndpointContext<Options extends BetterAuthOptions = BetterAuthOptions> = EndpointContext<string, any, any, any, any, any, any, AuthContext<Options>>;
+type GenericEndpointContext<Options extends BetterAuthOptions = BetterAuthOptions> = EndpointContext<string, any> & {
+  context: AuthContext<Options>;
+};
 interface InternalAdapter<_Options extends BetterAuthOptions = BetterAuthOptions> {
   createOAuthUser(user: Omit<User, "id" | "createdAt" | "updatedAt">, account: Omit<Account, "userId" | "id" | "createdAt" | "updatedAt"> & Partial<Account>): Promise<{
     user: User;

package/dist/types/plugin.d.mts

@@ -9,10 +9,7 @@ import { Migration } from "kysely";
 
 //#region src/types/plugin.d.ts
 type DeepPartial<T> = T extends Function ? T : T extends object ? { [K in keyof T]?: DeepPartial<T[K]> } : T;
-type HookEndpointContext = Partial<EndpointContext<string, any, any, any, any, any, any, AuthContext & {
-  returned?: unknown | undefined;
-  responseHeaders?: Headers | undefined;
-}> & Omit<InputContext<string, any, any, any, any, any>, "method">> & {
+type HookEndpointContext = Partial<EndpointContext<string, any> & Omit<InputContext<string, any>, "method">> & {
   path?: string;
   context: AuthContext & {
     returned?: unknown | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/core",
-  "version": "1.6.0-beta.0",
+  "version": "1.6.1",
   "description": "The most comprehensive authentication framework for TypeScript.",
   "type": "module",
   "license": "MIT",
@@ -150,7 +150,7 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/sdk-trace-base": "^1.30.0",
     "@opentelemetry/sdk-trace-node": "^1.30.0",
-    "better-call": "2.0.3",
+    "better-call": "1.3.5",
     "@cloudflare/workers-types": "^4.20250121.0",
     "jose": "^6.1.3",
     "kysely": "^0.28.14",
@@ -161,7 +161,7 @@
     "@better-auth/utils": "0.4.0",
     "@better-fetch/fetch": "1.1.21",
     "@opentelemetry/api": "^1.9.0",
-    "better-call": "2.0.3",
+    "better-call": "1.3.5",
     "@cloudflare/workers-types": ">=4",
     "jose": "^6.1.0",
     "kysely": "^0.28.5",

package/src/api/index.ts

@@ -1,15 +1,7 @@
 import type {
-	Endpoint,
 	EndpointContext,
-	EndpointMetadata,
-	EndpointRuntimeOptions,
-	HTTPMethod,
-	Middleware,
-	ResolveBodyInput,
-	ResolveErrorInput,
-	ResolveMetaInput,
-	ResolveQueryInput,
-	StandardSchemaV1,
+	EndpointOptions,
+	StrictEndpoint,
 } from "better-call";
 import { createEndpoint, createMiddleware } from "better-call";
 import { runWithEndpointContext } from "../context";
@@ -41,145 +33,47 @@ export const createAuthMiddleware = createMiddleware.create({
 
 const use = [optionsMiddleware];
 
-type BodyOption<M, B extends object | undefined = undefined> = M extends
-	| "GET"
-	| "HEAD"
-	| ("GET" | "HEAD")[]
-	? { body?: never }
-	: { body?: B };
-
-type AuthEndpointOptions<
-	Method extends HTTPMethod | HTTPMethod[] | "*",
-	BodySchema extends object | undefined,
-	QuerySchema extends object | undefined,
-	Use extends Middleware[],
-	ReqHeaders extends boolean,
-	ReqRequest extends boolean,
-	Meta extends EndpointMetadata | undefined,
-	ErrorSchema extends StandardSchemaV1 | undefined = undefined,
-> = { method: Method } & BodyOption<Method, BodySchema> & {
-		query?: QuerySchema;
-		use?: [...Use];
-		requireHeaders?: ReqHeaders;
-		requireRequest?: ReqRequest;
-		error?: ErrorSchema;
-		cloneRequest?: boolean;
-		disableBody?: boolean;
-		metadata?: Meta;
-		[key: string]: any;
-	};
-
-/**
- * Normalize readonly tuples produced by `const` type parameters
- * into mutable arrays so downstream `M extends Array<any>` checks work.
- */
-type NormalizeMethod<M> = M extends readonly (infer E)[] ? E[] : M;
+type EndpointHandler<
+	Path extends string,
+	Options extends EndpointOptions,
+	R,
+> = (context: EndpointContext<Path, Options, AuthContext>) => Promise<R>;
 
-// Path + options + handler overload
 export function createAuthEndpoint<
 	Path extends string,
-	const Method extends HTTPMethod | HTTPMethod[] | "*",
-	BodySchema extends object | undefined = undefined,
-	QuerySchema extends object | undefined = undefined,
-	Use extends Middleware[] = [],
-	ReqHeaders extends boolean = false,
-	ReqRequest extends boolean = false,
-	R = unknown,
-	Meta extends EndpointMetadata | undefined = undefined,
-	ErrorSchema extends StandardSchemaV1 | undefined = undefined,
+	Options extends EndpointOptions,
+	R,
 >(
 	path: Path,
-	options: AuthEndpointOptions<
-		Method,
-		BodySchema,
-		QuerySchema,
-		Use,
-		ReqHeaders,
-		ReqRequest,
-		Meta,
-		ErrorSchema
-	>,
-	handler: (
-		ctx: EndpointContext<
-			Path,
-			Method,
-			BodySchema,
-			QuerySchema,
-			Use,
-			ReqHeaders,
-			ReqRequest,
-			AuthContext,
-			Meta
-		>,
-	) => Promise<R>,
-): Endpoint<
-	Path,
-	NormalizeMethod<Method>,
-	ResolveBodyInput<BodySchema, Meta>,
-	ResolveQueryInput<QuerySchema, Meta>,
-	Use,
-	R,
-	ResolveMetaInput<Meta>,
-	ResolveErrorInput<ErrorSchema, Meta>
->;
+	options: Options,
+	handler: EndpointHandler<Path, Options, R>,
+): StrictEndpoint<Path, Options, R>;
 
-// Options-only (virtual/path-less) overload
 export function createAuthEndpoint<
-	const Method extends HTTPMethod | HTTPMethod[] | "*",
-	BodySchema extends object | undefined = undefined,
-	QuerySchema extends object | undefined = undefined,
-	Use extends Middleware[] = [],
-	ReqHeaders extends boolean = false,
-	ReqRequest extends boolean = false,
-	R = unknown,
-	Meta extends EndpointMetadata | undefined = undefined,
-	ErrorSchema extends StandardSchemaV1 | undefined = undefined,
->(
-	options: AuthEndpointOptions<
-		Method,
-		BodySchema,
-		QuerySchema,
-		Use,
-		ReqHeaders,
-		ReqRequest,
-		Meta,
-		ErrorSchema
-	>,
-	handler: (
-		ctx: EndpointContext<
-			string,
-			Method,
-			BodySchema,
-			QuerySchema,
-			Use,
-			ReqHeaders,
-			ReqRequest,
-			AuthContext,
-			Meta
-		>,
-	) => Promise<R>,
-): Endpoint<
-	string,
-	NormalizeMethod<Method>,
-	ResolveBodyInput<BodySchema, Meta>,
-	ResolveQueryInput<QuerySchema, Meta>,
-	Use,
+	Path extends string,
+	Options extends EndpointOptions,
 	R,
-	ResolveMetaInput<Meta>,
-	ResolveErrorInput<ErrorSchema, Meta>
->;
+>(
+	options: Options,
+	handler: EndpointHandler<Path, Options, R>,
+): StrictEndpoint<Path, Options, R>;
 
-// Implementation
-export function createAuthEndpoint(
-	pathOrOptions: any,
-	handlerOrOptions: any,
+export function createAuthEndpoint<
+	Path extends string,
+	Opts extends EndpointOptions,
+	R,
+>(
+	pathOrOptions: Path | Opts,
+	handlerOrOptions: EndpointHandler<Path, Opts, R> | Opts,
 	handlerOrNever?: any,
 ) {
-	const path: string | undefined =
+	const path: Path | undefined =
 		typeof pathOrOptions === "string" ? pathOrOptions : undefined;
-	const options: EndpointRuntimeOptions =
-		typeof handlerOrOptions === "object" ? handlerOrOptions : pathOrOptions;
-	const handler =
+	const options: Opts =
+		typeof handlerOrOptions === "object"
+			? handlerOrOptions
+			: (pathOrOptions as Opts);
+	const handler: EndpointHandler<Path, Opts, R> =
 		typeof handlerOrOptions === "function" ? handlerOrOptions : handlerOrNever;
 
 	if (path) {
@@ -188,9 +82,9 @@ export function createAuthEndpoint(
 			{
 				...options,
 				use: [...(options?.use || []), ...use],
-			} as any,
+			},
 			// todo: prettify the code, we want to call `runWithEndpointContext` to top level
-			async (ctx: any) => runWithEndpointContext(ctx, () => handler(ctx)),
+			async (ctx) => runWithEndpointContext(ctx as any, () => handler(ctx)),
 		);
 	}
 
@@ -198,19 +92,15 @@ export function createAuthEndpoint(
 		{
 			...options,
 			use: [...(options?.use || []), ...use],
-		} as any,
+		},
 		// todo: prettify the code, we want to call `runWithEndpointContext` to top level
-		async (ctx: any) => runWithEndpointContext(ctx, () => handler(ctx)),
+		async (ctx) => runWithEndpointContext(ctx as any, () => handler(ctx)),
 	);
 }
 
-export type AuthEndpoint = ReturnType<typeof createAuthEndpoint>;
-/**
- * The handler type for plugin hooks.
- *
- * Accepts both `Middleware` instances (from `createAuthMiddleware`)
- * and plain async functions for better-call v1/v2 compatibility.
- */
-export type AuthMiddleware = (
-	inputContext: Record<string, any>,
-) => Promise<unknown>;
+export type AuthEndpoint<
+	Path extends string,
+	Opts extends EndpointOptions,
+	R,
+> = ReturnType<typeof createAuthEndpoint<Path, Opts, R>>;
+export type AuthMiddleware = ReturnType<typeof createAuthMiddleware>;

package/src/context/endpoint-context.ts

@@ -5,8 +5,7 @@ import type { AuthContext } from "../types";
 import { __getBetterAuthGlobal } from "./global";
 
 export type AuthEndpointContext = Partial<
-	InputContext<string, any, any, any, any, any> &
-		EndpointContext<string, any, any, any, any, any, any, AuthContext>
+	InputContext<string, any> & EndpointContext<string, any>
 > & {
 	context: AuthContext;
 };

package/src/types/context.ts

@@ -80,7 +80,9 @@ export type BetterAuthPluginRegistryIdentifier = keyof BetterAuthPluginRegistry<
 
 export type GenericEndpointContext<
 	Options extends BetterAuthOptions = BetterAuthOptions,
-> = EndpointContext<string, any, any, any, any, any, any, AuthContext<Options>>;
+> = EndpointContext<string, any> & {
+	context: AuthContext<Options>;
+};
 
 export interface InternalAdapter<
 	_Options extends BetterAuthOptions = BetterAuthOptions,

package/src/types/plugin.ts

@@ -19,20 +19,7 @@ type DeepPartial<T> = T extends Function
 		: T;
 
 export type HookEndpointContext = Partial<
-	EndpointContext<
-		string,
-		any,
-		any,
-		any,
-		any,
-		any,
-		any,
-		AuthContext & {
-			returned?: unknown | undefined;
-			responseHeaders?: Headers | undefined;
-		}
-	> &
-		Omit<InputContext<string, any, any, any, any, any>, "method">
+	EndpointContext<string, any> & Omit<InputContext<string, any>, "method">
 > & {
 	path?: string;
 	context: AuthContext & {