better-auth 1.6.20 → 1.6.22

package/dist/plugins/username/index.mjs

@@ -32,11 +32,17 @@ const username = (options) => {
 	const maxUsernameLength = options?.maxUsernameLength || 30;
 	const validator = options?.usernameValidator || defaultUsernameValidator;
 	const pathsWithHttpHookValidation = ["/sign-up/email", "/update-user"];
+	const getUsernameToValidate = (username) => options?.validationOrder?.username === "post-normalization" ? normalizer(username) : username;
+	async function validateUsernameValue(username) {
+		const usernameToValidate = getUsernameToValidate(username);
+		if (usernameToValidate.length < minUsernameLength) return USERNAME_ERROR_CODES.USERNAME_TOO_SHORT;
+		if (usernameToValidate.length > maxUsernameLength) return USERNAME_ERROR_CODES.USERNAME_TOO_LONG;
+		if (!await validator(usernameToValidate)) return USERNAME_ERROR_CODES.INVALID_USERNAME;
+		return null;
+	}
 	async function validateUsername(username, displayUsername, adapter, currentUserId) {
-		const usernameToValidate = options?.validationOrder?.username === "post-normalization" ? normalizer(username) : username;
-		if (usernameToValidate.length < minUsernameLength) throw APIError.from("BAD_REQUEST", USERNAME_ERROR_CODES.USERNAME_TOO_SHORT);
-		if (usernameToValidate.length > maxUsernameLength) throw APIError.from("BAD_REQUEST", USERNAME_ERROR_CODES.USERNAME_TOO_LONG);
-		if (!await validator(usernameToValidate)) throw APIError.from("BAD_REQUEST", USERNAME_ERROR_CODES.INVALID_USERNAME);
+		const validationError = await validateUsernameValue(username);
+		if (validationError) throw APIError.from("BAD_REQUEST", validationError);
 		const normalizedUsername = normalizer(username);
 		const existingUser = await adapter.findOne({
 			model: "user",
@@ -247,48 +253,56 @@ const username = (options) => {
 			username: normalizer,
 			displayUsername: displayUsernameNormalizer
 		}), options?.schema),
-		hooks: { before: [{
-			matcher(context) {
-				return context.path === "/sign-up/email" || context.path === "/update-user";
+		hooks: { before: [
+			{
+				matcher(context) {
+					return context.path === "/sign-up/email";
+				},
+				handler: createAuthMiddleware(async (ctx) => {
+					if (typeof ctx.body.displayUsername !== "string" || ctx.body.username !== void 0) return;
+					if (!await validateUsernameValue(ctx.body.displayUsername)) ctx.body.username = ctx.body.displayUsername;
+				})
 			},
-			handler: createAuthMiddleware(async (ctx) => {
-				const username = typeof ctx.body.username === "string" && options?.validationOrder?.username === "post-normalization" ? normalizer(ctx.body.username) : ctx.body.username;
-				if (username !== void 0 && typeof username === "string") {
-					const minUsernameLength = options?.minUsernameLength || 3;
-					const maxUsernameLength = options?.maxUsernameLength || 30;
-					if (username.length < minUsernameLength) throw APIError.from("BAD_REQUEST", USERNAME_ERROR_CODES.USERNAME_TOO_SHORT);
-					if (username.length > maxUsernameLength) throw APIError.from("BAD_REQUEST", USERNAME_ERROR_CODES.USERNAME_TOO_LONG);
-					if (!await (options?.usernameValidator || defaultUsernameValidator)(username)) throw APIError.from("BAD_REQUEST", USERNAME_ERROR_CODES.INVALID_USERNAME);
-					const normalizedUsername = normalizer(ctx.body.username);
-					const existingUser = await ctx.context.adapter.findOne({
-						model: "user",
-						where: [{
-							field: "username",
-							value: normalizedUsername
-						}]
-					});
-					if (ctx.path === "/sign-up/email" && existingUser) throw APIError.from("BAD_REQUEST", USERNAME_ERROR_CODES.USERNAME_IS_ALREADY_TAKEN);
-					if (ctx.path === "/update-user" && existingUser) {
-						const session = await getSessionFromCtx(ctx);
-						if (!session || existingUser.id !== session.user.id) throw APIError.from("BAD_REQUEST", USERNAME_ERROR_CODES.USERNAME_IS_ALREADY_TAKEN);
+			{
+				matcher(context) {
+					return context.path === "/sign-up/email" || context.path === "/update-user";
+				},
+				handler: createAuthMiddleware(async (ctx) => {
+					const username = ctx.body.username;
+					if (username !== void 0 && typeof username === "string") {
+						const validationError = await validateUsernameValue(username);
+						if (validationError) throw APIError.from("BAD_REQUEST", validationError);
+						const normalizedUsername = normalizer(username);
+						const existingUser = await ctx.context.adapter.findOne({
+							model: "user",
+							where: [{
+								field: "username",
+								value: normalizedUsername
+							}]
+						});
+						if (ctx.path === "/sign-up/email" && existingUser) throw APIError.from("BAD_REQUEST", USERNAME_ERROR_CODES.USERNAME_IS_ALREADY_TAKEN);
+						if (ctx.path === "/update-user" && existingUser) {
+							const session = await getSessionFromCtx(ctx);
+							if (!session || existingUser.id !== session.user.id) throw APIError.from("BAD_REQUEST", USERNAME_ERROR_CODES.USERNAME_IS_ALREADY_TAKEN);
+						}
 					}
-				}
-				const displayUsername = typeof ctx.body.displayUsername === "string" && options?.validationOrder?.displayUsername === "post-normalization" ? displayUsernameNormalizer(ctx.body.displayUsername) : ctx.body.displayUsername;
-				if (displayUsername !== void 0 && typeof displayUsername === "string") {
-					if (options?.displayUsernameValidator) {
-						if (!await options.displayUsernameValidator(displayUsername)) throw APIError.from("BAD_REQUEST", USERNAME_ERROR_CODES.INVALID_DISPLAY_USERNAME);
+					const displayUsername = typeof ctx.body.displayUsername === "string" && options?.validationOrder?.displayUsername === "post-normalization" ? displayUsernameNormalizer(ctx.body.displayUsername) : ctx.body.displayUsername;
+					if (displayUsername !== void 0 && typeof displayUsername === "string") {
+						if (options?.displayUsernameValidator) {
+							if (!await options.displayUsernameValidator(displayUsername)) throw APIError.from("BAD_REQUEST", USERNAME_ERROR_CODES.INVALID_DISPLAY_USERNAME);
+						}
 					}
-				}
-			})
-		}, {
-			matcher(context) {
-				return context.path === "/sign-up/email";
+				})
 			},
-			handler: createAuthMiddleware(async (ctx) => {
-				if (ctx.body.username && !ctx.body.displayUsername) ctx.body.displayUsername = ctx.body.username;
-				if (ctx.body.displayUsername && !ctx.body.username) ctx.body.username = ctx.body.displayUsername;
-			})
-		}] },
+			{
+				matcher(context) {
+					return context.path === "/sign-up/email";
+				},
+				handler: createAuthMiddleware(async (ctx) => {
+					if (ctx.body.username && !ctx.body.displayUsername) ctx.body.displayUsername = ctx.body.username;
+				})
+			}
+		] },
 		options,
 		$ERROR_CODES: USERNAME_ERROR_CODES
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth",
-  "version": "1.6.20",
+  "version": "1.6.22",
   "description": "The most comprehensive authentication framework for TypeScript.",
   "type": "module",
   "license": "MIT",
@@ -483,19 +483,19 @@
     "@better-fetch/fetch": "1.3.1",
     "@noble/ciphers": "^2.1.1",
     "@noble/hashes": "^2.0.1",
-    "better-call": "1.3.6",
+    "better-call": "1.3.7",
     "defu": "^6.1.4",
     "jose": "^6.1.3",
     "kysely": "^0.28.17 || ^0.29.0",
     "nanostores": "^1.1.1",
     "zod": "^4.3.6",
-    "@better-auth/core": "1.6.20",
-    "@better-auth/drizzle-adapter": "1.6.20",
-    "@better-auth/kysely-adapter": "1.6.20",
-    "@better-auth/memory-adapter": "1.6.20",
-    "@better-auth/mongo-adapter": "1.6.20",
-    "@better-auth/prisma-adapter": "1.6.20",
-    "@better-auth/telemetry": "1.6.20"
+    "@better-auth/core": "1.6.22",
+    "@better-auth/drizzle-adapter": "1.6.22",
+    "@better-auth/kysely-adapter": "1.6.22",
+    "@better-auth/memory-adapter": "1.6.22",
+    "@better-auth/mongo-adapter": "1.6.22",
+    "@better-auth/prisma-adapter": "1.6.22",
+    "@better-auth/telemetry": "1.6.22"
   },
   "devDependencies": {
     "@lynx-js/react": "^0.116.3",

package/dist/utils/get-request-ip.d.mts

@@ -1,6 +0,0 @@
-import { BetterAuthOptions } from "@better-auth/core";
-
-//#region src/utils/get-request-ip.d.ts
-declare function getIp(req: Request | Headers, options: BetterAuthOptions): string | null;
-//#endregion
-export { getIp };

package/dist/utils/get-request-ip.mjs

@@ -1,20 +0,0 @@
-import { isDevelopment, isTest } from "@better-auth/core/env";
-import { isValidIP, normalizeIP } from "@better-auth/core/utils/ip";
-//#region src/utils/get-request-ip.ts
-const LOCALHOST_IP = "127.0.0.1";
-function getIp(req, options) {
-	if (options.advanced?.ipAddress?.disableIpTracking) return null;
-	const headers = "headers" in req ? req.headers : req;
-	const ipHeaders = options.advanced?.ipAddress?.ipAddressHeaders || ["x-forwarded-for"];
-	for (const key of ipHeaders) {
-		const value = "get" in headers ? headers.get(key) : headers[key];
-		if (typeof value === "string") {
-			const ip = value.split(",")[0].trim();
-			if (isValidIP(ip)) return normalizeIP(ip, { ipv6Subnet: options.advanced?.ipAddress?.ipv6Subnet });
-		}
-	}
-	if (isTest() || isDevelopment()) return LOCALHOST_IP;
-	return null;
-}
-//#endregion
-export { getIp };