better-auth 0.4.6 → 0.4.7-beta.1

package/dist/adapters/drizzle.d.ts

@@ -1,4 +1,4 @@
-import { A as Adapter } from '../index-BJKlHmT9.js';
+import { A as Adapter } from '../index-DVWptxzL.js';
 import 'zod';
 import 'kysely';
 import '../types-IzAbV4nB.js';

package/dist/adapters/mongodb.d.ts

@@ -1,5 +1,5 @@
 import { Db } from 'mongodb';
-import { W as Where } from '../index-BJKlHmT9.js';
+import { W as Where } from '../index-DVWptxzL.js';
 import 'zod';
 import 'kysely';
 import '../types-IzAbV4nB.js';

package/dist/adapters/prisma.d.ts

@@ -1,4 +1,4 @@
-import { A as Adapter } from '../index-BJKlHmT9.js';
+import { A as Adapter } from '../index-DVWptxzL.js';
 import 'zod';
 import 'kysely';
 import '../types-IzAbV4nB.js';

package/dist/api.d.ts

@@ -1,4 +1,4 @@
-export { e as AuthEndpoint, f as AuthMiddleware, v as callbackOAuth, T as changePassword, d as createAuthEndpoint, c as createAuthMiddleware, M as createEmailVerificationToken, $ as csrfMiddleware, V as deleteUser, Y as error, J as forgetPassword, K as forgetPasswordCallback, X as getCSRFToken, r as getEndpoints, w as getSession, x as getSessionFromCtx, z as listSessions, Z as ok, o as optionsMiddleware, L as resetPassword, C as revokeSession, D as revokeSessions, s as router, N as sendVerificationEmail, y as sessionMiddleware, U as setPassword, u as signInEmail, t as signInOAuth, E as signOut, _ as signUpEmail, Q as updateUser, O as verifyEmail } from './index-BJKlHmT9.js';
+export { e as AuthEndpoint, f as AuthMiddleware, v as callbackOAuth, T as changePassword, d as createAuthEndpoint, c as createAuthMiddleware, M as createEmailVerificationToken, $ as csrfMiddleware, V as deleteUser, Y as error, J as forgetPassword, K as forgetPasswordCallback, X as getCSRFToken, r as getEndpoints, w as getSession, x as getSessionFromCtx, z as listSessions, Z as ok, o as optionsMiddleware, L as resetPassword, C as revokeSession, D as revokeSessions, s as router, N as sendVerificationEmail, y as sessionMiddleware, U as setPassword, u as signInEmail, t as signInOAuth, E as signOut, _ as signUpEmail, Q as updateUser, O as verifyEmail } from './index-DVWptxzL.js';
 import './helper-DPDj8Nix.js';
 import 'zod';
 export { APIError } from 'better-call';

package/dist/client/plugins.d.ts

@@ -2,10 +2,10 @@ import * as nanostores from 'nanostores';
 import { A as AccessControl, S as StatementsPrimitive, R as Role } from '../statement-CfnyN34h.js';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetchOption } from '@better-fetch/fetch';
-import { o as organization, j as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber, e as anonymous, i as admin } from '../index-DFhZxdCd.js';
-export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-DFhZxdCd.js';
+import { o as organization, j as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber, e as anonymous, i as admin } from '../index-D6gELhZi.js';
+export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-D6gELhZi.js';
 import { P as Prettify } from '../helper-DPDj8Nix.js';
-import { F as FieldAttribute, B as BetterAuthOptions, b as BetterAuthPlugin } from '../index-BJKlHmT9.js';
+import { F as FieldAttribute, B as BetterAuthOptions, b as BetterAuthPlugin } from '../index-DVWptxzL.js';
 import * as better_call from 'better-call';
 import { z } from 'zod';
 import { O as OAuth2Tokens, U as User } from '../types-IzAbV4nB.js';

package/dist/client.d.ts

@@ -6,7 +6,7 @@ import { BetterFetch, BetterFetchError, BetterFetchOption } from '@better-fetch/
 import { U as UnionToIntersection, P as Prettify, S as StripEmptyObjects } from './helper-DPDj8Nix.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, InferSessionFromClient, InferUserFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
 export { AtomListener, InferPluginsFromClient } from './types.js';
-import './index-BJKlHmT9.js';
+import './index-DVWptxzL.js';
 import 'kysely';
 import './types-IzAbV4nB.js';
 import 'better-call';

package/dist/{index-DFhZxdCd.d.ts → index-D6gELhZi.d.ts}

@@ -5,7 +5,7 @@ import { P as Prettify } from './helper-DPDj8Nix.js';
 import { A as AccessControl, R as Role, S as StatementsPrimitive, g as defaultRoles } from './statement-CfnyN34h.js';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetch, BetterFetchOption } from '@better-fetch/fetch';
-import { H as HookEndpointContext, g as AuthContext } from './index-BJKlHmT9.js';
+import { H as HookEndpointContext, g as AuthContext } from './index-DVWptxzL.js';
 import * as nanostores from 'nanostores';
 import { atom } from 'nanostores';
 import * as _simplewebauthn_types from '@simplewebauthn/types';
@@ -3833,13 +3833,7 @@ declare const passkey: (options?: PasskeyOptions) => {
             }>]>(...ctx: C): Promise<C extends [{
                 asResponse: true;
             }] ? Response : {
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
+                session: any;
             }>;
             path: "/passkey/verify-authentication";
             options: {
@@ -4059,13 +4053,7 @@ declare const username: () => {
                     updatedAt: Date;
                     image?: string | undefined;
                 };
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
+                session: any;
                 redirect: boolean;
                 url: string | undefined;
             } | null>;
@@ -4120,22 +4108,8 @@ declare const username: () => {
             }>]>(...ctx: C): Promise<C extends [{
                 asResponse: true;
             }] ? Response : {
-                user: {
-                    id: string;
-                    email: string;
-                    emailVerified: boolean;
-                    name: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    image?: string | undefined;
-                } | null;
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
+                user: any;
+                session: any;
             } | null>;
             path: "/sign-up/username";
             options: {
@@ -4344,13 +4318,7 @@ declare const phoneNumber: (options?: {
                     updatedAt: Date;
                     image?: string | undefined;
                 };
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
+                session: any;
                 redirect: boolean;
                 url: string | undefined;
             } | null>;
@@ -4405,22 +4373,8 @@ declare const phoneNumber: (options?: {
             }>]>(...ctx: C): Promise<C extends [{
                 asResponse: true;
             }] ? Response : {
-                user: {
-                    id: string;
-                    email: string;
-                    emailVerified: boolean;
-                    name: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    image?: string | undefined;
-                } | null;
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
+                user: any;
+                session: any;
             }>;
             path: "/sign-up/phone-number";
             options: {
@@ -4497,16 +4451,7 @@ declare const phoneNumber: (options?: {
                 asResponse: true;
             }] ? Response : {
                 user: UserWithPhoneNumber;
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
-            } | {
-                user: UserWithPhoneNumber;
-                session: null;
+                session: any;
             }>;
             path: "/phone-number/verify";
             options: {
@@ -4640,13 +4585,7 @@ declare const anonymous: (options?: AnonymousOptions) => {
                     updatedAt: Date;
                     image?: string | undefined;
                 };
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
+                session: any;
             } | null>;
             path: "/sign-in/anonymous";
             options: {
@@ -4691,22 +4630,8 @@ declare const anonymous: (options?: AnonymousOptions) => {
             }>]>(...ctx: C): Promise<C extends [{
                 asResponse: true;
             }] ? Response : {
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
-                user: {
-                    id: string;
-                    email: string;
-                    emailVerified: boolean;
-                    name: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    image?: string | undefined;
-                };
+                session: any;
+                user: any;
             } | null>;
             path: "/user/link-anonymous";
             options: {
@@ -5152,15 +5077,7 @@ declare const admin: (options?: AdminOptions) => {
             }>]>(...ctx: C): Promise<C extends [{
                 asResponse: true;
             }] ? Response : {
-                user: {
-                    id: string;
-                    email: string;
-                    emailVerified: boolean;
-                    name: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    image?: string | undefined;
-                } | null;
+                user: any;
             }>;
             path: "/admin/unban-user";
             options: {
@@ -5225,15 +5142,7 @@ declare const admin: (options?: AdminOptions) => {
             }>]>(...ctx: C): Promise<C extends [{
                 asResponse: true;
             }] ? Response : {
-                user: {
-                    id: string;
-                    email: string;
-                    emailVerified: boolean;
-                    name: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    image?: string | undefined;
-                } | null;
+                user: any;
             }>;
             path: "/admin/ban-user";
             options: {
@@ -5298,13 +5207,7 @@ declare const admin: (options?: AdminOptions) => {
             }>]>(...ctx: C): Promise<C extends [{
                 asResponse: true;
             }] ? Response : {
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
+                session: any;
                 user: {
                     id: string;
                     email: string;

package/dist/{index-BJKlHmT9.d.ts → index-DVWptxzL.d.ts}

@@ -977,26 +977,8 @@ declare const createInternalAdapter: (adapter: Adapter, ctx: {
     hooks: Exclude<BetterAuthOptions["databaseHooks"], undefined>[];
 }) => {
     createOAuthUser: (user: User, account: Account) => Promise<{
-        user: {
-            id: string;
-            email: string;
-            emailVerified: boolean;
-            name: string;
-            createdAt: Date;
-            updatedAt: Date;
-            image?: string | undefined;
-        } | null;
-        account: {
-            id: string;
-            providerId: string;
-            accountId: string;
-            userId: string;
-            accessToken?: string | null | undefined;
-            refreshToken?: string | null | undefined;
-            idToken?: string | null | undefined;
-            expiresAt?: Date | null | undefined;
-            password?: string | null | undefined;
-        } | null;
+        user: any;
+        account: any;
     } | null>;
     createUser: <T>(user: Omit<User, "id" | "createdAt" | "updatedAt" | "emailVerified"> & Partial<User> & Record<string, any>) => Promise<T & {
         id: string;
@@ -1027,24 +1009,12 @@ declare const createInternalAdapter: (adapter: Adapter, ctx: {
         image?: string | undefined;
     }[]>;
     deleteUser: (userId: string) => Promise<void>;
-    createSession: (userId: string, request?: Request | Headers, dontRememberMe?: boolean, override?: Partial<Session> & Record<string, any>) => Promise<{
-        id: string;
-        userId: string;
-        expiresAt: Date;
-        ipAddress?: string | undefined;
-        userAgent?: string | undefined;
-    }>;
+    createSession: (userId: string, request?: Request | Headers, dontRememberMe?: boolean, override?: Partial<Session> & Record<string, any>) => Promise<any>;
     findSession: (sessionId: string) => Promise<{
         session: Session;
         user: User;
     } | null>;
-    updateSession: (sessionId: string, session: Partial<Session>) => Promise<{
-        id: string;
-        userId: string;
-        expiresAt: Date;
-        ipAddress?: string | undefined;
-        userAgent?: string | undefined;
-    } | null>;
+    updateSession: (sessionId: string, session: Partial<Session>) => Promise<any>;
     deleteSession: (id: string) => Promise<void>;
     deleteSessions: (userId: string) => Promise<void>;
     findUserByEmail: (email: string, options?: {
@@ -1080,46 +1050,10 @@ declare const createInternalAdapter: (adapter: Adapter, ctx: {
         updatedAt: Date;
         image?: string | undefined;
     } | null>;
-    linkAccount: (account: Omit<Account, "id"> & Partial<Account>) => Promise<{
-        providerId: string;
-        accountId: string;
-        userId: string;
-        accessToken?: string | null | undefined;
-        refreshToken?: string | null | undefined;
-        idToken?: string | null | undefined;
-        expiresAt?: Date | null | undefined;
-        password?: string | null | undefined;
-        id: string;
-    } | null>;
-    updateUser: (userId: string, data: Partial<User> & Record<string, any>) => Promise<{
-        id: string;
-        email: string;
-        emailVerified: boolean;
-        name: string;
-        createdAt: Date;
-        updatedAt: Date;
-        image?: string | undefined;
-    } | null>;
-    updateUserByEmail: (email: string, data: Partial<User & Record<string, any>>) => Promise<{
-        id: string;
-        email: string;
-        emailVerified: boolean;
-        name: string;
-        createdAt: Date;
-        updatedAt: Date;
-        image?: string | undefined;
-    } | null>;
-    updatePassword: (userId: string, password: string) => Promise<{
-        id: string;
-        providerId: string;
-        accountId: string;
-        userId: string;
-        accessToken?: string | null | undefined;
-        refreshToken?: string | null | undefined;
-        idToken?: string | null | undefined;
-        expiresAt?: Date | null | undefined;
-        password?: string | null | undefined;
-    } | null>;
+    linkAccount: (account: Omit<Account, "id"> & Partial<Account>) => Promise<any>;
+    updateUser: (userId: string, data: Partial<User> & Record<string, any>) => Promise<any>;
+    updateUserByEmail: (email: string, data: Partial<User & Record<string, any>>) => Promise<any>;
+    updatePassword: (userId: string, password: string) => Promise<any>;
     findAccounts: (userId: string) => Promise<{
         id: string;
         providerId: string;
@@ -1131,23 +1065,8 @@ declare const createInternalAdapter: (adapter: Adapter, ctx: {
         expiresAt?: Date | null | undefined;
         password?: string | null | undefined;
     }[]>;
-    updateAccount: (accountId: string, data: Partial<Account>) => Promise<{
-        id: string;
-        providerId: string;
-        accountId: string;
-        userId: string;
-        accessToken?: string | null | undefined;
-        refreshToken?: string | null | undefined;
-        idToken?: string | null | undefined;
-        expiresAt?: Date | null | undefined;
-        password?: string | null | undefined;
-    } | null>;
-    createVerificationValue: (data: Omit<Verification, "id">) => Promise<{
-        expiresAt: Date;
-        value: string;
-        identifier: string;
-        id: string;
-    } | null>;
+    updateAccount: (accountId: string, data: Partial<Account>) => Promise<any>;
+    createVerificationValue: (data: Omit<Verification, "id">) => Promise<any>;
     findVerificationValue: (identifier: string) => Promise<{
         id: string;
         expiresAt: Date;
@@ -1155,12 +1074,7 @@ declare const createInternalAdapter: (adapter: Adapter, ctx: {
         identifier: string;
     } | null>;
     deleteVerificationValue: (id: string) => Promise<void>;
-    updateVerificationValue: (id: string, data: Partial<Verification>) => Promise<{
-        id: string;
-        expiresAt: Date;
-        value: string;
-        identifier: string;
-    } | null>;
+    updateVerificationValue: (id: string, data: Partial<Verification>) => Promise<any>;
 };
 
 declare const signInOAuth: {
@@ -1272,13 +1186,7 @@ declare const signInEmail: {
             updatedAt: Date;
             image?: string | undefined;
         };
-        session: {
-            id: string;
-            userId: string;
-            expiresAt: Date;
-            ipAddress?: string | undefined;
-            userAgent?: string | undefined;
-        };
+        session: any;
         redirect: boolean;
         url: string | undefined;
     }>;
@@ -1885,15 +1793,7 @@ declare const updateUser: {
     }>]>(...ctx: C): Promise<C extends [{
         asResponse: true;
     }] ? Response : {
-        user: {
-            id: string;
-            email: string;
-            emailVerified: boolean;
-            name: string;
-            createdAt: Date;
-            updatedAt: Date;
-            image?: string | undefined;
-        } | null;
+        user: any;
     }>;
     path: "/user/update";
     options: {
@@ -2340,13 +2240,7 @@ declare const signUpEmail: <O extends BetterAuthOptions>() => {
             updatedAt: Date;
             image?: string | undefined;
         };
-        session: {
-            id: string;
-            userId: string;
-            expiresAt: Date;
-            ipAddress?: string | undefined;
-            userAgent?: string | undefined;
-        };
+        session: any;
         error: null;
     }>;
     path: "/sign-up/email";
@@ -2701,13 +2595,7 @@ declare function getEndpoints<C extends AuthContext, Option extends BetterAuthOp
                     updatedAt: Date;
                     image?: string | undefined;
                 };
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
+                session: any;
                 error: null;
             }>;
             path: "/sign-up/email";
@@ -2771,13 +2659,7 @@ declare function getEndpoints<C extends AuthContext, Option extends BetterAuthOp
                     updatedAt: Date;
                     image?: string | undefined;
                 };
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
+                session: any;
                 redirect: boolean;
                 url: string | undefined;
             }>;
@@ -3178,15 +3060,7 @@ declare function getEndpoints<C extends AuthContext, Option extends BetterAuthOp
             }>]>(...ctx: C_1): Promise<C_1 extends [{
                 asResponse: true;
             }] ? Response : {
-                user: {
-                    id: string;
-                    email: string;
-                    emailVerified: boolean;
-                    name: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    image?: string | undefined;
-                } | null;
+                user: any;
             }>;
             path: "/user/update";
             options: {
@@ -3810,13 +3684,7 @@ declare const router: <C extends AuthContext, Option extends BetterAuthOptions>(
                     updatedAt: Date;
                     image?: string | undefined;
                 };
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
+                session: any;
                 error: null;
             }>;
             path: "/sign-up/email";
@@ -3880,13 +3748,7 @@ declare const router: <C extends AuthContext, Option extends BetterAuthOptions>(
                     updatedAt: Date;
                     image?: string | undefined;
                 };
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
+                session: any;
                 redirect: boolean;
                 url: string | undefined;
             }>;
@@ -4287,15 +4149,7 @@ declare const router: <C extends AuthContext, Option extends BetterAuthOptions>(
             }>]>(...ctx: C_1): Promise<C_1 extends [{
                 asResponse: true;
             }] ? Response : {
-                user: {
-                    id: string;
-                    email: string;
-                    emailVerified: boolean;
-                    name: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    image?: string | undefined;
-                } | null;
+                user: any;
             }>;
             path: "/user/update";
             options: {
@@ -4921,13 +4775,7 @@ declare const betterAuth: <O extends BetterAuthOptions>(options: O) => {
                     updatedAt: Date;
                     image?: string | undefined;
                 };
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
+                session: any;
                 error: null;
             }>;
             path: "/sign-up/email";
@@ -4991,13 +4839,7 @@ declare const betterAuth: <O extends BetterAuthOptions>(options: O) => {
                     updatedAt: Date;
                     image?: string | undefined;
                 };
-                session: {
-                    id: string;
-                    userId: string;
-                    expiresAt: Date;
-                    ipAddress?: string | undefined;
-                    userAgent?: string | undefined;
-                };
+                session: any;
                 redirect: boolean;
                 url: string | undefined;
             }>;
@@ -5398,15 +5240,7 @@ declare const betterAuth: <O extends BetterAuthOptions>(options: O) => {
             }>]>(...ctx: C): Promise<C extends [{
                 asResponse: true;
             }] ? Response : {
-                user: {
-                    id: string;
-                    email: string;
-                    emailVerified: boolean;
-                    name: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    image?: string | undefined;
-                } | null;
+                user: any;
             }>;
             path: "/user/update";
             options: {

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { a as Auth, a0 as betterAuth } from './index-BJKlHmT9.js';
+export { a as Auth, a0 as betterAuth } from './index-DVWptxzL.js';
 import 'zod';
 import 'kysely';
 import './types-IzAbV4nB.js';

package/dist/index.js

@@ -3617,7 +3617,7 @@ var verifyPassword = async (hash, password) => {
 function getWithHooks(adapter, ctx) {
   const hooks = ctx.hooks;
   const tables = getAuthTables(ctx.options);
-  async function createWithHooks(data, model) {
+  async function createWithHooks(data, model, customCreateFn) {
     let actualData = data;
     const table = tables[model];
     for (const hook of hooks || []) {
@@ -3633,13 +3633,14 @@ function getWithHooks(adapter, ctx) {
         }
       }
     }
-    const created = await adapter.create({
+    const customCreated = customCreateFn ? await customCreateFn.fn(actualData) : null;
+    const created = !customCreateFn || customCreateFn.executeMainFn ? await adapter.create({
       model: table.tableName,
       data: {
         id: generateId(),
         ...convertToDB(table.fields, actualData)
       }
-    });
+    }) : customCreated;
     for (const hook of hooks || []) {
       const toRun = hook[model]?.create?.after;
       if (toRun) {
@@ -3648,7 +3649,7 @@ function getWithHooks(adapter, ctx) {
     }
     return convertFromDB(table.fields, created);
   }
-  async function updateWithHooks(data, where, model) {
+  async function updateWithHooks(data, where, model, customUpdateFn) {
     let actualData = data;
     for (const hook of hooks || []) {
       const toRun = hook[model]?.update?.before;
@@ -3661,11 +3662,12 @@ function getWithHooks(adapter, ctx) {
         actualData = isObject ? result.data : result;
       }
     }
-    const updated = await adapter.update({
+    const customUpdated = customUpdateFn ? await customUpdateFn.fn(actualData) : null;
+    const updated = !customUpdateFn || customUpdateFn.executeMainFn ? await adapter.update({
       model: tables[model].tableName,
       update: convertToDB(tables[model].fields, actualData),
       where
-    });
+    }) : customUpdated;
     for (const hook of hooks || []) {
       const toRun = hook[model]?.update?.after;
       if (toRun) {
@@ -3779,26 +3781,28 @@ var createInternalAdapter = (adapter, ctx) => {
         userAgent: headers?.get("user-agent") || "",
         ...override
       };
-      if (secondaryStorage) {
-        const user = await adapter.findOne({
-          model: tables.user.tableName,
-          where: [{ field: "id", value: userId }]
-        });
-        secondaryStorage.set(
-          data.id,
-          JSON.stringify({
-            session: data,
-            user
-          }),
-          sessionExpiration
-        );
-        if (options.session?.storeSessionInDatabase) {
-          await createWithHooks(data, "session");
-        }
-      } else {
-        await createWithHooks(data, "session");
-      }
-      return data;
+      const res = await createWithHooks(
+        data,
+        "session",
+        secondaryStorage ? {
+          fn: async (data2) => {
+            const user = await adapter.findOne({
+              model: tables.user.tableName,
+              where: [{ field: "id", value: userId }]
+            });
+            secondaryStorage.set(
+              data2.id,
+              JSON.stringify({
+                session: data2,
+                user
+              }),
+              sessionExpiration
+            );
+          },
+          executeMainFn: options.session?.storeSessionInDatabase
+        } : void 0
+      );
+      return res;
     },
     findSession: async (sessionId) => {
       if (secondaryStorage) {
@@ -3848,39 +3852,34 @@ var createInternalAdapter = (adapter, ctx) => {
       };
     },
     updateSession: async (sessionId, session) => {
-      if (secondaryStorage) {
-        const currentSession = await secondaryStorage.get(sessionId);
-        let updatedSession2 = null;
-        if (currentSession) {
-          const parsedSession = JSON.parse(currentSession);
-          updatedSession2 = {
-            ...parsedSession.session,
-            ...session
-          };
-          await secondaryStorage.set(
-            sessionId,
-            JSON.stringify({
-              session: updatedSession2,
-              user: parsedSession.user
-            }),
-            parsedSession.session.expiresAt ? new Date(parsedSession.session.expiresAt).getTime() : void 0
-          );
-        } else {
-          return null;
-        }
-        if (options.session?.storeSessionInDatabase) {
-          await updateWithHooks(
-            session,
-            [{ field: "id", value: sessionId }],
-            "session"
-          );
-        }
-        return updatedSession2;
-      }
       const updatedSession = await updateWithHooks(
         session,
         [{ field: "id", value: sessionId }],
-        "session"
+        "session",
+        secondaryStorage ? {
+          async fn(data) {
+            const currentSession = await secondaryStorage.get(sessionId);
+            let updatedSession2 = null;
+            if (currentSession) {
+              const parsedSession = JSON.parse(currentSession);
+              updatedSession2 = {
+                ...parsedSession.session,
+                ...data
+              };
+              await secondaryStorage.set(
+                sessionId,
+                JSON.stringify({
+                  session: updatedSession2,
+                  user: parsedSession.user
+                }),
+                parsedSession.session.expiresAt ? new Date(parsedSession.session.expiresAt).getTime() : void 0
+              );
+            } else {
+              return null;
+            }
+          },
+          executeMainFn: options.session?.storeSessionInDatabase
+        } : void 0
       );
       return updatedSession;
     },

package/dist/next-js.d.ts

@@ -1,4 +1,4 @@
-import { a as Auth } from './index-BJKlHmT9.js';
+import { a as Auth } from './index-DVWptxzL.js';
 import { U as User, S as Session } from './types-IzAbV4nB.js';
 import { NextRequest } from 'next/server';
 import 'zod';

package/dist/node.d.ts

@@ -1,5 +1,5 @@
 import * as http from 'http';
-import { a as Auth } from './index-BJKlHmT9.js';
+import { a as Auth } from './index-DVWptxzL.js';
 import 'zod';
 import 'kysely';
 import './types-IzAbV4nB.js';

package/dist/plugins.d.ts

@@ -1,7 +1,7 @@
-export { A as AnonymousOptions, O as OrganizationOptions, b as Passkey, P as PasskeyOptions, U as UserWithPhoneNumber, f as UserWithRole, i as admin, h as adminMiddleware, e as anonymous, g as getPasskeyActions, m as magicLink, o as organization, p as passkey, c as passkeyClient, d as phoneNumber, t as twoFactor, a as twoFactorClient, u as username } from './index-DFhZxdCd.js';
+export { A as AnonymousOptions, O as OrganizationOptions, b as Passkey, P as PasskeyOptions, U as UserWithPhoneNumber, f as UserWithRole, i as admin, h as adminMiddleware, e as anonymous, g as getPasskeyActions, m as magicLink, o as organization, p as passkey, c as passkeyClient, d as phoneNumber, t as twoFactor, a as twoFactorClient, u as username } from './index-D6gELhZi.js';
 export { i as ac } from './index-DfAHOgpj.js';
-import { H as HookEndpointContext } from './index-BJKlHmT9.js';
-export { e as AuthEndpoint, f as AuthMiddleware, b as BetterAuthPlugin, P as PluginSchema, d as createAuthEndpoint, c as createAuthMiddleware, o as optionsMiddleware } from './index-BJKlHmT9.js';
+import { H as HookEndpointContext } from './index-DVWptxzL.js';
+export { e as AuthEndpoint, f as AuthMiddleware, b as BetterAuthPlugin, P as PluginSchema, d as createAuthEndpoint, c as createAuthMiddleware, o as optionsMiddleware } from './index-DVWptxzL.js';
 import './types-IzAbV4nB.js';
 import 'zod';
 import './helper-DPDj8Nix.js';

package/dist/react.d.ts

@@ -3,7 +3,7 @@ import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { U as UnionToIntersection, P as Prettify, S as StripEmptyObjects } from './helper-DPDj8Nix.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
 import { useStore } from '@nanostores/react';
-import './index-BJKlHmT9.js';
+import './index-DVWptxzL.js';
 import 'kysely';
 import './types-IzAbV4nB.js';
 import 'better-call';

package/dist/solid-start.d.ts

@@ -1,4 +1,4 @@
-import { a as Auth } from './index-BJKlHmT9.js';
+import { a as Auth } from './index-DVWptxzL.js';
 import 'zod';
 import 'kysely';
 import './types-IzAbV4nB.js';

package/dist/solid.d.ts

@@ -3,7 +3,7 @@ import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { U as UnionToIntersection, P as Prettify, S as StripEmptyObjects } from './helper-DPDj8Nix.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
 import { Accessor } from 'solid-js';
-import './index-BJKlHmT9.js';
+import './index-DVWptxzL.js';
 import 'kysely';
 import './types-IzAbV4nB.js';
 import 'better-call';

package/dist/svelte-kit.d.ts

@@ -1,4 +1,4 @@
-import { a as Auth, B as BetterAuthOptions } from './index-BJKlHmT9.js';
+import { a as Auth, B as BetterAuthOptions } from './index-DVWptxzL.js';
 import 'zod';
 import 'kysely';
 import './types-IzAbV4nB.js';

package/dist/svelte.d.ts

@@ -3,7 +3,7 @@ import * as nanostores from 'nanostores';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { U as UnionToIntersection, P as Prettify, S as StripEmptyObjects } from './helper-DPDj8Nix.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
-import './index-BJKlHmT9.js';
+import './index-DVWptxzL.js';
 import 'kysely';
 import './types-IzAbV4nB.js';
 import 'better-call';

package/dist/types.d.ts

@@ -1,5 +1,5 @@
-import { b as BetterAuthPlugin, a as Auth, I as InferFieldsInputClient, h as InferFieldsOutput } from './index-BJKlHmT9.js';
-export { A as Adapter, k as AdditionalSessionFieldsInput, l as AdditionalSessionFieldsOutput, i as AdditionalUserFieldsInput, j as AdditionalUserFieldsOutput, g as AuthContext, B as BetterAuthOptions, G as GenericEndpointContext, H as HookEndpointContext, p as InferPluginTypes, n as InferSession, m as InferUser, P as PluginSchema, R as RateLimit, S as SecondaryStorage, W as Where, q as init } from './index-BJKlHmT9.js';
+import { b as BetterAuthPlugin, a as Auth, I as InferFieldsInputClient, h as InferFieldsOutput } from './index-DVWptxzL.js';
+export { A as Adapter, k as AdditionalSessionFieldsInput, l as AdditionalSessionFieldsOutput, i as AdditionalUserFieldsInput, j as AdditionalUserFieldsOutput, g as AuthContext, B as BetterAuthOptions, G as GenericEndpointContext, H as HookEndpointContext, p as InferPluginTypes, n as InferSession, m as InferUser, P as PluginSchema, R as RateLimit, S as SecondaryStorage, W as Where, q as init } from './index-DVWptxzL.js';
 import { U as UnionToIntersection, H as HasRequiredKeys, P as Prettify, S as StripEmptyObjects, L as LiteralString } from './helper-DPDj8Nix.js';
 export { D as DeepPartial, a as LiteralUnion, R as RequiredKeysOf, W as WithoutEmpty } from './helper-DPDj8Nix.js';
 import { S as Session, U as User } from './types-IzAbV4nB.js';

package/dist/vue.d.ts

@@ -3,7 +3,7 @@ import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { U as UnionToIntersection, P as Prettify, S as StripEmptyObjects } from './helper-DPDj8Nix.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
 import { Ref, DeepReadonly } from 'vue';
-import './index-BJKlHmT9.js';
+import './index-DVWptxzL.js';
 import 'kysely';
 import './types-IzAbV4nB.js';
 import 'better-call';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth",
-  "version": "0.4.6",
+  "version": "0.4.7-beta.1",
   "description": "The most comprehensive authentication library for TypeScript.",
   "type": "module",
   "main": "./dist/index.js",