better-auth 1.8.0-beta.6 → 1.8.0-beta.7

package/dist/client/proxy.mjs

@@ -1,14 +1,7 @@
 import { isAtom } from "../utils/is-atom.mjs";
 import { toKebabCase } from "@better-auth/core/utils/string";
+import { isPayloadMethod } from "@better-fetch/fetch";
 //#region src/client/proxy.ts
-function getMethod(path, knownPathMethods, args) {
-	const method = knownPathMethods[path];
-	const { fetchOptions, query: _query, ...body } = args || {};
-	if (method) return method;
-	if (fetchOptions?.method) return fetchOptions.method;
-	if (body && Object.keys(body).length > 0) return "POST";
-	return "GET";
-}
 function createDynamicPathProxy(routes, client, knownPathMethods, atoms, atomListeners) {
 	function createProxy(path = []) {
 		return new Proxy(function() {}, {
@@ -35,13 +28,13 @@ function createDynamicPathProxy(routes, client, knownPathMethods, atoms, atomLis
 					...fetchOptions,
 					...argFetchOptions
 				};
-				const method = getMethod(routePath, knownPathMethods, arg);
+				const method = knownPathMethods[routePath] || options.method || (Object.keys(body).length > 0 ? "POST" : "GET");
 				return await client(routePath, {
 					...options,
-					body: method === "GET" ? void 0 : {
+					body: isPayloadMethod(method) ? {
 						...body,
 						...options?.body || {}
-					},
+					} : void 0,
 					query: query || options?.query,
 					method,
 					async onSuccess(context) {

package/dist/db/internal-adapter.mjs

@@ -79,6 +79,16 @@ const createInternalAdapter = (adapter, ctx) => {
 		const activeSessions = await secondaryStorage.get(`active-sessions-${userId}`);
 		return activeSessions ? safeJSONParse(activeSessions) || [] : [];
 	}
+	async function setActiveSessionReferences(userId, sessionReferences, now) {
+		if (!secondaryStorage) return;
+		const sorted = [...sessionReferences].sort((a, b) => a.expiresAt - b.expiresAt);
+		const ttl = getTTLSeconds(sorted.at(-1)?.expiresAt ?? 0, now);
+		if (ttl > 0) {
+			await secondaryStorage.set(`active-sessions-${userId}`, JSON.stringify(sorted), ttl);
+			return;
+		}
+		await secondaryStorage.delete(`active-sessions-${userId}`);
+	}
 	const revokedBeforeKey = (userId) => `revoked-sessions-before-${userId}`;
 	const revokedBeforeTTL = Math.max(sessionExpiration, 86400, Number(options.plugins?.find((plugin) => plugin.id === "admin")?.options?.impersonationSessionDuration) || 0);
 	async function isRevokedSession(session, revokedBeforeByUser) {
@@ -93,17 +103,9 @@ const createInternalAdapter = (adapter, ctx) => {
 		await secondaryStorage.set(revokedBeforeKey(userId), String(Math.max(revokedAt, previousRevokedBefore || 0)), revokedBeforeTTL);
 		const deletedTokens = new Set(sessionReferences.map((session) => session.token));
 		for (const token of deletedTokens) await secondaryStorage.delete(token);
-		const activeSessionsKey = `active-sessions-${userId}`;
 		const currentSessionReferences = await getActiveSessionReferences(userId);
 		const now = Date.now();
-		const remainingSessionReferences = currentSessionReferences.filter((session) => session.expiresAt > now && !deletedTokens.has(session.token));
-		remainingSessionReferences.sort((a, b) => a.expiresAt - b.expiresAt);
-		const furthestExpiration = remainingSessionReferences.at(-1)?.expiresAt;
-		if (furthestExpiration) {
-			await secondaryStorage.set(activeSessionsKey, JSON.stringify(remainingSessionReferences), getTTLSeconds(furthestExpiration, now));
-			return;
-		}
-		await secondaryStorage.delete(activeSessionsKey);
+		await setActiveSessionReferences(userId, currentSessionReferences.filter((session) => session.expiresAt > now && !deletedTokens.has(session.token)), now);
 	}
 	async function queueCachedUserSessionDeletion(userId, sessionReferences) {
 		if (!secondaryStorage) return;
@@ -310,12 +312,10 @@ const createInternalAdapter = (adapter, ctx) => {
 					list = safeJSONParse(currentList) || [];
 					list = list.filter((session) => session.expiresAt > now && session.token !== data.token);
 				}
-				const sorted = [...list, {
+				await setActiveSessionReferences(userId, [...list, {
 					token: data.token,
 					expiresAt: data.expiresAt.getTime()
-				}].sort((a, b) => a.expiresAt - b.expiresAt);
-				const furthestSessionTTL = getTTLSeconds(sorted.at(-1)?.expiresAt ?? data.expiresAt.getTime(), now);
-				if (furthestSessionTTL > 0) await secondaryStorage.set(`active-sessions-${userId}`, JSON.stringify(sorted), furthestSessionTTL);
+				}], now);
 				const user = await (await getCurrentAdapter(adapter)).findOne({
 					model: "user",
 					where: [{
@@ -467,13 +467,11 @@ const createInternalAdapter = (adapter, ctx) => {
 						}), sessionTTL);
 						const listKey = `active-sessions-${updatedSession.userId}`;
 						const listRaw = await secondaryStorage.get(listKey);
-						const sorted = (listRaw ? safeJSONParse(listRaw) || [] : []).filter((s) => s.token !== sessionToken && s.expiresAt > now).concat([{
+						const filtered = (listRaw ? safeJSONParse(listRaw) || [] : []).filter((s) => s.token !== sessionToken && s.expiresAt > now).concat([{
 							token: sessionToken,
 							expiresAt: expiresMs
-						}]).sort((a, b) => a.expiresAt - b.expiresAt);
-						const furthestSessionExp = sorted.at(-1)?.expiresAt;
-						if (furthestSessionExp && furthestSessionExp > now) await secondaryStorage.set(listKey, JSON.stringify(sorted), getTTLSeconds(furthestSessionExp, now));
-						else await secondaryStorage.delete(listKey);
+						}]);
+						await setActiveSessionReferences(updatedSession.userId, filtered, now);
 					}
 					return updatedSession;
 				},
@@ -494,10 +492,7 @@ const createInternalAdapter = (adapter, ctx) => {
 					if (currentList) {
 						const list = safeJSONParse(currentList) || [];
 						const now = Date.now();
-						const filtered = list.filter((session) => session.expiresAt > now && session.token !== token);
-						const furthestSessionExp = filtered.sort((a, b) => a.expiresAt - b.expiresAt).at(-1)?.expiresAt;
-						if (filtered.length > 0 && furthestSessionExp && furthestSessionExp > Date.now()) await secondaryStorage.set(`active-sessions-${userId}`, JSON.stringify(filtered), getTTLSeconds(furthestSessionExp, now));
-						else await secondaryStorage.delete(`active-sessions-${userId}`);
+						await setActiveSessionReferences(userId, list.filter((session) => session.expiresAt > now && session.token !== token), now);
 					} else logger.error("Active sessions list not found in secondary storage");
 				}
 				await secondaryStorage.delete(token);

package/dist/db/schema.mjs

@@ -149,16 +149,25 @@ function getSessionDefaultFields(options) {
 }
 function mergeSchema(schema, newSchema) {
 	if (!newSchema) return schema;
+	const merged = { ...schema };
 	for (const table in newSchema) {
-		const newModelName = newSchema[table]?.modelName;
-		if (newModelName) schema[table].modelName = newModelName;
-		for (const field in schema[table].fields) {
-			const newField = newSchema[table]?.fields?.[field];
-			if (!newField) continue;
-			schema[table].fields[field].fieldName = newField;
-		}
+		const base = schema[table];
+		const override = newSchema[table];
+		if (!base || !override) continue;
+		const fields = Object.fromEntries(Object.entries(base.fields).map(([key, field]) => {
+			const fieldName = override.fields?.[key];
+			return [key, fieldName ? {
+				...field,
+				fieldName
+			} : field];
+		}));
+		merged[table] = {
+			...base,
+			...override.modelName ? { modelName: override.modelName } : {},
+			fields
+		};
 	}
-	return schema;
+	return merged;
 }
 //#endregion
 export { buildSyntheticUserOutput, getSessionDefaultFields, mergeSchema, parseAccountInput, parseAccountOutput, parseAdditionalUserInput, parseAdditionalUserInputFromProviderProfile, parseInputData, parseSessionInput, parseSessionOutput, parseUserInput, parseUserOutput };

package/dist/package.mjs

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "1.8.0-beta.6";
+var version = "1.8.0-beta.7";
 //#endregion
 export { version };

package/dist/plugins/admin/routes.mjs

@@ -5,6 +5,7 @@ import { getAuthoritativeSessionFromCtx, getSessionFromCtx } from "../../api/rou
 import { assertPasswordNotTooLong, assertPasswordNotTooShort } from "../../utils/password.mjs";
 import { ADMIN_ERROR_CODES } from "./error-codes.mjs";
 import { hasPermission } from "./has-permission.mjs";
+import { runWithTransaction } from "@better-auth/core/context";
 import { APIError, BASE_ERROR_CODES } from "@better-auth/core/error";
 import { whereOperators } from "@better-auth/core/db/adapter";
 import { createAuthEndpoint, createAuthMiddleware } from "@better-auth/core/api";
@@ -193,22 +194,23 @@ const createUser = (opts) => createAuthEndpoint("/admin/create-user", {
 	if (!z.email().safeParse(email).success) throw APIError.from("BAD_REQUEST", BASE_ERROR_CODES.INVALID_EMAIL);
 	if (ctx.body.password) assertPasswordNotTooLong(ctx, ctx.body.password);
 	if (await ctx.context.internalAdapter.findUserByEmail(email)) throw APIError.from("BAD_REQUEST", ADMIN_ERROR_CODES.USER_ALREADY_EXISTS_USE_ANOTHER_EMAIL);
-	const user = await ctx.context.internalAdapter.createUser({
-		...userData,
-		email,
-		name: ctx.body.name,
-		role: requestedRole !== void 0 ? parseRoles(requestedRole) : opts?.defaultRole ?? "user"
-	}, { method: "admin" });
-	if (!user) throw APIError.from("INTERNAL_SERVER_ERROR", ADMIN_ERROR_CODES.FAILED_TO_CREATE_USER);
-	if (ctx.body.password) {
-		const hashedPassword = await ctx.context.password.hash(ctx.body.password);
-		await ctx.context.internalAdapter.linkAccount({
+	const hashedPassword = ctx.body.password ? await ctx.context.password.hash(ctx.body.password) : void 0;
+	const user = await runWithTransaction(ctx.context.adapter, async () => {
+		const user = await ctx.context.internalAdapter.createUser({
+			...userData,
+			email,
+			name: ctx.body.name,
+			role: requestedRole !== void 0 ? parseRoles(requestedRole) : opts?.defaultRole ?? "user"
+		}, { method: "admin" });
+		if (!user) throw APIError.from("INTERNAL_SERVER_ERROR", ADMIN_ERROR_CODES.FAILED_TO_CREATE_USER);
+		if (hashedPassword !== void 0) await ctx.context.internalAdapter.linkAccount({
 			providerId: "credential",
 			accountId: user.id,
 			password: hashedPassword,
 			userId: user.id
 		});
-	}
+		return user;
+	});
 	return ctx.json({ user: parseUserOutput(ctx.context.options, user) });
 });
 const adminUpdateUserBodySchema = z.object({

package/dist/plugins/device-authorization/index.d.mts

@@ -305,6 +305,7 @@ export declare const deviceAuthorization: <Grant extends DeviceAuthorizationGran
           invalid_request: "invalid_request";
           expired_token: "expired_token";
           access_denied: "access_denied";
+          invalid_client: "invalid_client";
           authorization_pending: "authorization_pending";
           slow_down: "slow_down";
           invalid_grant: "invalid_grant";

package/dist/plugins/device-authorization/routes.mjs

@@ -369,6 +369,7 @@ const deviceTokenErrorSchema = z.object({
 		"expired_token",
 		"access_denied",
 		"invalid_request",
+		"invalid_client",
 		"invalid_grant"
 	]).meta({ description: "Error code" }),
 	error_description: z.string().meta({ description: "Detailed error description" })
@@ -504,6 +505,7 @@ Follow [rfc8628#section-3.4](https://datatracker.ietf.org/doc/html/rfc8628#secti
 									"expired_token",
 									"access_denied",
 									"invalid_request",
+									"invalid_client",
 									"invalid_grant"
 								]
 							},
@@ -518,7 +520,7 @@ Follow [rfc8628#section-3.4](https://datatracker.ietf.org/doc/html/rfc8628#secti
 	const { device_code, client_id } = ctx.body;
 	if (opts.validateClient) {
 		if (!await opts.validateClient(client_id)) throw new APIError("BAD_REQUEST", {
-			error: "invalid_grant",
+			error: "invalid_client",
 			error_description: "Invalid client ID"
 		});
 	}

package/dist/plugins/open-api/generator.mjs

@@ -74,7 +74,8 @@ function getZodPipeSchema(zodType) {
 function getParameters(options) {
 	const parameters = [];
 	if (options.metadata?.openapi?.parameters) parameters.push(...options.metadata.openapi.parameters);
-	if (!options.metadata?.openapi?.parameters && options.query instanceof z.ZodObject) Object.entries(options.query.shape).forEach(([key, value]) => {
+	const query = options.query instanceof z.core.$ZodOptional ? options.query._zod.def.innerType : options.query;
+	if (!options.metadata?.openapi?.parameters && query instanceof z.core.$ZodObject) Object.entries(query._zod.def.shape).forEach(([key, value]) => {
 		if (value instanceof z.ZodType) {
 			const parameterSchema = toOpenApiSchema(value);
 			parameters.push({

package/dist/plugins/organization/adapter.mjs

@@ -214,6 +214,10 @@ const getOrgAdapter = (context, options) => {
 					...data.filter.operator ? { operator: data.filter.operator } : {}
 				}] : []]
 			})]);
+			if (members[0].length === 0) return {
+				members: [],
+				total: members[1]
+			};
 			const users = await adapter.findMany({
 				model: "user",
 				where: [{

package/dist/plugins/organization/routes/crud-invites.mjs

@@ -509,7 +509,7 @@ const getInvitation = (options) => createAuthEndpoint("/organization/get-invitat
 	if (!session) throw APIError.fromStatus("UNAUTHORIZED", { message: "Not authenticated" });
 	const adapter = getOrgAdapter(ctx.context, options);
 	const invitation = await adapter.findInvitationById(ctx.query.id);
-	if (!invitation || invitation.status !== "pending" || invitation.expiresAt < /* @__PURE__ */ new Date()) throw APIError.fromStatus("BAD_REQUEST", { message: "Invitation not found!" });
+	if (!invitation || invitation.status !== "pending" || invitation.expiresAt < /* @__PURE__ */ new Date()) throw APIError.from("BAD_REQUEST", ORGANIZATION_ERROR_CODES.INVITATION_NOT_FOUND);
 	if (invitation.email.toLowerCase() !== session.user.email.toLowerCase()) throw APIError.from("FORBIDDEN", ORGANIZATION_ERROR_CODES.YOU_ARE_NOT_THE_RECIPIENT_OF_THE_INVITATION);
 	if (shouldRequireVerifiedEmailForInvitationIdAction({
 		organizationOptions: ctx.context.orgOptions,

package/dist/plugins/siwe/index.mjs

@@ -6,6 +6,7 @@ import { PACKAGE_VERSION } from "../../version.mjs";
 import { toChecksumAddress } from "../../utils/hashing.mjs";
 import { normalizeSiweDomain, parseSiweMessage } from "./parse-message.mjs";
 import { schema } from "./schema.mjs";
+import { getCurrentAdapter, runWithTransaction } from "@better-auth/core/context";
 import { createAuthEndpoint } from "@better-auth/core/api";
 import * as z from "zod";
 import { createPlaceholderEmail } from "@better-auth/core/utils/email";
@@ -186,38 +187,54 @@ const siwe = (options) => {
 							}
 						}
 						const { name, avatar } = await options.ensLookup?.({ walletAddress }) ?? {};
-						const createSIWEUser = (email) => ctx.context.internalAdapter.createUser({
-							name: name ?? walletAddress,
-							email,
-							image: avatar ?? ""
-						}, { method: "siwe" });
+						const createSIWEUser = (email) => runWithTransaction(ctx.context.adapter, async () => {
+							const createdUser = await ctx.context.internalAdapter.createUser({
+								name: name ?? walletAddress,
+								email,
+								image: avatar ?? ""
+							}, { method: "siwe" });
+							await (await getCurrentAdapter(ctx.context.adapter)).create({
+								model: "walletAddress",
+								data: {
+									userId: createdUser.id,
+									address: walletAddress,
+									chainId,
+									isPrimary: true,
+									createdAt: /* @__PURE__ */ new Date()
+								}
+							});
+							await ctx.context.internalAdapter.createAccount({
+								userId: createdUser.id,
+								providerId: "siwe",
+								accountId: `${walletAddress}:${chainId}`,
+								createdAt: /* @__PURE__ */ new Date(),
+								updatedAt: /* @__PURE__ */ new Date()
+							});
+							return createdUser;
+						});
 						try {
 							user = await createSIWEUser(userEmail);
 						} catch (error) {
 							if (userEmail !== normalizedEmail || !normalizedEmail) throw error;
-							if (!await ctx.context.internalAdapter.findUserByEmail(normalizedEmail)) throw error;
+							const claimedUser = await ctx.context.internalAdapter.findUserByEmail(normalizedEmail);
+							const registeredWallet = await ctx.context.adapter.findOne({
+								model: "walletAddress",
+								where: [{
+									field: "address",
+									operator: "eq",
+									value: walletAddress
+								}, {
+									field: "chainId",
+									operator: "eq",
+									value: chainId
+								}]
+							});
+							if (!claimedUser || registeredWallet) throw error;
 							userEmail = walletEmail;
 							user = await createSIWEUser(userEmail);
 						} finally {
 							if (emailClaimIdentifier) await ctx.context.internalAdapter.consumeVerificationValue(emailClaimIdentifier).catch(() => {});
 						}
-						await ctx.context.adapter.create({
-							model: "walletAddress",
-							data: {
-								userId: user.id,
-								address: walletAddress,
-								chainId,
-								isPrimary: true,
-								createdAt: /* @__PURE__ */ new Date()
-							}
-						});
-						await ctx.context.internalAdapter.createAccount({
-							userId: user.id,
-							providerId: "siwe",
-							accountId: `${walletAddress}:${chainId}`,
-							createdAt: /* @__PURE__ */ new Date(),
-							updatedAt: /* @__PURE__ */ new Date()
-						});
 					} else if (!existingWalletAddress) {
 						await ctx.context.adapter.create({
 							model: "walletAddress",

package/dist/plugins/username/index.mjs

@@ -6,6 +6,7 @@ import { assertPasswordNotTooLong } from "../../utils/password.mjs";
 import { PACKAGE_VERSION } from "../../version.mjs";
 import { USERNAME_ERROR_CODES } from "./error-codes.mjs";
 import { getSchema } from "./schema.mjs";
+import { getCurrentAdapter } from "@better-auth/core/context";
 import { APIError, BASE_ERROR_CODES } from "@better-auth/core/error";
 import { createAuthEndpoint, createAuthMiddleware } from "@better-auth/core/api";
 import * as z from "zod";
@@ -71,7 +72,7 @@ const usernameImpl = (options, includeDisplayUsername) => {
 					const currentPath = context?.path;
 					const skipValidation = currentPath && pathsWithHttpHookValidation.includes(currentPath);
 					if (username) {
-						if (!skipValidation) await validateUsername(username, displayUsername, ctx.adapter);
+						if (!skipValidation) await validateUsername(username, displayUsername, await getCurrentAdapter(ctx.adapter));
 						return { data: {
 							...user,
 							username: normalizer(username),
@@ -91,7 +92,7 @@ const usernameImpl = (options, includeDisplayUsername) => {
 					if (username) {
 						if (!skipValidation) {
 							const currentUserId = context?.context?.session?.user?.id || ("id" in user ? user.id : null);
-							await validateUsername(username, displayUsername, ctx.adapter, currentUserId);
+							await validateUsername(username, displayUsername, await getCurrentAdapter(ctx.adapter), currentUserId);
 						}
 						return { data: {
 							...user,

package/dist/state.mjs

@@ -80,8 +80,7 @@ async function generateGenericState(c, stateData, settings) {
 	}
 	const stateCookie = c.context.createAuthCookie(settings?.cookieName ?? "state", { maxAge: 300 });
 	await c.setSignedCookie(stateCookie.name, state, c.context.secret, stateCookie.attributes);
-	const expiresAt = /* @__PURE__ */ new Date();
-	expiresAt.setMinutes(expiresAt.getMinutes() + 10);
+	const expiresAt = new Date(Date.now() + 6e5);
 	if (!await c.context.internalAdapter.createVerificationValue({
 		value: JSON.stringify({
 			...stateData,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth",
-  "version": "1.8.0-beta.6",
+  "version": "1.8.0-beta.7",
   "description": "The most comprehensive authentication framework for TypeScript.",
   "type": "module",
   "license": "MIT",
@@ -503,13 +503,13 @@
     "kysely": "^0.28.17 || ^0.29.0",
     "nanostores": "^1.3.0",
     "zod": "^4.5.4",
-    "@better-auth/core": "1.8.0-beta.6",
-    "@better-auth/drizzle-adapter": "1.8.0-beta.6",
-    "@better-auth/kysely-adapter": "1.8.0-beta.6",
-    "@better-auth/memory-adapter": "1.8.0-beta.6",
-    "@better-auth/mongo-adapter": "1.8.0-beta.6",
-    "@better-auth/prisma-adapter": "1.8.0-beta.6",
-    "@better-auth/telemetry": "1.8.0-beta.6"
+    "@better-auth/core": "1.8.0-beta.7",
+    "@better-auth/drizzle-adapter": "1.8.0-beta.7",
+    "@better-auth/kysely-adapter": "1.8.0-beta.7",
+    "@better-auth/memory-adapter": "1.8.0-beta.7",
+    "@better-auth/mongo-adapter": "1.8.0-beta.7",
+    "@better-auth/prisma-adapter": "1.8.0-beta.7",
+    "@better-auth/telemetry": "1.8.0-beta.7"
   },
   "devDependencies": {
     "@lynx-js/react": "^0.121.2",