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

package/dist/{chunk-MGJLVQOV.js → chunk-2OAHQPLI.js}

@@ -1,4 +1,4 @@
-import { parseSessionOutput, getIp, parseUserOutput } from './chunk-HZBNUY7E.js';
+import { parseSessionOutput, getIp, parseUserOutput } from './chunk-WZ6OIVJK.js';
 import { generateId, logger, createLogger } from './chunk-KLDFBLYL.js';
 import { safeJSONParse } from './chunk-53IPO2PJ.js';
 import { getDate } from './chunk-FURNA6HY.js';
@@ -85,18 +85,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
+          };
         }
       }
     }
@@ -108,17 +111,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;
         }
@@ -135,17 +138,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;
         }
@@ -162,7 +165,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;
@@ -181,14 +184,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(
         {
@@ -197,14 +202,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(),
@@ -213,18 +220,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;
     },
@@ -272,6 +283,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}`);
@@ -306,7 +323,7 @@ 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 = {
@@ -322,7 +339,8 @@ var createInternalAdapter = (adapter, ctx) => {
         userId,
         token: generateId(32),
         createdAt: /* @__PURE__ */ new Date(),
-        updatedAt: /* @__PURE__ */ new Date()
+        updatedAt: /* @__PURE__ */ new Date(),
+        ...overrideAll ? rest : {}
       };
       const res = await createWithHooks(
         data,
@@ -350,7 +368,8 @@ var createInternalAdapter = (adapter, ctx) => {
             return sessionData;
           },
           executeMainFn: options.session?.storeSessionInDatabase
-        } : void 0
+        } : void 0,
+        context
       );
       return res;
     },
@@ -464,7 +483,7 @@ var createInternalAdapter = (adapter, ctx) => {
         };
       });
     },
-    updateSession: async (sessionToken, session) => {
+    updateSession: async (sessionToken, session, context) => {
       const updatedSession = await updateWithHooks(
         session,
         [{ field: "token", value: sessionToken }],
@@ -485,7 +504,8 @@ var createInternalAdapter = (adapter, ctx) => {
             }
           },
           executeMainFn: options.session?.storeSessionInDatabase
-        } : void 0
+        } : void 0,
+        context
       );
       return updatedSession;
     },
@@ -670,18 +690,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,
         [
@@ -690,24 +712,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
@@ -722,7 +748,9 @@ var createInternalAdapter = (adapter, ctx) => {
             value: "credential"
           }
         ],
-        "account"
+        "account",
+        void 0,
+        context
       );
     },
     findAccounts: async (userId) => {
@@ -761,22 +789,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;
     },
@@ -795,6 +827,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;
     },
@@ -820,11 +864,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;
     }
@@ -1249,6 +1295,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);
@@ -1858,6 +1907,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-5E75URIA.cjs → chunk-2Z6CVQHH.cjs}

@@ -70,10 +70,6 @@ async function parseState(c) {
     parsedData.errorURL = `${c.context.baseURL}/error`;
   }
   if (parsedData.expiresAt < Date.now()) {
-    await c.context.internalAdapter.deleteVerificationValue(data.id);
-    c.context.logger.error("State expired.", {
-      state
-    });
     throw c.redirect(
       `${c.context.baseURL}/error?error=please_restart_the_process`
     );