better-auth 1.2.0-beta.1 → 1.2.0-beta.11

package/dist/{chunk-WDOY7YUW.cjs → chunk-6P33VPUY.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkB5UCLTPZ_cjs = require('./chunk-B5UCLTPZ.cjs');
+var chunkUQC2FUXC_cjs = require('./chunk-UQC2FUXC.cjs');
 var chunkH74YRRNV_cjs = require('./chunk-H74YRRNV.cjs');
 var chunkOA7Z7IZT_cjs = require('./chunk-OA7Z7IZT.cjs');
 var chunk2HPSCSV7_cjs = require('./chunk-2HPSCSV7.cjs');
@@ -87,18 +87,21 @@ var createKyselyAdapter = async (config) => {
 // src/db/with-hooks.ts
 function getWithHooks(adapter, ctx) {
   const hooks = ctx.hooks;
-  async function createWithHooks(data, model, customCreateFn) {
+  async function createWithHooks(data, model, customCreateFn, context) {
     let actualData = data;
     for (const hook of hooks || []) {
       const toRun = hook[model]?.create?.before;
       if (toRun) {
-        const result = await toRun(data);
+        const result = await toRun(actualData, context);
         if (result === false) {
           return null;
         }
         const isObject = typeof result === "object" && "data" in result;
         if (isObject) {
-          actualData = result.data;
+          actualData = {
+            ...actualData,
+            ...result.data
+          };
         }
       }
     }
@@ -110,17 +113,17 @@ function getWithHooks(adapter, ctx) {
     for (const hook of hooks || []) {
       const toRun = hook[model]?.create?.after;
       if (toRun) {
-        await toRun(created);
+        await toRun(created, context);
       }
     }
     return created;
   }
-  async function updateWithHooks(data, where, model, customUpdateFn) {
+  async function updateWithHooks(data, where, model, customUpdateFn, context) {
     let actualData = data;
     for (const hook of hooks || []) {
       const toRun = hook[model]?.update?.before;
       if (toRun) {
-        const result = await toRun(data);
+        const result = await toRun(data, context);
         if (result === false) {
           return null;
         }
@@ -137,17 +140,17 @@ function getWithHooks(adapter, ctx) {
     for (const hook of hooks || []) {
       const toRun = hook[model]?.update?.after;
       if (toRun) {
-        await toRun(updated);
+        await toRun(updated, context);
       }
     }
     return updated;
   }
-  async function updateManyWithHooks(data, where, model, customUpdateFn) {
+  async function updateManyWithHooks(data, where, model, customUpdateFn, context) {
     let actualData = data;
     for (const hook of hooks || []) {
       const toRun = hook[model]?.update?.before;
       if (toRun) {
-        const result = await toRun(data);
+        const result = await toRun(data, context);
         if (result === false) {
           return null;
         }
@@ -164,7 +167,7 @@ function getWithHooks(adapter, ctx) {
     for (const hook of hooks || []) {
       const toRun = hook[model]?.update?.after;
       if (toRun) {
-        await toRun(updated);
+        await toRun(updated, context);
       }
     }
     return updated;
@@ -183,14 +186,16 @@ var createInternalAdapter = (adapter, ctx) => {
   const sessionExpiration = options.session?.expiresIn || 60 * 60 * 24 * 7;
   const { createWithHooks, updateWithHooks, updateManyWithHooks } = getWithHooks(adapter, ctx);
   return {
-    createOAuthUser: async (user, account) => {
+    createOAuthUser: async (user, account, context) => {
       const createdUser = await createWithHooks(
         {
           createdAt: /* @__PURE__ */ new Date(),
           updatedAt: /* @__PURE__ */ new Date(),
           ...user
         },
-        "user"
+        "user",
+        void 0,
+        context
       );
       const createdAccount = await createWithHooks(
         {
@@ -199,14 +204,16 @@ var createInternalAdapter = (adapter, ctx) => {
           createdAt: /* @__PURE__ */ new Date(),
           updatedAt: /* @__PURE__ */ new Date()
         },
-        "account"
+        "account",
+        void 0,
+        context
       );
       return {
         user: createdUser,
         account: createdAccount
       };
     },
-    createUser: async (user) => {
+    createUser: async (user, context) => {
       const createdUser = await createWithHooks(
         {
           createdAt: /* @__PURE__ */ new Date(),
@@ -215,18 +222,22 @@ var createInternalAdapter = (adapter, ctx) => {
           ...user,
           email: user.email.toLowerCase()
         },
-        "user"
+        "user",
+        void 0,
+        context
       );
       return createdUser;
     },
-    createAccount: async (account) => {
+    createAccount: async (account, context) => {
       const createdAccount = await createWithHooks(
         {
           createdAt: /* @__PURE__ */ new Date(),
           updatedAt: /* @__PURE__ */ new Date(),
           ...account
         },
-        "account"
+        "account",
+        void 0,
+        context
       );
       return createdAccount;
     },
@@ -244,7 +255,7 @@ var createInternalAdapter = (adapter, ctx) => {
           const sessionStringified = await secondaryStorage.get(session.token);
           if (sessionStringified) {
             const s = JSON.parse(sessionStringified);
-            const parsedSession = chunkB5UCLTPZ_cjs.parseSessionOutput(ctx.options, {
+            const parsedSession = chunkUQC2FUXC_cjs.parseSessionOutput(ctx.options, {
               ...s.session,
               expiresAt: new Date(s.session.expiresAt)
             });
@@ -274,6 +285,12 @@ var createInternalAdapter = (adapter, ctx) => {
       });
       return users;
     },
+    countTotalUsers: async () => {
+      const total = await adapter.count({
+        model: "user"
+      });
+      return total;
+    },
     deleteUser: async (userId) => {
       if (secondaryStorage) {
         await secondaryStorage.delete(`active-sessions-${userId}`);
@@ -308,11 +325,11 @@ var createInternalAdapter = (adapter, ctx) => {
         ]
       });
     },
-    createSession: async (userId, request, dontRememberMe, override) => {
+    createSession: async (userId, request, dontRememberMe, override, context, overrideAll) => {
       const headers = request instanceof Request ? request.headers : request;
       const { id: _, ...rest } = override || {};
       const data = {
-        ipAddress: request ? chunkB5UCLTPZ_cjs.getIp(request, ctx.options) || "" : "",
+        ipAddress: request ? chunkUQC2FUXC_cjs.getIp(request, ctx.options) || "" : "",
         userAgent: headers?.get("user-agent") || "",
         ...rest,
         /**
@@ -324,7 +341,8 @@ var createInternalAdapter = (adapter, ctx) => {
         userId,
         token: chunkH74YRRNV_cjs.generateId(32),
         createdAt: /* @__PURE__ */ new Date(),
-        updatedAt: /* @__PURE__ */ new Date()
+        updatedAt: /* @__PURE__ */ new Date(),
+        ...overrideAll ? rest : {}
       };
       const res = await createWithHooks(
         data,
@@ -352,7 +370,8 @@ var createInternalAdapter = (adapter, ctx) => {
             return sessionData;
           },
           executeMainFn: options.session?.storeSessionInDatabase
-        } : void 0
+        } : void 0,
+        context
       );
       return res;
     },
@@ -363,13 +382,13 @@ var createInternalAdapter = (adapter, ctx) => {
           return null;
         }
         const s = JSON.parse(sessionStringified);
-        const parsedSession2 = chunkB5UCLTPZ_cjs.parseSessionOutput(ctx.options, {
+        const parsedSession2 = chunkUQC2FUXC_cjs.parseSessionOutput(ctx.options, {
           ...s.session,
           expiresAt: new Date(s.session.expiresAt),
           createdAt: new Date(s.session.createdAt),
           updatedAt: new Date(s.session.updatedAt)
         });
-        const parsedUser2 = chunkB5UCLTPZ_cjs.parseUserOutput(ctx.options, {
+        const parsedUser2 = chunkUQC2FUXC_cjs.parseUserOutput(ctx.options, {
           ...s.user,
           createdAt: new Date(s.user.createdAt),
           updatedAt: new Date(s.user.updatedAt)
@@ -403,8 +422,8 @@ var createInternalAdapter = (adapter, ctx) => {
       if (!user) {
         return null;
       }
-      const parsedSession = chunkB5UCLTPZ_cjs.parseSessionOutput(ctx.options, session);
-      const parsedUser = chunkB5UCLTPZ_cjs.parseUserOutput(ctx.options, user);
+      const parsedSession = chunkUQC2FUXC_cjs.parseSessionOutput(ctx.options, session);
+      const parsedUser = chunkUQC2FUXC_cjs.parseUserOutput(ctx.options, user);
       return {
         session: parsedSession,
         user: parsedUser
@@ -466,7 +485,7 @@ var createInternalAdapter = (adapter, ctx) => {
         };
       });
     },
-    updateSession: async (sessionToken, session) => {
+    updateSession: async (sessionToken, session, context) => {
       const updatedSession = await updateWithHooks(
         session,
         [{ field: "token", value: sessionToken }],
@@ -487,7 +506,8 @@ var createInternalAdapter = (adapter, ctx) => {
             }
           },
           executeMainFn: options.session?.storeSessionInDatabase
-        } : void 0
+        } : void 0,
+        context
       );
       return updatedSession;
     },
@@ -672,18 +692,20 @@ var createInternalAdapter = (adapter, ctx) => {
       });
       return user;
     },
-    linkAccount: async (account) => {
+    linkAccount: async (account, context) => {
       const _account = await createWithHooks(
         {
           ...account,
           createdAt: /* @__PURE__ */ new Date(),
           updatedAt: /* @__PURE__ */ new Date()
         },
-        "account"
+        "account",
+        void 0,
+        context
       );
       return _account;
     },
-    updateUser: async (userId, data) => {
+    updateUser: async (userId, data, context) => {
       const user = await updateWithHooks(
         data,
         [
@@ -692,24 +714,28 @@ var createInternalAdapter = (adapter, ctx) => {
             value: userId
           }
         ],
-        "user"
+        "user",
+        void 0,
+        context
       );
       return user;
     },
-    updateUserByEmail: async (email, data) => {
+    updateUserByEmail: async (email, data, context) => {
       const user = await updateWithHooks(
         data,
         [
           {
             field: "email",
-            value: email
+            value: email.toLowerCase()
           }
         ],
-        "user"
+        "user",
+        void 0,
+        context
       );
       return user;
     },
-    updatePassword: async (userId, password) => {
+    updatePassword: async (userId, password, context) => {
       await updateManyWithHooks(
         {
           password
@@ -724,7 +750,9 @@ var createInternalAdapter = (adapter, ctx) => {
             value: "credential"
           }
         ],
-        "account"
+        "account",
+        void 0,
+        context
       );
     },
     findAccounts: async (userId) => {
@@ -763,22 +791,26 @@ var createInternalAdapter = (adapter, ctx) => {
       });
       return account;
     },
-    updateAccount: async (accountId, data) => {
+    updateAccount: async (accountId, data, context) => {
       const account = await updateWithHooks(
         data,
         [{ field: "id", value: accountId }],
-        "account"
+        "account",
+        void 0,
+        context
       );
       return account;
     },
-    createVerificationValue: async (data) => {
+    createVerificationValue: async (data, context) => {
       const verification = await createWithHooks(
         {
           createdAt: /* @__PURE__ */ new Date(),
           updatedAt: /* @__PURE__ */ new Date(),
           ...data
         },
-        "verification"
+        "verification",
+        void 0,
+        context
       );
       return verification;
     },
@@ -797,6 +829,18 @@ var createInternalAdapter = (adapter, ctx) => {
         },
         limit: 1
       });
+      if (!options.verification?.disableCleanup) {
+        await adapter.deleteMany({
+          model: "verification",
+          where: [
+            {
+              field: "expiresAt",
+              value: (/* @__PURE__ */ new Date()).toISOString(),
+              operator: "lt"
+            }
+          ]
+        });
+      }
       const lastVerification = verification[0];
       return lastVerification;
     },
@@ -822,11 +866,13 @@ var createInternalAdapter = (adapter, ctx) => {
         ]
       });
     },
-    updateVerificationValue: async (id, data) => {
+    updateVerificationValue: async (id, data, context) => {
       const verification = await updateWithHooks(
         data,
         [{ field: "id", value: id }],
-        "verification"
+        "verification",
+        void 0,
+        context
       );
       return verification;
     }
@@ -1251,6 +1297,9 @@ var memoryAdapter = (db) => (options) => {
       }
       return table.map((record) => transformOutput(record, model));
     },
+    count: async ({ model }) => {
+      return db[model].length;
+    },
     update: async ({ model, where, update }) => {
       const table = db[model];
       const res = convertWhereClause(where, table, model);
@@ -1860,6 +1909,19 @@ var kyselyAdapter = (db, config) => (opts) => {
       const res = await query.execute();
       return res.length;
     },
+    async count(data) {
+      const { model, where } = data;
+      const { and, or } = convertWhereClause(model, where);
+      let query = db.selectFrom(getModelName(model)).select(db.fn.count("id").as("count"));
+      if (and) {
+        query = query.where((eb) => eb.and(and.map((expr) => expr(eb))));
+      }
+      if (or) {
+        query = query.where((eb) => eb.or(or.map((expr) => expr(eb))));
+      }
+      const res = await query.execute();
+      return res[0].count;
+    },
     async delete(data) {
       const { model, where } = data;
       const { and, or } = convertWhereClause(model, where);

package/dist/{chunk-ADGXBH3Y.js → chunk-6XMAWIGH.js}

@@ -1,5 +1,5 @@
 import { getEndpointResponse } from './chunk-JEYF2ARX.js';
-import { createAuthEndpoint, APIError, createAuthMiddleware } from './chunk-3EY3LSQR.js';
+import { createAuthEndpoint, APIError, createAuthMiddleware } from './chunk-IVS5VS3V.js';
 import { setSessionCookie } from './chunk-QQGZ3XGI.js';
 import { generateRandomString } from './chunk-DBPOZRMS.js';
 import { getDate } from './chunk-FURNA6HY.js';
@@ -251,9 +251,6 @@ var emailOTP = (options) => {
             });
           }
           if (verificationValue.expiresAt < /* @__PURE__ */ new Date()) {
-            await ctx.context.internalAdapter.deleteVerificationValue(
-              verificationValue.id
-            );
             throw new APIError("BAD_REQUEST", {
               message: ERROR_CODES.OTP_EXPIRED
             });
@@ -278,7 +275,8 @@ var emailOTP = (options) => {
             {
               email,
               emailVerified: true
-            }
+            },
+            ctx
           );
           if (ctx.context.options.emailVerification?.autoSignInAfterVerification) {
             const session = await ctx.context.internalAdapter.createSession(
@@ -367,9 +365,6 @@ var emailOTP = (options) => {
             });
           }
           if (verificationValue.expiresAt < /* @__PURE__ */ new Date()) {
-            await ctx.context.internalAdapter.deleteVerificationValue(
-              verificationValue.id
-            );
             throw new APIError("BAD_REQUEST", {
               message: ERROR_CODES.OTP_EXPIRED
             });
@@ -390,11 +385,14 @@ var emailOTP = (options) => {
                 message: ERROR_CODES.USER_NOT_FOUND
               });
             }
-            const newUser = await ctx.context.internalAdapter.createUser({
-              email,
-              emailVerified: true,
-              name: email
-            });
+            const newUser = await ctx.context.internalAdapter.createUser(
+              {
+                email,
+                emailVerified: true,
+                name: ""
+              },
+              ctx
+            );
             const session2 = await ctx.context.internalAdapter.createSession(
               newUser.id,
               ctx.request
@@ -417,9 +415,13 @@ var emailOTP = (options) => {
             });
           }
           if (!user.user.emailVerified) {
-            await ctx.context.internalAdapter.updateUser(user.user.id, {
-              emailVerified: true
-            });
+            await ctx.context.internalAdapter.updateUser(
+              user.user.id,
+              {
+                emailVerified: true
+              },
+              ctx
+            );
           }
           const session = await ctx.context.internalAdapter.createSession(
             user.user.id,
@@ -562,9 +564,6 @@ var emailOTP = (options) => {
             });
           }
           if (verificationValue.expiresAt < /* @__PURE__ */ new Date()) {
-            await ctx.context.internalAdapter.deleteVerificationValue(
-              verificationValue.id
-            );
             throw new APIError("BAD_REQUEST", {
               message: ERROR_CODES.OTP_EXPIRED
             });
@@ -585,16 +584,20 @@ var emailOTP = (options) => {
             (account2) => account2.providerId === "credential"
           );
           if (!account) {
-            await ctx.context.internalAdapter.createAccount({
-              userId: user.user.id,
-              providerId: "credential",
-              accountId: user.user.id,
-              password: passwordHash
-            });
+            await ctx.context.internalAdapter.createAccount(
+              {
+                userId: user.user.id,
+                providerId: "credential",
+                accountId: user.user.id,
+                password: passwordHash
+              },
+              ctx
+            );
           } else {
             await ctx.context.internalAdapter.updatePassword(
               user.user.id,
-              passwordHash
+              passwordHash,
+              ctx
             );
           }
           return ctx.json({

package/dist/{chunk-G7HOSQ5N.cjs → chunk-75MYIQ34.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkPIWBUHRB_cjs = require('./chunk-PIWBUHRB.cjs');
+var chunkUPQLFVFU_cjs = require('./chunk-UPQLFVFU.cjs');
 var chunkV6HE2MP7_cjs = require('./chunk-V6HE2MP7.cjs');
 var zod = require('zod');
 
@@ -16,7 +16,7 @@ var multiSession = (options) => {
   return {
     id: "multi-session",
     endpoints: {
-      listDeviceSessions: chunkPIWBUHRB_cjs.createAuthEndpoint(
+      listDeviceSessions: chunkUPQLFVFU_cjs.createAuthEndpoint(
         "/multi-session/list-device-sessions",
         {
           method: "GET",
@@ -39,7 +39,7 @@ var multiSession = (options) => {
           return ctx.json(validSessions);
         }
       ),
-      setActiveSession: chunkPIWBUHRB_cjs.createAuthEndpoint(
+      setActiveSession: chunkUPQLFVFU_cjs.createAuthEndpoint(
         "/multi-session/set-active",
         {
           method: "POST",
@@ -49,7 +49,7 @@ var multiSession = (options) => {
             })
           }),
           requireHeaders: true,
-          use: [chunkPIWBUHRB_cjs.sessionMiddleware],
+          use: [chunkUPQLFVFU_cjs.sessionMiddleware],
           metadata: {
             openapi: {
               description: "Set the active session",
@@ -81,7 +81,7 @@ var multiSession = (options) => {
             ctx.context.secret
           );
           if (!sessionCookie) {
-            throw new chunkPIWBUHRB_cjs.APIError("UNAUTHORIZED", {
+            throw new chunkUPQLFVFU_cjs.APIError("UNAUTHORIZED", {
               message: ERROR_CODES.INVALID_SESSION_TOKEN
             });
           }
@@ -91,7 +91,7 @@ var multiSession = (options) => {
               ...ctx.context.authCookies.sessionToken.options,
               maxAge: 0
             });
-            throw new chunkPIWBUHRB_cjs.APIError("UNAUTHORIZED", {
+            throw new chunkUPQLFVFU_cjs.APIError("UNAUTHORIZED", {
               message: ERROR_CODES.INVALID_SESSION_TOKEN
             });
           }
@@ -99,7 +99,7 @@ var multiSession = (options) => {
           return ctx.json(session);
         }
       ),
-      revokeDeviceSession: chunkPIWBUHRB_cjs.createAuthEndpoint(
+      revokeDeviceSession: chunkUPQLFVFU_cjs.createAuthEndpoint(
         "/multi-session/revoke",
         {
           method: "POST",
@@ -109,7 +109,7 @@ var multiSession = (options) => {
             })
           }),
           requireHeaders: true,
-          use: [chunkPIWBUHRB_cjs.sessionMiddleware],
+          use: [chunkUPQLFVFU_cjs.sessionMiddleware],
           metadata: {
             openapi: {
               description: "Revoke a device session",
@@ -141,7 +141,7 @@ var multiSession = (options) => {
             ctx.context.secret
           );
           if (!sessionCookie) {
-            throw new chunkPIWBUHRB_cjs.APIError("UNAUTHORIZED", {
+            throw new chunkUPQLFVFU_cjs.APIError("UNAUTHORIZED", {
               message: ERROR_CODES.INVALID_SESSION_TOKEN
             });
           }
@@ -188,21 +188,18 @@ var multiSession = (options) => {
       after: [
         {
           matcher: () => true,
-          handler: chunkPIWBUHRB_cjs.createAuthMiddleware(async (ctx) => {
+          handler: chunkUPQLFVFU_cjs.createAuthMiddleware(async (ctx) => {
             const cookieString = ctx.context.responseHeaders?.get("set-cookie");
             if (!cookieString) return;
             const setCookies = chunkV6HE2MP7_cjs.parseSetCookieHeader(cookieString);
             const sessionCookieConfig = ctx.context.authCookies.sessionToken;
-            const sessionToken = setCookies.get(
-              sessionCookieConfig.name
-            )?.value;
+            const sessionToken = ctx.context.newSession?.session.token;
             if (!sessionToken) return;
             const cookies = chunkV6HE2MP7_cjs.parseCookies(ctx.headers?.get("cookie") || "");
-            const rawSession = sessionToken.split(".")[0];
-            if (!rawSession) {
+            if (!sessionToken) {
               return;
             }
-            const cookieName = `${sessionCookieConfig.name}_multi-${rawSession}`;
+            const cookieName = `${sessionCookieConfig.name}_multi-${sessionToken}`;
             if (setCookies.get(cookieName) || cookies.get(cookieName)) return;
             const currentMultiSessions = Object.keys(Object.fromEntries(cookies)).filter(
               isMultiSessionCookie
@@ -212,7 +209,7 @@ var multiSession = (options) => {
             }
             await ctx.setSignedCookie(
               cookieName,
-              rawSession,
+              sessionToken,
               ctx.context.secret,
               sessionCookieConfig.options
             );
@@ -220,7 +217,7 @@ var multiSession = (options) => {
         },
         {
           matcher: (context) => context.path === "/sign-out",
-          handler: chunkPIWBUHRB_cjs.createAuthMiddleware(async (ctx) => {
+          handler: chunkUPQLFVFU_cjs.createAuthMiddleware(async (ctx) => {
             const cookieHeader = ctx.headers?.get("cookie");
             if (!cookieHeader) return;
             const cookies = Object.fromEntries(chunkV6HE2MP7_cjs.parseCookies(cookieHeader));