better-auth 1.7.12 → 1.7.14

package/dist/plugins/two-factor/totp/index.mjs

@@ -9,7 +9,18 @@ import { APIError, BASE_ERROR_CODES } from "@better-auth/core/error";
 import { createAuthEndpoint } from "@better-auth/core/api";
 import * as z from "zod";
 import { createOTP } from "@better-auth/utils/otp";
+import { base32 } from "@better-auth/utils/base32";
 //#region src/plugins/two-factor/totp/index.ts
+const BASE32_PREFIX = "base32:";
+/**
+* Secrets imported from other providers are stored as `base32:<secret>`.
+* Generated secrets never contain `:`, so they are used as-is.
+*/
+async function decryptTOTPSecret(options) {
+	const secret = await symmetricDecrypt(options);
+	if (!secret.startsWith(BASE32_PREFIX)) return secret;
+	return base32.decode(secret.slice(7).toUpperCase());
+}
 const generateTOTPBodySchema = z.object({ secret: z.string().meta({ description: "The secret to generate the TOTP code" }) });
 const verifyTOTPBodySchema = z.object({
 	code: z.string().meta({ description: "The otp code to verify. Eg: \"012345\"" }),
@@ -29,6 +40,156 @@ const totp2fa = (options) => {
 	const passwordSchema = z.string().meta({ description: "User password" });
 	const getTOTPURIBodySchema = options?.allowPasswordless ? z.object({ password: passwordSchema.optional() }) : z.object({ password: passwordSchema });
 	const twoFactorTable = "twoFactor";
+	const generateTOTP = createAuthEndpoint.serverOnly({
+		method: "POST",
+		body: generateTOTPBodySchema,
+		metadata: { openapi: {
+			summary: "Generate TOTP code",
+			description: "Use this endpoint to generate a TOTP code",
+			responses: { 200: {
+				description: "Successful response",
+				content: { "application/json": { schema: {
+					type: "object",
+					properties: { code: { type: "string" } }
+				} } }
+			} }
+		} }
+	}, async (ctx) => {
+		if (options?.disable) {
+			ctx.context.logger.error("totp isn't configured. please pass totp option on two factor plugin to enable totp");
+			throw APIError.from("BAD_REQUEST", {
+				message: "totp isn't configured",
+				code: "TOTP_NOT_CONFIGURED"
+			});
+		}
+		return { code: await createOTP(ctx.body.secret, {
+			period: opts.period,
+			digits: opts.digits
+		}).totp() };
+	});
+	const getTOTPURI = createAuthEndpoint("/two-factor/get-totp-uri", {
+		method: "POST",
+		use: [sessionMiddleware],
+		body: getTOTPURIBodySchema,
+		metadata: { openapi: {
+			summary: "Get TOTP URI",
+			description: "Use this endpoint to get the TOTP URI",
+			responses: { 200: {
+				description: "Successful response",
+				content: { "application/json": { schema: {
+					type: "object",
+					properties: { totpURI: { type: "string" } }
+				} } }
+			} }
+		} }
+	}, async (ctx) => {
+		if (options?.disable) {
+			ctx.context.logger.error("totp isn't configured. please pass totp option on two factor plugin to enable totp");
+			throw APIError.from("BAD_REQUEST", {
+				message: "totp isn't configured",
+				code: "TOTP_NOT_CONFIGURED"
+			});
+		}
+		const user = ctx.context.session.user;
+		const twoFactor = await ctx.context.adapter.findOne({
+			model: twoFactorTable,
+			where: [{
+				field: "userId",
+				value: user.id
+			}]
+		});
+		if (!twoFactor) throw APIError.from("BAD_REQUEST", TWO_FACTOR_ERROR_CODES.TOTP_NOT_ENABLED);
+		const secret = await decryptTOTPSecret({
+			key: ctx.context.secretConfig,
+			data: twoFactor.secret
+		});
+		if (await shouldRequirePassword(ctx, user.id, options?.allowPasswordless)) {
+			if (!ctx.body.password) throw APIError.from("BAD_REQUEST", BASE_ERROR_CODES.INVALID_PASSWORD);
+			await ctx.context.password.checkPassword(user.id, ctx);
+		}
+		return { totpURI: createOTP(secret, {
+			digits: opts.digits,
+			period: opts.period
+		}).url(options?.issuer || ctx.context.appName, user.email) };
+	});
+	const verifyTOTP = createAuthEndpoint("/two-factor/verify-totp", {
+		method: "POST",
+		body: verifyTOTPBodySchema,
+		metadata: { openapi: {
+			summary: "Verify two factor TOTP",
+			description: "Verify two factor TOTP",
+			responses: { 200: {
+				description: "Successful response",
+				content: { "application/json": { schema: {
+					type: "object",
+					properties: { status: { type: "boolean" } }
+				} } }
+			} }
+		} }
+	}, async (ctx) => {
+		if (options?.disable) {
+			ctx.context.logger.error("totp isn't configured. please pass totp option on two factor plugin to enable totp");
+			throw APIError.from("BAD_REQUEST", {
+				message: "totp isn't configured",
+				code: "TOTP_NOT_CONFIGURED"
+			});
+		}
+		const { session, valid, invalid, beginAttempt } = await verifyTwoFactor(ctx);
+		const user = session.user;
+		const isSignIn = !session.session;
+		const twoFactor = await ctx.context.adapter.findOne({
+			model: twoFactorTable,
+			where: [{
+				field: "userId",
+				value: user.id
+			}]
+		});
+		if (!twoFactor) throw APIError.from("BAD_REQUEST", TWO_FACTOR_ERROR_CODES.TOTP_NOT_ENABLED);
+		if (isSignIn && twoFactor.verified === false) throw APIError.from("BAD_REQUEST", TWO_FACTOR_ERROR_CODES.TOTP_NOT_ENABLED);
+		if (isSignIn) await assertTwoFactorNotLocked(ctx, twoFactorTable, twoFactor);
+		const attempt = isSignIn ? await beginAttempt(5) : null;
+		let status;
+		try {
+			const decrypted = await decryptTOTPSecret({
+				key: ctx.context.secretConfig,
+				data: twoFactor.secret
+			});
+			status = await createOTP(decrypted, {
+				period: opts.period,
+				digits: opts.digits
+			}).verify(ctx.body.code);
+		} catch (error) {
+			await attempt?.restore();
+			throw error;
+		}
+		if (!status) {
+			await attempt?.recordFailure();
+			if (isSignIn) await recordTwoFactorFailure(ctx, twoFactorTable, twoFactor);
+			return invalid("INVALID_CODE");
+		}
+		if (isSignIn) await resetTwoFactorFailures(ctx, twoFactorTable, twoFactor);
+		if (twoFactor.verified !== true) {
+			if (!user.twoFactorEnabled) {
+				const activeSession = session.session;
+				const updatedUser = await ctx.context.internalAdapter.updateUser(user.id, { twoFactorEnabled: true });
+				const newSession = await ctx.context.internalAdapter.createSession(user.id, false, activeSession);
+				await setSessionCookie(ctx, {
+					session: newSession,
+					user: updatedUser
+				});
+				await ctx.context.internalAdapter.deleteSession(activeSession.token);
+			}
+			await ctx.context.adapter.update({
+				model: twoFactorTable,
+				update: { verified: true },
+				where: [{
+					field: "id",
+					value: twoFactor.id
+				}]
+			});
+		}
+		return valid(ctx);
+	});
 	return {
 		id: "totp",
 		version: PACKAGE_VERSION,
@@ -45,33 +206,7 @@ const totp2fa = (options) => {
 			*
 			* @see [Read our docs to learn more.](https://better-auth.com/docs/plugins/2fa#totp)
 			*/
-			generateTOTP: createAuthEndpoint.serverOnly({
-				method: "POST",
-				body: generateTOTPBodySchema,
-				metadata: { openapi: {
-					summary: "Generate TOTP code",
-					description: "Use this endpoint to generate a TOTP code",
-					responses: { 200: {
-						description: "Successful response",
-						content: { "application/json": { schema: {
-							type: "object",
-							properties: { code: { type: "string" } }
-						} } }
-					} }
-				} }
-			}, async (ctx) => {
-				if (options?.disable) {
-					ctx.context.logger.error("totp isn't configured. please pass totp option on two factor plugin to enable totp");
-					throw APIError.from("BAD_REQUEST", {
-						message: "totp isn't configured",
-						code: "TOTP_NOT_CONFIGURED"
-					});
-				}
-				return { code: await createOTP(ctx.body.secret, {
-					period: opts.period,
-					digits: opts.digits
-				}).totp() };
-			}),
+			generateTOTP,
 			/**
 			* ### Endpoint
 			*
@@ -87,51 +222,7 @@ const totp2fa = (options) => {
 			*
 			* @see [Read our docs to learn more.](https://better-auth.com/docs/plugins/2fa#getting-totp-uri)
 			*/
-			getTOTPURI: createAuthEndpoint("/two-factor/get-totp-uri", {
-				method: "POST",
-				use: [sessionMiddleware],
-				body: getTOTPURIBodySchema,
-				metadata: { openapi: {
-					summary: "Get TOTP URI",
-					description: "Use this endpoint to get the TOTP URI",
-					responses: { 200: {
-						description: "Successful response",
-						content: { "application/json": { schema: {
-							type: "object",
-							properties: { totpURI: { type: "string" } }
-						} } }
-					} }
-				} }
-			}, async (ctx) => {
-				if (options?.disable) {
-					ctx.context.logger.error("totp isn't configured. please pass totp option on two factor plugin to enable totp");
-					throw APIError.from("BAD_REQUEST", {
-						message: "totp isn't configured",
-						code: "TOTP_NOT_CONFIGURED"
-					});
-				}
-				const user = ctx.context.session.user;
-				const twoFactor = await ctx.context.adapter.findOne({
-					model: twoFactorTable,
-					where: [{
-						field: "userId",
-						value: user.id
-					}]
-				});
-				if (!twoFactor) throw APIError.from("BAD_REQUEST", TWO_FACTOR_ERROR_CODES.TOTP_NOT_ENABLED);
-				const secret = await symmetricDecrypt({
-					key: ctx.context.secretConfig,
-					data: twoFactor.secret
-				});
-				if (await shouldRequirePassword(ctx, user.id, options?.allowPasswordless)) {
-					if (!ctx.body.password) throw APIError.from("BAD_REQUEST", BASE_ERROR_CODES.INVALID_PASSWORD);
-					await ctx.context.password.checkPassword(user.id, ctx);
-				}
-				return { totpURI: createOTP(secret, {
-					digits: opts.digits,
-					period: opts.period
-				}).url(options?.issuer || ctx.context.appName, user.email) };
-			}),
+			getTOTPURI,
 			/**
 			* ### Endpoint
 			*
@@ -147,82 +238,7 @@ const totp2fa = (options) => {
 			*
 			* @see [Read our docs to learn more.](https://better-auth.com/docs/plugins/2fa#verifying-totp)
 			*/
-			verifyTOTP: createAuthEndpoint("/two-factor/verify-totp", {
-				method: "POST",
-				body: verifyTOTPBodySchema,
-				metadata: { openapi: {
-					summary: "Verify two factor TOTP",
-					description: "Verify two factor TOTP",
-					responses: { 200: {
-						description: "Successful response",
-						content: { "application/json": { schema: {
-							type: "object",
-							properties: { status: { type: "boolean" } }
-						} } }
-					} }
-				} }
-			}, async (ctx) => {
-				if (options?.disable) {
-					ctx.context.logger.error("totp isn't configured. please pass totp option on two factor plugin to enable totp");
-					throw APIError.from("BAD_REQUEST", {
-						message: "totp isn't configured",
-						code: "TOTP_NOT_CONFIGURED"
-					});
-				}
-				const { session, valid, invalid, beginAttempt } = await verifyTwoFactor(ctx);
-				const user = session.user;
-				const isSignIn = !session.session;
-				const twoFactor = await ctx.context.adapter.findOne({
-					model: twoFactorTable,
-					where: [{
-						field: "userId",
-						value: user.id
-					}]
-				});
-				if (!twoFactor) throw APIError.from("BAD_REQUEST", TWO_FACTOR_ERROR_CODES.TOTP_NOT_ENABLED);
-				if (isSignIn && twoFactor.verified === false) throw APIError.from("BAD_REQUEST", TWO_FACTOR_ERROR_CODES.TOTP_NOT_ENABLED);
-				if (isSignIn) await assertTwoFactorNotLocked(ctx, twoFactorTable, twoFactor);
-				const attempt = isSignIn ? await beginAttempt(5) : null;
-				let status;
-				try {
-					status = await createOTP(await symmetricDecrypt({
-						key: ctx.context.secretConfig,
-						data: twoFactor.secret
-					}), {
-						period: opts.period,
-						digits: opts.digits
-					}).verify(ctx.body.code);
-				} catch (error) {
-					await attempt?.restore();
-					throw error;
-				}
-				if (!status) {
-					await attempt?.recordFailure();
-					if (isSignIn) await recordTwoFactorFailure(ctx, twoFactorTable, twoFactor);
-					return invalid("INVALID_CODE");
-				}
-				if (isSignIn) await resetTwoFactorFailures(ctx, twoFactorTable, twoFactor);
-				if (twoFactor.verified !== true) {
-					if (!user.twoFactorEnabled) {
-						const activeSession = session.session;
-						const updatedUser = await ctx.context.internalAdapter.updateUser(user.id, { twoFactorEnabled: true });
-						await setSessionCookie(ctx, {
-							session: await ctx.context.internalAdapter.createSession(user.id, false, activeSession),
-							user: updatedUser
-						});
-						await ctx.context.internalAdapter.deleteSession(activeSession.token);
-					}
-					await ctx.context.adapter.update({
-						model: twoFactorTable,
-						update: { verified: true },
-						where: [{
-							field: "id",
-							value: twoFactor.id
-						}]
-					});
-				}
-				return valid(ctx);
-			})
+			verifyTOTP
 		}
 	};
 };

package/dist/plugins/two-factor/types.d.mts

@@ -1,13 +1,13 @@
 import { User } from "../../types/models.mjs";
 import { InferOptionSchema } from "../../types/plugins.mjs";
+import "../../types/index.mjs";
 import { BackupCodeOptions } from "./backup-codes/index.mjs";
 import { OTPOptions } from "./otp/index.mjs";
 import { schema } from "./schema.mjs";
 import { TOTPOptions } from "./totp/index.mjs";
 import { BetterAuthPlugin, LiteralString } from "@better-auth/core";
-
 //#region src/plugins/two-factor/types.d.ts
-interface TwoFactorOptions {
+export interface TwoFactorOptions {
   /**
    * Application Name
    */
@@ -87,18 +87,18 @@ interface TwoFactorOptions {
     durationSeconds?: number | undefined;
   } | undefined;
 }
-interface UserWithTwoFactor extends User {
+export interface UserWithTwoFactor extends User {
   /**
    * If the user has enabled two factor authentication.
    */
   twoFactorEnabled: boolean;
 }
-interface TwoFactorProvider {
+export interface TwoFactorProvider {
   id: LiteralString;
   version?: string | undefined;
   endpoints?: BetterAuthPlugin["endpoints"] | undefined;
 }
-interface TwoFactorTable {
+export interface TwoFactorTable {
   id: string;
   userId: string;
   secret: string;
@@ -107,5 +107,4 @@ interface TwoFactorTable {
   failedVerificationCount?: number;
   lockedUntil?: Date | null;
 }
-//#endregion
-export { TwoFactorOptions, TwoFactorProvider, TwoFactorTable, UserWithTwoFactor };
+//#endregion

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

@@ -1,9 +1,7 @@
 import { USERNAME_ERROR_CODES } from "./error-codes.mjs";
 import { UsernamePlugin, UsernamePluginWithoutDisplayUsername } from "./index.mjs";
-import * as _$_better_auth_core_utils_error_codes0 from "@better-auth/core/utils/error-codes";
-
 //#region src/plugins/username/client.d.ts
-type UsernameClientOptions = {
+export type UsernameClientOptions = {
   /**
    * Whether the server has the `displayUsername` field enabled.
    *
@@ -14,7 +12,7 @@ type UsernameClientOptions = {
    */
   displayUsername?: boolean | undefined;
 };
-declare const usernameClient: <O extends UsernameClientOptions = UsernameClientOptions>(options?: O) => {
+export declare const usernameClient: <O extends UsernameClientOptions = UsernameClientOptions>(options?: O) => {
   id: "username";
   version: string;
   $InferServerPlugin: O["displayUsername"] extends false ? UsernamePluginWithoutDisplayUsername : UsernamePlugin;
@@ -23,16 +21,16 @@ declare const usernameClient: <O extends UsernameClientOptions = UsernameClientO
     signal: "$sessionSignal";
   }[];
   $ERROR_CODES: {
-    EMAIL_NOT_VERIFIED: _$_better_auth_core_utils_error_codes0.RawError<"EMAIL_NOT_VERIFIED">;
-    UNEXPECTED_ERROR: _$_better_auth_core_utils_error_codes0.RawError<"UNEXPECTED_ERROR">;
-    INVALID_USERNAME_OR_PASSWORD: _$_better_auth_core_utils_error_codes0.RawError<"INVALID_USERNAME_OR_PASSWORD">;
-    USERNAME_IS_ALREADY_TAKEN: _$_better_auth_core_utils_error_codes0.RawError<"USERNAME_IS_ALREADY_TAKEN">;
-    USERNAME_TOO_SHORT: _$_better_auth_core_utils_error_codes0.RawError<"USERNAME_TOO_SHORT">;
-    USERNAME_TOO_LONG: _$_better_auth_core_utils_error_codes0.RawError<"USERNAME_TOO_LONG">;
-    INVALID_USERNAME: _$_better_auth_core_utils_error_codes0.RawError<"INVALID_USERNAME">;
-    INVALID_DISPLAY_USERNAME: _$_better_auth_core_utils_error_codes0.RawError<"INVALID_DISPLAY_USERNAME">;
-    USERNAME_IS_IMMUTABLE: _$_better_auth_core_utils_error_codes0.RawError<"USERNAME_IS_IMMUTABLE">;
+    EMAIL_NOT_VERIFIED: import("@better-auth/core/utils/error-codes").RawError<"EMAIL_NOT_VERIFIED">;
+    UNEXPECTED_ERROR: import("@better-auth/core/utils/error-codes").RawError<"UNEXPECTED_ERROR">;
+    INVALID_USERNAME_OR_PASSWORD: import("@better-auth/core/utils/error-codes").RawError<"INVALID_USERNAME_OR_PASSWORD">;
+    USERNAME_IS_ALREADY_TAKEN: import("@better-auth/core/utils/error-codes").RawError<"USERNAME_IS_ALREADY_TAKEN">;
+    USERNAME_TOO_SHORT: import("@better-auth/core/utils/error-codes").RawError<"USERNAME_TOO_SHORT">;
+    USERNAME_TOO_LONG: import("@better-auth/core/utils/error-codes").RawError<"USERNAME_TOO_LONG">;
+    INVALID_USERNAME: import("@better-auth/core/utils/error-codes").RawError<"INVALID_USERNAME">;
+    INVALID_DISPLAY_USERNAME: import("@better-auth/core/utils/error-codes").RawError<"INVALID_DISPLAY_USERNAME">;
+    USERNAME_IS_IMMUTABLE: import("@better-auth/core/utils/error-codes").RawError<"USERNAME_IS_IMMUTABLE">;
   };
 };
 //#endregion
-export { UsernameClientOptions, usernameClient };
+export { USERNAME_ERROR_CODES };

package/dist/plugins/username/client.mjs

@@ -14,4 +14,4 @@ const usernameClient = (options) => {
 	};
 };
 //#endregion
-export { usernameClient };
+export { USERNAME_ERROR_CODES, usernameClient };

package/dist/plugins/username/error-codes.d.mts

@@ -1,16 +1,13 @@
-import * as _$_better_auth_core_utils_error_codes0 from "@better-auth/core/utils/error-codes";
-
 //#region src/plugins/username/error-codes.d.ts
-declare const USERNAME_ERROR_CODES: {
-  EMAIL_NOT_VERIFIED: _$_better_auth_core_utils_error_codes0.RawError<"EMAIL_NOT_VERIFIED">;
-  UNEXPECTED_ERROR: _$_better_auth_core_utils_error_codes0.RawError<"UNEXPECTED_ERROR">;
-  INVALID_USERNAME_OR_PASSWORD: _$_better_auth_core_utils_error_codes0.RawError<"INVALID_USERNAME_OR_PASSWORD">;
-  USERNAME_IS_ALREADY_TAKEN: _$_better_auth_core_utils_error_codes0.RawError<"USERNAME_IS_ALREADY_TAKEN">;
-  USERNAME_TOO_SHORT: _$_better_auth_core_utils_error_codes0.RawError<"USERNAME_TOO_SHORT">;
-  USERNAME_TOO_LONG: _$_better_auth_core_utils_error_codes0.RawError<"USERNAME_TOO_LONG">;
-  INVALID_USERNAME: _$_better_auth_core_utils_error_codes0.RawError<"INVALID_USERNAME">;
-  INVALID_DISPLAY_USERNAME: _$_better_auth_core_utils_error_codes0.RawError<"INVALID_DISPLAY_USERNAME">;
-  USERNAME_IS_IMMUTABLE: _$_better_auth_core_utils_error_codes0.RawError<"USERNAME_IS_IMMUTABLE">;
+export declare const USERNAME_ERROR_CODES: {
+  EMAIL_NOT_VERIFIED: import("@better-auth/core/utils/error-codes").RawError<"EMAIL_NOT_VERIFIED">;
+  UNEXPECTED_ERROR: import("@better-auth/core/utils/error-codes").RawError<"UNEXPECTED_ERROR">;
+  INVALID_USERNAME_OR_PASSWORD: import("@better-auth/core/utils/error-codes").RawError<"INVALID_USERNAME_OR_PASSWORD">;
+  USERNAME_IS_ALREADY_TAKEN: import("@better-auth/core/utils/error-codes").RawError<"USERNAME_IS_ALREADY_TAKEN">;
+  USERNAME_TOO_SHORT: import("@better-auth/core/utils/error-codes").RawError<"USERNAME_TOO_SHORT">;
+  USERNAME_TOO_LONG: import("@better-auth/core/utils/error-codes").RawError<"USERNAME_TOO_LONG">;
+  INVALID_USERNAME: import("@better-auth/core/utils/error-codes").RawError<"INVALID_USERNAME">;
+  INVALID_DISPLAY_USERNAME: import("@better-auth/core/utils/error-codes").RawError<"INVALID_DISPLAY_USERNAME">;
+  USERNAME_IS_IMMUTABLE: import("@better-auth/core/utils/error-codes").RawError<"USERNAME_IS_IMMUTABLE">;
 };
-//#endregion
-export { USERNAME_ERROR_CODES };
+//#endregion

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

@@ -1,12 +1,7 @@
 import { InferOptionSchema } from "../../types/plugins.mjs";
 import { UsernameSchema } from "./schema.mjs";
 import { USERNAME_ERROR_CODES } from "./error-codes.mjs";
-import * as _$_better_auth_core0 from "@better-auth/core";
-import * as _$_better_auth_core_db0 from "@better-auth/core/db";
-import * as _$_better_auth_core_utils_error_codes0 from "@better-auth/core/utils/error-codes";
-import * as _$better_call0 from "better-call";
 import * as z from "zod";
-
 //#region src/plugins/username/index.d.ts
 declare module "@better-auth/core" {
   interface BetterAuthPluginRegistry<AuthOptions, Options> {
@@ -15,7 +10,7 @@ declare module "@better-auth/core" {
     };
   }
 }
-type UsernameOptions = {
+export type UsernameOptions = {
   schema?: InferOptionSchema<UsernameSchema> | undefined;
   /**
    * The minimum length of the username
@@ -93,7 +88,7 @@ type UsernameOptions = {
 declare const usernameImpl: <IncludeDisplayUsername extends boolean>(options: UsernameOptions | undefined, includeDisplayUsername: IncludeDisplayUsername) => {
   id: "username";
   version: string;
-  init(ctx: _$_better_auth_core0.AuthContext): {
+  init(ctx: import("@better-auth/core").AuthContext): {
     options: {
       databaseHooks: {
         user: {
@@ -106,7 +101,7 @@ declare const usernameImpl: <IncludeDisplayUsername extends boolean>(options: Us
               emailVerified: boolean;
               name: string;
               image?: string | null | undefined;
-            } & Record<string, unknown>, context: _$_better_auth_core0.GenericEndpointContext | null): Promise<{
+            } & Record<string, unknown>, context: import("@better-auth/core").GenericEndpointContext | null): Promise<{
               data: {
                 displayUsername?: string | undefined;
                 username: string;
@@ -140,7 +135,7 @@ declare const usernameImpl: <IncludeDisplayUsername extends boolean>(options: Us
               emailVerified: boolean;
               name: string;
               image?: string | null | undefined;
-            }> & Record<string, unknown>, context: _$_better_auth_core0.GenericEndpointContext | null): Promise<{
+            }> & Record<string, unknown>, context: import("@better-auth/core").GenericEndpointContext | null): Promise<{
               data: {
                 displayUsername?: string | undefined;
                 username: string;
@@ -170,7 +165,7 @@ declare const usernameImpl: <IncludeDisplayUsername extends boolean>(options: Us
     };
   };
   endpoints: {
-    signInUsername: _$better_call0.StrictEndpoint<"/sign-in/username", {
+    signInUsername: import("better-call").StrictEndpoint<"/sign-in/username", {
       method: "POST";
       body: z.ZodObject<{
         username: z.ZodString;
@@ -247,7 +242,7 @@ declare const usernameImpl: <IncludeDisplayUsername extends boolean>(options: Us
         displayUsername: string;
       };
     }>;
-    isUsernameAvailable: _$better_call0.StrictEndpoint<"/is-username-available", {
+    isUsernameAvailable: import("better-call").StrictEndpoint<"/is-username-available", {
       method: "POST";
       body: z.ZodObject<{
         username: z.ZodString;
@@ -266,14 +261,14 @@ declare const usernameImpl: <IncludeDisplayUsername extends boolean>(options: Us
           unique: true;
           returned: true;
           transform: {
-            input(value: _$_better_auth_core_db0.DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
+            input(value: import("@better-auth/core/db").DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
           };
         };
         displayUsername: {
           type: "string";
           required: false;
           transform: {
-            input(value: _$_better_auth_core_db0.DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
+            input(value: import("@better-auth/core/db").DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
           };
         };
       }, "username"> : {
@@ -284,14 +279,14 @@ declare const usernameImpl: <IncludeDisplayUsername extends boolean>(options: Us
           unique: true;
           returned: true;
           transform: {
-            input(value: _$_better_auth_core_db0.DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
+            input(value: import("@better-auth/core/db").DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
           };
         };
         displayUsername: {
           type: "string";
           required: false;
           transform: {
-            input(value: _$_better_auth_core_db0.DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
+            input(value: import("@better-auth/core/db").DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
           };
         };
       };
@@ -299,28 +294,28 @@ declare const usernameImpl: <IncludeDisplayUsername extends boolean>(options: Us
   };
   hooks: {
     before: {
-      matcher(context: _$_better_auth_core0.HookEndpointContext): boolean;
-      handler: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<void>>;
+      matcher(context: import("@better-auth/core").HookEndpointContext): boolean;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
   };
   options: UsernameOptions | undefined;
   $ERROR_CODES: {
-    EMAIL_NOT_VERIFIED: _$_better_auth_core_utils_error_codes0.RawError<"EMAIL_NOT_VERIFIED">;
-    UNEXPECTED_ERROR: _$_better_auth_core_utils_error_codes0.RawError<"UNEXPECTED_ERROR">;
-    INVALID_USERNAME_OR_PASSWORD: _$_better_auth_core_utils_error_codes0.RawError<"INVALID_USERNAME_OR_PASSWORD">;
-    USERNAME_IS_ALREADY_TAKEN: _$_better_auth_core_utils_error_codes0.RawError<"USERNAME_IS_ALREADY_TAKEN">;
-    USERNAME_TOO_SHORT: _$_better_auth_core_utils_error_codes0.RawError<"USERNAME_TOO_SHORT">;
-    USERNAME_TOO_LONG: _$_better_auth_core_utils_error_codes0.RawError<"USERNAME_TOO_LONG">;
-    INVALID_USERNAME: _$_better_auth_core_utils_error_codes0.RawError<"INVALID_USERNAME">;
-    INVALID_DISPLAY_USERNAME: _$_better_auth_core_utils_error_codes0.RawError<"INVALID_DISPLAY_USERNAME">;
-    USERNAME_IS_IMMUTABLE: _$_better_auth_core_utils_error_codes0.RawError<"USERNAME_IS_IMMUTABLE">;
+    EMAIL_NOT_VERIFIED: import("@better-auth/core/utils/error-codes").RawError<"EMAIL_NOT_VERIFIED">;
+    UNEXPECTED_ERROR: import("@better-auth/core/utils/error-codes").RawError<"UNEXPECTED_ERROR">;
+    INVALID_USERNAME_OR_PASSWORD: import("@better-auth/core/utils/error-codes").RawError<"INVALID_USERNAME_OR_PASSWORD">;
+    USERNAME_IS_ALREADY_TAKEN: import("@better-auth/core/utils/error-codes").RawError<"USERNAME_IS_ALREADY_TAKEN">;
+    USERNAME_TOO_SHORT: import("@better-auth/core/utils/error-codes").RawError<"USERNAME_TOO_SHORT">;
+    USERNAME_TOO_LONG: import("@better-auth/core/utils/error-codes").RawError<"USERNAME_TOO_LONG">;
+    INVALID_USERNAME: import("@better-auth/core/utils/error-codes").RawError<"INVALID_USERNAME">;
+    INVALID_DISPLAY_USERNAME: import("@better-auth/core/utils/error-codes").RawError<"INVALID_DISPLAY_USERNAME">;
+    USERNAME_IS_IMMUTABLE: import("@better-auth/core/utils/error-codes").RawError<"USERNAME_IS_IMMUTABLE">;
   };
 };
-type UsernamePlugin = ReturnType<typeof usernameImpl<true>>;
-type UsernamePluginWithoutDisplayUsername = ReturnType<typeof usernameImpl<false>>;
-declare function username(options: UsernameOptions & {
+export type UsernamePlugin = ReturnType<typeof usernameImpl<true>>;
+export type UsernamePluginWithoutDisplayUsername = ReturnType<typeof usernameImpl<false>>;
+export declare function username(options: UsernameOptions & {
   displayUsername: false;
 }): UsernamePluginWithoutDisplayUsername;
-declare function username(options?: UsernameOptions): UsernamePlugin;
+export declare function username(options?: UsernameOptions): UsernamePlugin;
 //#endregion
-export { USERNAME_ERROR_CODES, UsernameOptions, UsernamePlugin, UsernamePluginWithoutDisplayUsername, username };
+export { USERNAME_ERROR_CODES };

package/dist/plugins/username/schema.d.mts

@@ -1,7 +1,5 @@
-import * as _$_better_auth_core_db0 from "@better-auth/core/db";
-
 //#region src/plugins/username/schema.d.ts
-declare const getSchema: <IncludeDisplayUsername extends boolean = true>(normalizer: {
+export declare const getSchema: <IncludeDisplayUsername extends boolean = true>(normalizer: {
   username: (username: string) => string;
   displayUsername: (displayUsername: string) => string;
 }, includeDisplayUsername?: IncludeDisplayUsername) => {
@@ -14,14 +12,14 @@ declare const getSchema: <IncludeDisplayUsername extends boolean = true>(normali
         unique: true;
         returned: true;
         transform: {
-          input(value: _$_better_auth_core_db0.DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
+          input(value: import("@better-auth/core/db").DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
         };
       };
       displayUsername: {
         type: "string";
         required: false;
         transform: {
-          input(value: _$_better_auth_core_db0.DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
+          input(value: import("@better-auth/core/db").DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
         };
       };
     }, "username"> : {
@@ -32,19 +30,18 @@ declare const getSchema: <IncludeDisplayUsername extends boolean = true>(normali
         unique: true;
         returned: true;
         transform: {
-          input(value: _$_better_auth_core_db0.DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
+          input(value: import("@better-auth/core/db").DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
         };
       };
       displayUsername: {
         type: "string";
         required: false;
         transform: {
-          input(value: _$_better_auth_core_db0.DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
+          input(value: import("@better-auth/core/db").DBPrimitive): string | number | boolean | Date | unknown[] | Record<string, unknown> | null | undefined;
         };
       };
     };
   };
 };
-type UsernameSchema = ReturnType<typeof getSchema<true>>;
-//#endregion
-export { UsernameSchema };
+export type UsernameSchema = ReturnType<typeof getSchema<true>>;
+//#endregion