better-auth 1.7.3 → 1.7.4

package/dist/api/dispatch.mjs

@@ -4,7 +4,7 @@ import { runWithEndpointContext } from "@better-auth/core/context";
 import { shouldPublishLog } from "@better-auth/core/env";
 import { APIError } from "@better-auth/core/error";
 import { createDefu } from "defu";
-import { ATTR_CONTEXT, ATTR_HOOK_TYPE, ATTR_HTTP_ROUTE, ATTR_OPERATION_ID, withSpan } from "@better-auth/core/instrumentation";
+import { ATTR_CONTEXT, ATTR_HOOK_TYPE, ATTR_HTTP_ROUTE, ATTR_OPERATION_ID, createWithSpan } from "@better-auth/core/instrumentation";
 import { kAPIErrorHeaderSymbol, toResponse } from "better-call";
 //#region src/api/dispatch.ts
 const defuReplaceArrays = createDefu((obj, key, value) => {
@@ -62,6 +62,7 @@ function mergeAPIErrorHeaders(error) {
 	return headers;
 }
 async function runBeforeHooks(context, hooks, endpoint, operationId) {
+	const withSpan = createWithSpan(context.context.options);
 	let modifiedContext = {};
 	for (const hook of hooks) {
 		let matched = false;
@@ -105,6 +106,7 @@ async function runBeforeHooks(context, hooks, endpoint, operationId) {
 	return { context: modifiedContext };
 }
 async function runAfterHooks(context, hooks, endpoint, operationId) {
+	const withSpan = createWithSpan(context.context.options);
 	for (const hook of hooks) {
 		if (!hook.matcher(context)) continue;
 		const hookSource = hooksSourceWeakMap.get(hook.handler) ?? "unknown";
@@ -182,6 +184,7 @@ function getHooks(authContext) {
 * @param input Input context whose `context` is an already-resolved `AuthContext`.
 */
 async function dispatchAuthEndpoint(endpoint, input) {
+	const withSpan = createWithSpan(input.context.options);
 	const operationId = input.operationId ?? getOperationId(endpoint);
 	const route = endpoint.path ?? "/:virtual";
 	const endpointMethod = endpoint.options?.method;

package/dist/api/index.mjs

@@ -21,7 +21,7 @@ import { toAuthEndpoints } from "./to-auth-endpoints.mjs";
 import { logger } from "@better-auth/core/env";
 import { APIError } from "@better-auth/core/error";
 import { getIP } from "@better-auth/core/utils/ip";
-import { ATTR_CONTEXT, ATTR_HOOK_TYPE, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_HTTP_ROUTE, withSpan } from "@better-auth/core/instrumentation";
+import { ATTR_CONTEXT, ATTR_HOOK_TYPE, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_HTTP_ROUTE, createWithSpan } from "@better-auth/core/instrumentation";
 import { normalizePathname } from "@better-auth/core/utils/url";
 import { createRouter } from "better-call";
 import { NO_STORE_HEADERS, createAuthEndpoint, createAuthMiddleware, optionsMiddleware } from "@better-auth/core/api";
@@ -82,6 +82,7 @@ To resolve this, you can:
 	}
 }
 function getEndpoints(ctx, options) {
+	const withSpan = createWithSpan(options);
 	const pluginEndpoints = options.plugins?.reduce((acc, plugin) => {
 		return {
 			...acc,
@@ -148,6 +149,7 @@ function getEndpoints(ctx, options) {
 	};
 }
 const router = (ctx, options) => {
+	const withSpan = createWithSpan(options);
 	const { api, middlewares } = getEndpoints(ctx, options);
 	const basePath = new URL(ctx.baseURL).pathname;
 	return createRouter(api, {

package/dist/db/with-hooks.mjs

@@ -1,7 +1,8 @@
 import { getCurrentAdapter, queueAfterTransactionHook, tryGetCurrentAuthEndpointContext } from "@better-auth/core/context";
-import { ATTR_CONTEXT, ATTR_DB_COLLECTION_NAME, ATTR_HOOK_TYPE, withSpan } from "@better-auth/core/instrumentation";
+import { ATTR_CONTEXT, ATTR_DB_COLLECTION_NAME, ATTR_HOOK_TYPE, createWithSpan } from "@better-auth/core/instrumentation";
 //#region src/db/with-hooks.ts
 function getWithHooks(adapter, ctx) {
+	const withSpan = createWithSpan(ctx.options);
 	const hooksEntries = ctx.hooks;
 	async function createWithHooks(data, model, customCreateFn) {
 		const context = tryGetCurrentAuthEndpointContext();

package/dist/package.mjs

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "1.7.3";
+var version = "1.7.4";
 //#endregion
 export { version };

package/dist/plugins/index.d.mts

@@ -53,7 +53,7 @@ import { OpenAPIOptions, openAPI } from "./open-api/index.mjs";
 import { PhoneNumberOptions, UserWithPhoneNumber } from "./phone-number/types.mjs";
 import { phoneNumber } from "./phone-number/index.mjs";
 import { SIWEPluginOptions, siwe } from "./siwe/index.mjs";
-import { LoginResult, TestCookie, TestHelpers, TestUtilsOptions } from "./test-utils/types.mjs";
+import { LoginResult, TestAuthOptions, TestCookie, TestHelpers, TestUtilsOptions } from "./test-utils/types.mjs";
 import { testUtils } from "./test-utils/index.mjs";
 import { BackupCodeOptions, backupCode2fa, encodeBackupCodes, generateBackupCodes, getBackupCodes, verifyBackupCode } from "./two-factor/backup-codes/index.mjs";
 import { OTPOptions, otp2fa } from "./two-factor/otp/index.mjs";
@@ -66,4 +66,4 @@ import { USERNAME_ERROR_CODES } from "./username/error-codes.mjs";
 import { UsernameOptions, UsernamePlugin, UsernamePluginWithoutDisplayUsername, username } from "./username/index.mjs";
 import { hasPermission } from "./organization/has-permission.mjs";
 import { DefaultOrganizationPlugin, DynamicAccessControlEndpoints, OrganizationCreator, OrganizationEndpoints, OrganizationPlugin, TeamEndpoints, organization, parseRoles } from "./organization/organization.mjs";
-export { AccessControl, AdminOptions, AnonymousOptions, AnonymousSession, ArrayElement, Auth0Options, AuthorizeResponse, BackupCodeOptions, BaseCaptchaOptions, BaseOAuthProviderOptions, BearerOptions, CaptchaFoxOptions, CaptchaOptions, CloudflareTurnstileOptions, CustomSessionPluginOptions, DefaultOrganizationPlugin, DeviceAuthorizationGrant, DeviceAuthorizationGrantAuthorization, DeviceAuthorizationOptions, DeviceAuthorizationPluginOptions, DeviceAuthorizationRequest, DeviceCode, DeviceCodeRedemptionAuthorization, DeviceCodeRedemptionResult, DynamicAccessControlEndpoints, MULTI_SESSION_ERROR_CODES as ERROR_CODES, EmailOTPOptions, ExactRoleStatements, FieldSchema, GenericOAuthConfig, GenericOAuthOptions, GenericOAuthUserInfo, GoogleRecaptchaOptions, GumroadOptions, HCaptchaOptions, HIDE_METADATA, HaveIBeenPwnedOptions, HubSpotOptions, InferAdminRolesFromOption, InferInvitation, InferMember, InferOptionSchema, InferOrganization, InferOrganizationRolesFromOption, InferOrganizationZodRolesFromOption, InferPluginContext, InferPluginErrorCodes, InferPluginIDs, InferTeam, Invitation, InvitationInput, InvitationStatus, JWKOptions, JWSAlgorithms, Jwk, JwtOptions, KeycloakOptions, LastLoginMethodOptions, LineOptions, LoginResult, MagicLinkOptions, Member, MemberInput, MicrosoftEntraIdOptions, MultiSessionConfig, OAUTH_POPUP_COMPLETE_SCRIPT, OAUTH_POPUP_DATA_ELEMENT_ID, OAUTH_POPUP_ERROR_CODES, OAUTH_POPUP_MESSAGE_TYPE, OAUTH_POPUP_SCRIPT_CSP_HASH, OAuthPopupData, OAuthPopupMessage, OAuthProxyOptions, OTPOptions, OktaOptions, OneTapOptions, OneTimeTokenOptions, OpenAPIModelSchema, OpenAPIOptions, OpenAPIParameter, OpenAPISchema, Organization, OrganizationCreator, OrganizationEndpoints, OrganizationInput, OrganizationOptions, OrganizationPlugin, OrganizationRole, OrganizationSchema, POPUP_MARKER_COOKIE, Path, PatreonOptions, PhoneNumberOptions, Provider, ResolvedSigningKey, Role, RoleAuthorizeRequest, RoleInput, RoleStatements, SIWEPluginOptions, SessionWithImpersonatedBy, SlackOptions, Statements, SubArray, Subset, TOTPOptions, TWO_FACTOR_ERROR_CODES, Team, TeamEndpoints, TeamInput, TeamMember, TeamMemberInput, TestCookie, TestHelpers, TestUtilsOptions, TimeString, TwoFactorOptions, TwoFactorProvider, TwoFactorTable, USERNAME_ERROR_CODES, UserWithAnonymous, UserWithPhoneNumber, UserWithRole, UserWithTwoFactor, UsernameOptions, UsernamePlugin, UsernamePluginWithoutDisplayUsername, YandexOptions, admin, anonymous, auth0, backupCode2fa, bearer, captcha, createAccessControl, createJwk, customSession, defaultRolesSchema, deviceAuthorization, deviceAuthorizationOptionsSchema, emailOTP, encodeBackupCodes, generateBackupCodes, generateExportedKeyPair, generator, genericOAuth, getBackupCodes, getJwtToken, getOrgAdapter, gumroad, hasPermission, haveIBeenPwned, hubspot, invitationSchema, invitationStatus, isPasswordCompromised, jwt, keycloak, lastLoginMethod, line, magicLink, memberSchema, microsoftEntraId, ms, multiSession, oAuthProxy, oauthPopup, okta, oneTap, oneTimeToken, openAPI, organization, organizationRoleSchema, organizationSchema, otp2fa, parseRoles, patreon, phoneNumber, redeemDeviceCode, resolveSigningKey, role, roleSchema, sec, signJWT, siwe, slack, teamMemberSchema, teamSchema, testUtils, toExpJWT, totp2fa, twoFactor, twoFactorClient, username, verifyBackupCode, verifyJWT, yandex };
+export { AccessControl, AdminOptions, AnonymousOptions, AnonymousSession, ArrayElement, Auth0Options, AuthorizeResponse, BackupCodeOptions, BaseCaptchaOptions, BaseOAuthProviderOptions, BearerOptions, CaptchaFoxOptions, CaptchaOptions, CloudflareTurnstileOptions, CustomSessionPluginOptions, DefaultOrganizationPlugin, DeviceAuthorizationGrant, DeviceAuthorizationGrantAuthorization, DeviceAuthorizationOptions, DeviceAuthorizationPluginOptions, DeviceAuthorizationRequest, DeviceCode, DeviceCodeRedemptionAuthorization, DeviceCodeRedemptionResult, DynamicAccessControlEndpoints, MULTI_SESSION_ERROR_CODES as ERROR_CODES, EmailOTPOptions, ExactRoleStatements, FieldSchema, GenericOAuthConfig, GenericOAuthOptions, GenericOAuthUserInfo, GoogleRecaptchaOptions, GumroadOptions, HCaptchaOptions, HIDE_METADATA, HaveIBeenPwnedOptions, HubSpotOptions, InferAdminRolesFromOption, InferInvitation, InferMember, InferOptionSchema, InferOrganization, InferOrganizationRolesFromOption, InferOrganizationZodRolesFromOption, InferPluginContext, InferPluginErrorCodes, InferPluginIDs, InferTeam, Invitation, InvitationInput, InvitationStatus, JWKOptions, JWSAlgorithms, Jwk, JwtOptions, KeycloakOptions, LastLoginMethodOptions, LineOptions, LoginResult, MagicLinkOptions, Member, MemberInput, MicrosoftEntraIdOptions, MultiSessionConfig, OAUTH_POPUP_COMPLETE_SCRIPT, OAUTH_POPUP_DATA_ELEMENT_ID, OAUTH_POPUP_ERROR_CODES, OAUTH_POPUP_MESSAGE_TYPE, OAUTH_POPUP_SCRIPT_CSP_HASH, OAuthPopupData, OAuthPopupMessage, OAuthProxyOptions, OTPOptions, OktaOptions, OneTapOptions, OneTimeTokenOptions, OpenAPIModelSchema, OpenAPIOptions, OpenAPIParameter, OpenAPISchema, Organization, OrganizationCreator, OrganizationEndpoints, OrganizationInput, OrganizationOptions, OrganizationPlugin, OrganizationRole, OrganizationSchema, POPUP_MARKER_COOKIE, Path, PatreonOptions, PhoneNumberOptions, Provider, ResolvedSigningKey, Role, RoleAuthorizeRequest, RoleInput, RoleStatements, SIWEPluginOptions, SessionWithImpersonatedBy, SlackOptions, Statements, SubArray, Subset, TOTPOptions, TWO_FACTOR_ERROR_CODES, Team, TeamEndpoints, TeamInput, TeamMember, TeamMemberInput, TestAuthOptions, TestCookie, TestHelpers, TestUtilsOptions, TimeString, TwoFactorOptions, TwoFactorProvider, TwoFactorTable, USERNAME_ERROR_CODES, UserWithAnonymous, UserWithPhoneNumber, UserWithRole, UserWithTwoFactor, UsernameOptions, UsernamePlugin, UsernamePluginWithoutDisplayUsername, YandexOptions, admin, anonymous, auth0, backupCode2fa, bearer, captcha, createAccessControl, createJwk, customSession, defaultRolesSchema, deviceAuthorization, deviceAuthorizationOptionsSchema, emailOTP, encodeBackupCodes, generateBackupCodes, generateExportedKeyPair, generator, genericOAuth, getBackupCodes, getJwtToken, getOrgAdapter, gumroad, hasPermission, haveIBeenPwned, hubspot, invitationSchema, invitationStatus, isPasswordCompromised, jwt, keycloak, lastLoginMethod, line, magicLink, memberSchema, microsoftEntraId, ms, multiSession, oAuthProxy, oauthPopup, okta, oneTap, oneTimeToken, openAPI, organization, organizationRoleSchema, organizationSchema, otp2fa, parseRoles, patreon, phoneNumber, redeemDeviceCode, resolveSigningKey, role, roleSchema, sec, signJWT, siwe, slack, teamMemberSchema, teamSchema, testUtils, toExpJWT, totp2fa, twoFactor, twoFactorClient, username, verifyBackupCode, verifyJWT, yandex };

package/dist/plugins/test-utils/auth-helpers.mjs

@@ -1,10 +1,15 @@
 import { createCookieHeaders, createTestCookie } from "./cookie-builder.mjs";
+import { sessionSchema } from "@better-auth/core/db";
 //#region src/plugins/test-utils/auth-helpers.ts
+function createSession(ctx, opts) {
+	const additionalFields = Object.fromEntries(Object.entries(opts.session ?? {}).filter(([key]) => !Object.hasOwn(sessionSchema.shape, key)));
+	return ctx.internalAdapter.createSession(opts.userId, false, additionalFields, true);
+}
 function createLogin(ctx) {
 	return async (opts) => {
 		const user = await ctx.internalAdapter.findUserById(opts.userId);
 		if (!user) throw new Error(`User not found: ${opts.userId}`);
-		const session = await ctx.internalAdapter.createSession(opts.userId);
+		const session = await createSession(ctx, opts);
 		return {
 			session,
 			user,
@@ -16,12 +21,12 @@ function createLogin(ctx) {
 }
 function createGetAuthHeaders(ctx) {
 	return async (opts) => {
-		return createCookieHeaders(ctx, (await ctx.internalAdapter.createSession(opts.userId)).token);
+		return createCookieHeaders(ctx, (await createSession(ctx, opts)).token);
 	};
 }
 function createGetCookies(ctx) {
 	return async (opts) => {
-		return createTestCookie(ctx, (await ctx.internalAdapter.createSession(opts.userId)).token, opts.domain);
+		return createTestCookie(ctx, (await createSession(ctx, opts)).token, opts.domain);
 	};
 }
 //#endregion

package/dist/plugins/test-utils/index.d.mts

@@ -1,4 +1,4 @@
-import { LoginResult, TestCookie, TestHelpers, TestUtilsOptions } from "./types.mjs";
+import { LoginResult, TestAuthOptions, TestCookie, TestHelpers, TestUtilsOptions } from "./types.mjs";
 import * as _$_better_auth_core0 from "@better-auth/core";
 
 //#region src/plugins/test-utils/index.d.ts

package/dist/plugins/test-utils/types.d.mts

@@ -21,6 +21,12 @@ interface LoginResult {
   cookies: TestCookie[];
   token: string;
 }
+/** Options for creating a session with the test auth helpers. */
+interface TestAuthOptions {
+  userId: string;
+  /** Additional session fields. Standard session fields are ignored. */
+  session?: Record<string, unknown>;
+}
 interface TestHelpers {
   createUser(overrides?: Partial<User> & Record<string, unknown>): User;
   createOrganization?(overrides?: Record<string, unknown>): Record<string, unknown>;
@@ -33,18 +39,13 @@ interface TestHelpers {
   }): Promise<Record<string, unknown>>;
   deleteUser(userId: string): Promise<void>;
   deleteOrganization?(orgId: string): Promise<void>;
-  login(opts: {
-    userId: string;
-  }): Promise<LoginResult>;
-  getAuthHeaders(opts: {
-    userId: string;
-  }): Promise<Headers>;
-  getCookies(opts: {
-    userId: string;
+  login(opts: TestAuthOptions): Promise<LoginResult>;
+  getAuthHeaders(opts: TestAuthOptions): Promise<Headers>;
+  getCookies(opts: TestAuthOptions & {
     domain?: string;
   }): Promise<TestCookie[]>;
   getOTP?(identifier: string): string | undefined;
   clearOTPs?(): void;
 }
 //#endregion
-export { LoginResult, TestCookie, TestHelpers, TestUtilsOptions };
+export { LoginResult, TestAuthOptions, TestCookie, TestHelpers, TestUtilsOptions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "description": "The most comprehensive authentication framework for TypeScript.",
   "type": "module",
   "license": "MIT",
@@ -473,13 +473,13 @@
     "kysely": "^0.28.17 || ^0.29.0",
     "nanostores": "^1.3.0",
     "zod": "^4.5.4",
-    "@better-auth/core": "1.7.3",
-    "@better-auth/drizzle-adapter": "1.7.3",
-    "@better-auth/kysely-adapter": "1.7.3",
-    "@better-auth/memory-adapter": "1.7.3",
-    "@better-auth/mongo-adapter": "1.7.3",
-    "@better-auth/prisma-adapter": "1.7.3",
-    "@better-auth/telemetry": "1.7.3"
+    "@better-auth/core": "1.7.4",
+    "@better-auth/drizzle-adapter": "1.7.4",
+    "@better-auth/kysely-adapter": "1.7.4",
+    "@better-auth/memory-adapter": "1.7.4",
+    "@better-auth/mongo-adapter": "1.7.4",
+    "@better-auth/prisma-adapter": "1.7.4",
+    "@better-auth/telemetry": "1.7.4"
   },
   "devDependencies": {
     "@lynx-js/react": "^0.121.2",
@@ -496,7 +496,7 @@
     "@types/react-dom": "^19.2.3",
     "happy-dom": "^20.8.9",
     "msw": "^2.14.6",
-    "next": "^16.2.11",
+    "next": "^16.3.4",
     "oauth2-mock-server": "^9.0.0",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
@@ -504,7 +504,7 @@
     "tsdown": "0.21.10",
     "type-fest": "^5.7.0",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.10",
+    "vitest": "^5.0.0",
     "vue": "^3.5.29"
   },
   "peerDependencies": {
@@ -525,7 +525,7 @@
     "react-dom": "^18.0.0 || ^19.0.0",
     "solid-js": "^1.0.0",
     "svelte": "^4.0.0 || ^5.0.0",
-    "vitest": "^2.0.0 || ^3.0.0 || ^4.0.0",
+    "vitest": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0",
     "vue": "^3.0.0"
   },
   "peerDependenciesMeta": {