@better-auth/core 1.3.28 → 1.4.0-beta.11

package/src/social-providers/kick.ts

@@ -1,9 +1,6 @@
 import { betterFetch } from "@better-fetch/fetch";
-import {
-	createAuthorizationURL,
-	validateAuthorizationCode,
-} from "@better-auth/core/oauth2";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
+import { createAuthorizationURL, validateAuthorizationCode } from "../oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
 
 export interface KickProfile {
 	/**

package/src/social-providers/line.ts

@@ -1,11 +1,11 @@
 import { betterFetch } from "@better-fetch/fetch";
 import { decodeJwt } from "jose";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
 import {
 	createAuthorizationURL,
 	refreshAccessToken,
 	validateAuthorizationCode,
-} from "@better-auth/core/oauth2";
+} from "../oauth2";
 
 export interface LineIdTokenPayload {
 	iss: string;

package/src/social-providers/linear.ts

@@ -1,10 +1,10 @@
 import { betterFetch } from "@better-fetch/fetch";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
 import {
 	createAuthorizationURL,
 	refreshAccessToken,
 	validateAuthorizationCode,
-} from "@better-auth/core/oauth2";
+} from "../oauth2";
 
 interface LinearUser {
 	id: string;

package/src/social-providers/linkedin.ts

@@ -1,10 +1,10 @@
 import { betterFetch } from "@better-fetch/fetch";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
 import {
 	createAuthorizationURL,
 	validateAuthorizationCode,
 	refreshAccessToken,
-} from "@better-auth/core/oauth2";
+} from "../oauth2";
 
 export interface LinkedInProfile {
 	sub: string;

package/src/social-providers/microsoft-entra-id.ts

@@ -2,10 +2,10 @@ import {
 	validateAuthorizationCode,
 	createAuthorizationURL,
 	refreshAccessToken,
-} from "@better-auth/core/oauth2";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
+} from "../oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
 import { betterFetch } from "@better-fetch/fetch";
-import { logger } from "@better-auth/core/env";
+import { logger } from "../env";
 import { decodeJwt } from "jose";
 import { base64 } from "@better-auth/utils/base64";
 

package/src/social-providers/naver.ts

@@ -1,10 +1,10 @@
 import { betterFetch } from "@better-fetch/fetch";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
 import {
 	createAuthorizationURL,
 	validateAuthorizationCode,
 	refreshAccessToken,
-} from "@better-auth/core/oauth2";
+} from "../oauth2";
 
 export interface NaverProfile {
 	/** API response result code */

package/src/social-providers/notion.ts

@@ -1,10 +1,10 @@
 import { betterFetch } from "@better-fetch/fetch";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
 import {
 	createAuthorizationURL,
 	refreshAccessToken,
 	validateAuthorizationCode,
-} from "@better-auth/core/oauth2";
+} from "../oauth2";
 
 export interface NotionProfile {
 	object: "user";

package/src/social-providers/paypal.ts

@@ -1,8 +1,8 @@
 import { betterFetch } from "@better-fetch/fetch";
 import { BetterAuthError } from "../error";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
-import { createAuthorizationURL } from "@better-auth/core/oauth2";
-import { logger } from "@better-auth/core/env";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
+import { createAuthorizationURL } from "../oauth2";
+import { logger } from "../env";
 import { decodeJwt } from "jose";
 import { base64 } from "@better-auth/utils/base64";
 

package/src/social-providers/reddit.ts

@@ -1,10 +1,10 @@
 import { betterFetch } from "@better-fetch/fetch";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
 import {
 	createAuthorizationURL,
 	getOAuth2Tokens,
 	refreshAccessToken,
-} from "@better-auth/core/oauth2";
+} from "../oauth2";
 import { base64 } from "@better-auth/utils/base64";
 
 export interface RedditProfile {

package/src/social-providers/roblox.ts

@@ -1,9 +1,6 @@
 import { betterFetch } from "@better-fetch/fetch";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
-import {
-	validateAuthorizationCode,
-	refreshAccessToken,
-} from "@better-auth/core/oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
+import { validateAuthorizationCode, refreshAccessToken } from "../oauth2";
 
 export interface RobloxProfile extends Record<string, any> {
 	/** the user's id */

package/src/social-providers/salesforce.ts

@@ -1,12 +1,9 @@
 import { betterFetch } from "@better-fetch/fetch";
 import { BetterAuthError } from "../error";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
-import {
-	createAuthorizationURL,
-	validateAuthorizationCode,
-} from "@better-auth/core/oauth2";
-import { logger } from "@better-auth/core/env";
-import { refreshAccessToken } from "@better-auth/core/oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
+import { createAuthorizationURL, validateAuthorizationCode } from "../oauth2";
+import { logger } from "../env";
+import { refreshAccessToken } from "../oauth2";
 
 export interface SalesforceProfile {
 	sub: string;

package/src/social-providers/slack.ts

@@ -1,9 +1,6 @@
 import { betterFetch } from "@better-fetch/fetch";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
-import {
-	validateAuthorizationCode,
-	refreshAccessToken,
-} from "@better-auth/core/oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
+import { validateAuthorizationCode, refreshAccessToken } from "../oauth2";
 
 export interface SlackProfile extends Record<string, any> {
 	ok: boolean;

package/src/social-providers/spotify.ts

@@ -1,10 +1,10 @@
 import { betterFetch } from "@better-fetch/fetch";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
 import {
 	createAuthorizationURL,
 	validateAuthorizationCode,
 	refreshAccessToken,
-} from "@better-auth/core/oauth2";
+} from "../oauth2";
 
 export interface SpotifyProfile {
 	id: string;

package/src/social-providers/tiktok.ts

@@ -1,9 +1,6 @@
 import { betterFetch } from "@better-fetch/fetch";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
-import {
-	refreshAccessToken,
-	validateAuthorizationCode,
-} from "@better-auth/core/oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
+import { refreshAccessToken, validateAuthorizationCode } from "../oauth2";
 
 /**
  * [More info](https://developers.tiktok.com/doc/tiktok-api-v2-get-user-info/)

package/src/social-providers/twitch.ts

@@ -1,10 +1,10 @@
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
-import { logger } from "@better-auth/core/env";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
+import { logger } from "../env";
 import {
 	createAuthorizationURL,
 	validateAuthorizationCode,
 	refreshAccessToken,
-} from "@better-auth/core/oauth2";
+} from "../oauth2";
 import { decodeJwt } from "jose";
 
 /**

package/src/social-providers/twitter.ts

@@ -1,10 +1,10 @@
 import { betterFetch } from "@better-fetch/fetch";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
 import {
 	createAuthorizationURL,
 	refreshAccessToken,
 	validateAuthorizationCode,
-} from "@better-auth/core/oauth2";
+} from "../oauth2";
 
 export interface TwitterProfile {
 	data: {

package/src/social-providers/vk.ts

@@ -1,13 +1,10 @@
 import { betterFetch } from "@better-fetch/fetch";
-import {
-	type OAuthProvider,
-	type ProviderOptions,
-} from "@better-auth/core/oauth2";
+import { type OAuthProvider, type ProviderOptions } from "../oauth2";
 import {
 	createAuthorizationURL,
 	validateAuthorizationCode,
 	refreshAccessToken,
-} from "@better-auth/core/oauth2";
+} from "../oauth2";
 
 export interface VkProfile {
 	user: {

package/src/social-providers/zoom.ts

@@ -1,9 +1,6 @@
 import { betterFetch } from "@better-fetch/fetch";
-import {
-	generateCodeChallenge,
-	validateAuthorizationCode,
-} from "@better-auth/core/oauth2";
-import type { OAuthProvider, ProviderOptions } from "@better-auth/core/oauth2";
+import { generateCodeChallenge, validateAuthorizationCode } from "../oauth2";
+import type { OAuthProvider, ProviderOptions } from "../oauth2";
 
 export type LoginType =
 	| 0 /** Facebook OAuth */

package/src/types/context.ts

@@ -8,9 +8,9 @@ import type {
 } from "../db";
 import type { OAuthProvider } from "../oauth2";
 import { createLogger } from "../env";
-import type { DBAdapter, DBTransactionAdapter, Where } from "../db/adapter";
+import type { DBAdapter, Where } from "../db/adapter";
 import type { BetterAuthCookies } from "./cookie";
-import type { Models } from "../db/type";
+import type { DBPreservedModels } from "../db";
 import type { LiteralUnion } from "./helper";
 import type { CookieOptions, EndpointContext } from "better-call";
 import type {
@@ -31,198 +31,119 @@ export interface InternalAdapter<
 		user: Omit<User, "id" | "createdAt" | "updatedAt">,
 		account: Omit<Account, "userId" | "id" | "createdAt" | "updatedAt"> &
 			Partial<Account>,
-		context?: GenericEndpointContext<Options>,
 	): Promise<{ user: User; account: Account }>;
 
 	createUser<T extends Record<string, any>>(
 		user: Omit<User, "id" | "createdAt" | "updatedAt" | "emailVerified"> &
 			Partial<User> &
 			Record<string, any>,
-		context?: GenericEndpointContext<Options>,
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<T & User>;
 
 	createAccount<T extends Record<string, any>>(
 		account: Omit<Account, "id" | "createdAt" | "updatedAt"> &
 			Partial<Account> &
 			T,
-		context?: GenericEndpointContext<Options>,
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<T & Account>;
 
-	listSessions(
-		userId: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<Session[]>;
+	listSessions(userId: string): Promise<Session[]>;
 
 	listUsers(
 		limit?: number,
 		offset?: number,
 		sortBy?: { field: string; direction: "asc" | "desc" },
 		where?: Where[],
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<User[]>;
 
-	countTotalUsers(
-		where?: Where[],
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<number>;
+	countTotalUsers(where?: Where[]): Promise<number>;
 
-	deleteUser(
-		userId: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<void>;
+	deleteUser(userId: string): Promise<void>;
 
 	createSession(
 		userId: string,
-		ctx: GenericEndpointContext<Options>,
 		dontRememberMe?: boolean,
 		override?: Partial<Session> & Record<string, any>,
 		overrideAll?: boolean,
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<Session>;
 
-	findSession(
-		token: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<{
+	findSession(token: string): Promise<{
 		session: Session & Record<string, any>;
 		user: User & Record<string, any>;
 	} | null>;
 
 	findSessions(
 		sessionTokens: string[],
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<{ session: Session; user: User }[]>;
 
 	updateSession(
 		sessionToken: string,
 		session: Partial<Session> & Record<string, any>,
-		context?: GenericEndpointContext<Options>,
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<Session | null>;
 
-	deleteSession(
-		token: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<void>;
+	deleteSession(token: string): Promise<void>;
 
-	deleteAccounts(
-		userId: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<void>;
+	deleteAccounts(userId: string): Promise<void>;
 
-	deleteAccount(
-		accountId: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<void>;
+	deleteAccount(accountId: string): Promise<void>;
 
-	deleteSessions(
-		userIdOrSessionTokens: string | string[],
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<void>;
+	deleteSessions(userIdOrSessionTokens: string | string[]): Promise<void>;
 
 	findOAuthUser(
 		email: string,
 		accountId: string,
 		providerId: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<{ user: User; accounts: Account[] } | null>;
 
 	findUserByEmail(
 		email: string,
 		options?: { includeAccounts: boolean },
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<{ user: User; accounts: Account[] } | null>;
 
-	findUserById(
-		userId: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<User | null>;
+	findUserById(userId: string): Promise<User | null>;
 
 	linkAccount(
 		account: Omit<Account, "id" | "createdAt" | "updatedAt"> & Partial<Account>,
-		context?: GenericEndpointContext<Options>,
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<Account>;
 
 	// fixme: any type
 	updateUser(
 		userId: string,
 		data: Partial<User> & Record<string, any>,
-		context?: GenericEndpointContext<Options>,
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<any>;
 
 	updateUserByEmail(
 		email: string,
 		data: Partial<User & Record<string, any>>,
-		context?: GenericEndpointContext<Options>,
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<User>;
 
-	updatePassword(
-		userId: string,
-		password: string,
-		context?: GenericEndpointContext<Options>,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<void>;
+	updatePassword(userId: string, password: string): Promise<void>;
 
-	findAccounts(
-		userId: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<Account[]>;
+	findAccounts(userId: string): Promise<Account[]>;
 
-	findAccount(
-		accountId: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<Account | null>;
+	findAccount(accountId: string): Promise<Account | null>;
 
 	findAccountByProviderId(
 		accountId: string,
 		providerId: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<Account | null>;
 
-	findAccountByUserId(
-		userId: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<Account[]>;
+	findAccountByUserId(userId: string): Promise<Account[]>;
 
-	updateAccount(
-		id: string,
-		data: Partial<Account>,
-		context?: GenericEndpointContext<Options>,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<Account>;
+	updateAccount(id: string, data: Partial<Account>): Promise<Account>;
 
 	createVerificationValue(
 		data: Omit<Verification, "createdAt" | "id" | "updatedAt"> &
 			Partial<Verification>,
-		context?: GenericEndpointContext<Options>,
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<Verification>;
 
-	findVerificationValue(
-		identifier: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<Verification | null>;
+	findVerificationValue(identifier: string): Promise<Verification | null>;
 
-	deleteVerificationValue(
-		id: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<void>;
+	deleteVerificationValue(id: string): Promise<void>;
 
-	deleteVerificationByIdentifier(
-		identifier: string,
-		trxAdapter?: DBTransactionAdapter<Options>,
-	): Promise<void>;
+	deleteVerificationByIdentifier(identifier: string): Promise<void>;
 
 	updateVerificationValue(
 		id: string,
 		data: Partial<Verification>,
-		context?: GenericEndpointContext<Options>,
-		trxAdapter?: DBTransactionAdapter<Options>,
 	): Promise<Verification>;
 }
 
@@ -290,7 +211,7 @@ export type AuthContext<Options extends BetterAuthOptions = BetterAuthOptions> =
 			freshAge: number;
 		};
 		generateId: (options: {
-			model: LiteralUnion<Models, string>;
+			model: LiteralUnion<DBPreservedModels, string>;
 			size?: number;
 		}) => string | false;
 		secondaryStorage: SecondaryStorage | undefined;

package/src/types/index.ts

@@ -11,7 +11,7 @@ export type {
 	GenericEndpointContext,
 	InternalAdapter,
 } from "./context";
-export type { BetterAuthPlugin } from "./plugin";
+export type { BetterAuthPlugin, HookEndpointContext } from "./plugin";
 export type {
 	BetterAuthClientPlugin,
 	BetterAuthClientOptions,

package/src/types/init-options.ts

@@ -2,7 +2,11 @@ import type { Dialect, Kysely, MysqlPool, PostgresPool } from "kysely";
 import type { Database } from "better-sqlite3";
 import type { CookieOptions } from "better-call";
 import type { LiteralUnion } from "./helper";
-import type { DBFieldAttribute, Models, SecondaryStorage } from "../db/type";
+import type {
+	DBFieldAttribute,
+	DBPreservedModels,
+	SecondaryStorage,
+} from "../db/type";
 import type { Account, RateLimit, Session, User, Verification } from "../db";
 import type { Database as BunDatabase } from "bun:sqlite";
 import type { DatabaseSync } from "node:sqlite";
@@ -10,14 +14,17 @@ import type { DBAdapterDebugLogOption, DBAdapterInstance } from "../db/adapter";
 import type { SocialProviderList, SocialProviders } from "../social-providers";
 import type { Logger } from "../env";
 import type { AuthContext, GenericEndpointContext } from "./context";
-import type { AuthMiddleware } from "../middleware";
-import type { BetterAuthPlugin } from "@better-auth/core";
+import type { AuthMiddleware } from "../api";
+import type { BetterAuthPlugin } from "..";
 
 type KyselyDatabaseType = "postgres" | "mysql" | "sqlite" | "mssql";
 type OmitId<T extends { id: unknown }> = Omit<T, "id">;
+type Optional<T> = {
+	[P in keyof T]?: T[P] | undefined;
+};
 
 export type GenerateIdFn = (options: {
-	model: LiteralUnion<Models, string>;
+	model: LiteralUnion<DBPreservedModels, string>;
 	size?: number;
 }) => string | false;
 
@@ -210,15 +217,6 @@ export type BetterAuthAdvancedOptions = {
 		 */
 		generateId?: GenerateIdFn | false;
 	};
-	/**
-	 * Custom generateId function.
-	 *
-	 * If not provided, random ids will be generated.
-	 * If set to false, the database's auto generated id will be used.
-	 *
-	 * @deprecated Please use `database.generateId` instead. This will be potentially removed in future releases.
-	 */
-	generateId?: GenerateIdFn | false;
 };
 
 export type BetterAuthOptions = {
@@ -799,7 +797,7 @@ export type BetterAuthOptions = {
 		/**
 		 * @deprecated Please use `database.generateId` instead.
 		 */
-		generateId?: GenerateIdFn | false;
+		generateId?: never;
 	};
 	logger?: Logger;
 	/**
@@ -825,7 +823,7 @@ export type BetterAuthOptions = {
 					| boolean
 					| void
 					| {
-							data: Partial<User> & Record<string, any>;
+							data: Optional<User> & Record<string, any>;
 					  }
 				>;
 				/**
@@ -849,7 +847,7 @@ export type BetterAuthOptions = {
 					| boolean
 					| void
 					| {
-							data: Partial<User & Record<string, any>>;
+							data: Optional<User & Record<string, any>>;
 					  }
 				>;
 				/**
@@ -895,7 +893,7 @@ export type BetterAuthOptions = {
 					| boolean
 					| void
 					| {
-							data: Partial<Session> & Record<string, any>;
+							data: Optional<Session> & Record<string, any>;
 					  }
 				>;
 				/**
@@ -922,7 +920,7 @@ export type BetterAuthOptions = {
 					| boolean
 					| void
 					| {
-							data: Partial<Session & Record<string, any>>;
+							data: Optional<Session & Record<string, any>>;
 					  }
 				>;
 				/**
@@ -968,7 +966,7 @@ export type BetterAuthOptions = {
 					| boolean
 					| void
 					| {
-							data: Partial<Account> & Record<string, any>;
+							data: Optional<Account> & Record<string, any>;
 					  }
 				>;
 				/**
@@ -995,7 +993,7 @@ export type BetterAuthOptions = {
 					| boolean
 					| void
 					| {
-							data: Partial<Account & Record<string, any>>;
+							data: Optional<Account & Record<string, any>>;
 					  }
 				>;
 				/**
@@ -1041,7 +1039,7 @@ export type BetterAuthOptions = {
 					| boolean
 					| void
 					| {
-							data: Partial<Verification> & Record<string, any>;
+							data: Optional<Verification> & Record<string, any>;
 					  }
 				>;
 				/**
@@ -1065,7 +1063,7 @@ export type BetterAuthOptions = {
 					| boolean
 					| void
 					| {
-							data: Partial<Verification & Record<string, any>>;
+							data: Optional<Verification & Record<string, any>>;
 					  }
 				>;
 				/**

package/src/types/plugin.ts

@@ -9,7 +9,7 @@ import type {
 import type { BetterAuthPluginDBSchema } from "../db";
 import type { LiteralString } from "./helper";
 import type { BetterAuthOptions } from "./init-options";
-import type { AuthMiddleware } from "../middleware";
+import type { AuthMiddleware } from "../api";
 
 type Awaitable<T> = T | Promise<T>;
 type DeepPartial<T> = T extends Function
@@ -18,13 +18,13 @@ type DeepPartial<T> = T extends Function
 		? { [K in keyof T]?: DeepPartial<T[K]> }
 		: T;
 
-type HookEndpointContext = EndpointContext<string, any> &
+export type HookEndpointContext = EndpointContext<string, any> &
 	Omit<InputContext<string, any>, "method"> & {
 		context: AuthContext & {
 			returned?: unknown;
 			responseHeaders?: Headers;
 		};
-		headers?: Headers;
+		headers?: Headers | undefined;
 	};
 
 export type BetterAuthPlugin = {