better-auth 0.4.4 → 0.4.5

package/dist/index.js

@@ -1146,39 +1146,39 @@ var signInOAuth = createAuthEndpoint(
       provider: z4.enum(oAuthProviderList)
     })
   },
-  async (c) => {
-    const provider = c.context.socialProviders.find(
-      (p) => p.id === c.body.provider
+  async (c2) => {
+    const provider = c2.context.socialProviders.find(
+      (p) => p.id === c2.body.provider
     );
     if (!provider) {
-      c.context.logger.error(
+      c2.context.logger.error(
         "Provider not found. Make sure to add the provider to your auth config",
         {
-          provider: c.body.provider
+          provider: c2.body.provider
         }
       );
       throw new APIError3("NOT_FOUND", {
         message: "Provider not found"
       });
     }
-    const cookie = c.context.authCookies;
-    const currentURL = c.query?.currentURL ? new URL(c.query?.currentURL) : null;
-    const callbackURL = c.body.callbackURL?.startsWith("http") ? c.body.callbackURL : `${currentURL?.origin}${c.body.callbackURL || ""}`;
+    const cookie = c2.context.authCookies;
+    const currentURL = c2.query?.currentURL ? new URL(c2.query?.currentURL) : null;
+    const callbackURL = c2.body.callbackURL?.startsWith("http") ? c2.body.callbackURL : `${currentURL?.origin}${c2.body.callbackURL || ""}`;
     const state = generateState(
-      callbackURL || currentURL?.origin || c.context.baseURL,
-      c.query?.currentURL
+      callbackURL || currentURL?.origin || c2.context.baseURL,
+      c2.query?.currentURL
     );
-    await c.setSignedCookie(
+    await c2.setSignedCookie(
       cookie.state.name,
       state.code,
-      c.context.secret,
+      c2.context.secret,
       cookie.state.options
     );
     const codeVerifier = generateCodeVerifier();
-    await c.setSignedCookie(
+    await c2.setSignedCookie(
       cookie.pkCodeVerifier.name,
       codeVerifier,
-      c.context.secret,
+      c2.context.secret,
       cookie.pkCodeVerifier.options
     );
     const url = await provider.createAuthorizationURL({
@@ -1187,9 +1187,9 @@ var signInOAuth = createAuthEndpoint(
     });
     url.searchParams.set(
       "redirect_uri",
-      `${c.context.baseURL}/callback/${c.body.provider}`
+      `${c2.context.baseURL}/callback/${c2.body.provider}`
     );
-    return c.json({
+    return c2.json({
       url: url.toString(),
       state: state.state,
       codeVerifier,
@@ -1234,7 +1234,9 @@ var signInEmail = createAuthEndpoint(
         message: "Invalid email"
       });
     }
-    const user = await ctx.context.internalAdapter.findUserByEmail(email);
+    const user = await ctx.context.internalAdapter.findUserByEmail(email, {
+      includeAccounts: true
+    });
     if (!user) {
       await ctx.context.password.hash(password);
       ctx.context.logger.error("User not found", { email });
@@ -1288,6 +1290,17 @@ var signInEmail = createAuthEndpoint(
     });
   }
 );
+var c = (o) => {
+};
+c({
+  additional: {
+    name: "string"
+  },
+  hooks: {
+    create(user) {
+    }
+  }
+});
 
 // src/api/routes/callback.ts
 import { APIError as APIError4 } from "better-call";
@@ -1396,10 +1409,10 @@ function generateRandomInteger(max) {
   }
   return result;
 }
-function generateRandomString(length, alphabet3) {
+function generateRandomString(length, alphabet4) {
   let result = "";
   for (let i = 0; i < length; i++) {
-    result += alphabet3[generateRandomInteger(alphabet3.length)];
+    result += alphabet4[generateRandomInteger(alphabet4.length)];
   }
   return result;
 }
@@ -1458,63 +1471,63 @@ var callbackOAuth = createAuthEndpoint(
     }),
     metadata: HIDE_METADATA
   },
-  async (c) => {
-    if (c.query.error || !c.query.code) {
-      const parsedState2 = parseState(c.query.state);
-      const callbackURL2 = parsedState2.data?.callbackURL || `${c.context.baseURL}/error`;
-      c.context.logger.error(c.query.error, c.params.id);
-      throw c.redirect(
-        `${callbackURL2}?error=${c.query.error || "oAuth_code_missing"}`
+  async (c2) => {
+    if (c2.query.error || !c2.query.code) {
+      const parsedState2 = parseState(c2.query.state);
+      const callbackURL2 = parsedState2.data?.callbackURL || `${c2.context.baseURL}/error`;
+      c2.context.logger.error(c2.query.error, c2.params.id);
+      throw c2.redirect(
+        `${callbackURL2}?error=${c2.query.error || "oAuth_code_missing"}`
       );
     }
-    const provider = c.context.socialProviders.find(
-      (p) => p.id === c.params.id
+    const provider = c2.context.socialProviders.find(
+      (p) => p.id === c2.params.id
     );
     if (!provider) {
-      c.context.logger.error(
+      c2.context.logger.error(
         "Oauth provider with id",
-        c.params.id,
+        c2.params.id,
         "not found"
       );
-      throw c.redirect(
-        `${c.context.baseURL}/error?error=oauth_provider_not_found`
+      throw c2.redirect(
+        `${c2.context.baseURL}/error?error=oauth_provider_not_found`
       );
     }
-    const parsedState = parseState(c.query.state);
+    const parsedState = parseState(c2.query.state);
     if (!parsedState.success) {
-      c.context.logger.error("Unable to parse state");
-      throw c.redirect(
-        `${c.context.baseURL}/error?error=please_restart_the_process`
+      c2.context.logger.error("Unable to parse state");
+      throw c2.redirect(
+        `${c2.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     const {
       data: { callbackURL, currentURL, code: stateCode }
     } = parsedState;
-    const storedState = await c.getSignedCookie(
-      c.context.authCookies.state.name,
-      c.context.secret
+    const storedState = await c2.getSignedCookie(
+      c2.context.authCookies.state.name,
+      c2.context.secret
     );
     if (storedState !== stateCode) {
       logger.error("OAuth state mismatch", storedState, stateCode);
-      throw c.redirect(
-        `${c.context.baseURL}/error?error=please_restart_the_process`
+      throw c2.redirect(
+        `${c2.context.baseURL}/error?error=please_restart_the_process`
       );
     }
-    const codeVerifier = await c.getSignedCookie(
-      c.context.authCookies.pkCodeVerifier.name,
-      c.context.secret
+    const codeVerifier = await c2.getSignedCookie(
+      c2.context.authCookies.pkCodeVerifier.name,
+      c2.context.secret
     );
     let tokens;
     try {
       tokens = await provider.validateAuthorizationCode(
-        c.query.code,
+        c2.query.code,
         codeVerifier,
-        `${c.context.baseURL}/callback/${provider.id}`
+        `${c2.context.baseURL}/callback/${provider.id}`
       );
     } catch (e) {
-      c.context.logger.error(e);
-      throw c.redirect(
-        `${c.context.baseURL}/error?error=please_restart_the_process`
+      c2.context.logger.error(e);
+      throw c2.redirect(
+        `${c2.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     const user = await provider.getUserInfo(tokens).then((res) => res?.user);
@@ -1525,22 +1538,24 @@ var callbackOAuth = createAuthEndpoint(
     });
     if (!user || data.success === false) {
       logger.error("Unable to get user info", data.error);
-      throw c.redirect(
-        `${c.context.baseURL}/error?error=please_restart_the_process`
+      throw c2.redirect(
+        `${c2.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     if (!callbackURL) {
-      throw c.redirect(
-        `${c.context.baseURL}/error?error=please_restart_the_process`
+      throw c2.redirect(
+        `${c2.context.baseURL}/error?error=please_restart_the_process`
       );
     }
-    const dbUser = await c.context.internalAdapter.findUserByEmail(user.email).catch((e) => {
+    const dbUser = await c2.context.internalAdapter.findUserByEmail(user.email, {
+      includeAccounts: true
+    }).catch((e) => {
       logger.error(
         "Better auth was unable to query your database.\nError: ",
         e
       );
-      throw c.redirect(
-        `${c.context.baseURL}/error?error=internal_server_error`
+      throw c2.redirect(
+        `${c2.context.baseURL}/error?error=internal_server_error`
       );
     });
     const userId = dbUser?.user.id;
@@ -1548,7 +1563,7 @@ var callbackOAuth = createAuthEndpoint(
       const hasBeenLinked = dbUser.accounts.find(
         (a) => a.providerId === provider.id
       );
-      const trustedProviders = c.context.options.account?.accountLinking?.trustedProviders;
+      const trustedProviders = c2.context.options.account?.accountLinking?.trustedProviders;
       const isTrustedProvider = trustedProviders ? trustedProviders.includes(provider.id) : true;
       if (!hasBeenLinked && (!user.emailVerified || !isTrustedProvider)) {
         let url;
@@ -1556,15 +1571,15 @@ var callbackOAuth = createAuthEndpoint(
           url = new URL(currentURL || callbackURL);
           url.searchParams.set("error", "account_not_linked");
         } catch (e) {
-          throw c.redirect(
-            `${c.context.baseURL}/error?error=account_not_linked`
+          throw c2.redirect(
+            `${c2.context.baseURL}/error?error=account_not_linked`
           );
         }
-        throw c.redirect(url.toString());
+        throw c2.redirect(url.toString());
       }
       if (!hasBeenLinked) {
         try {
-          await c.context.internalAdapter.linkAccount({
+          await c2.context.internalAdapter.linkAccount({
             providerId: provider.id,
             accountId: user.id.toString(),
             id: `${provider.id}:${user.id}`,
@@ -1573,14 +1588,14 @@ var callbackOAuth = createAuthEndpoint(
           });
         } catch (e) {
           console.log(e);
-          throw c.redirect(
-            `${c.context.baseURL}/error?error=failed_linking_account`
+          throw c2.redirect(
+            `${c2.context.baseURL}/error?error=failed_linking_account`
           );
         }
       }
     } else {
       try {
-        await c.context.internalAdapter.createOAuthUser(data.data, {
+        await c2.context.internalAdapter.createOAuthUser(data.data, {
           ...getAccountTokens(tokens),
           id: `${provider.id}:${user.id}`,
           providerId: provider.id,
@@ -1590,8 +1605,8 @@ var callbackOAuth = createAuthEndpoint(
       } catch (e) {
         const url = new URL(currentURL || callbackURL);
         url.searchParams.set("error", "unable_to_create_user");
-        c.setHeader("Location", url.toString());
-        throw c.redirect(url.toString());
+        c2.setHeader("Location", url.toString());
+        throw c2.redirect(url.toString());
       }
     }
     if (!userId && !id)
@@ -1599,29 +1614,29 @@ var callbackOAuth = createAuthEndpoint(
         message: "Unable to create user"
       });
     try {
-      const session = await c.context.internalAdapter.createSession(
+      const session = await c2.context.internalAdapter.createSession(
         userId || id,
-        c.request
+        c2.request
       );
       if (!session) {
         const url = new URL(currentURL || callbackURL);
         url.searchParams.set("error", "unable_to_create_session");
-        throw c.redirect(url.toString());
+        throw c2.redirect(url.toString());
       }
       try {
-        await setSessionCookie(c, session.id);
+        await setSessionCookie(c2, session.id);
       } catch (e) {
-        c.context.logger.error("Unable to set session cookie", e);
+        c2.context.logger.error("Unable to set session cookie", e);
         const url = new URL(currentURL || callbackURL);
         url.searchParams.set("error", "unable_to_create_session");
-        throw c.redirect(url.toString());
+        throw c2.redirect(url.toString());
       }
     } catch {
       const url = new URL(currentURL || callbackURL || "");
       url.searchParams.set("error", "unable_to_create_session");
-      throw c.redirect(url.toString());
+      throw c2.redirect(url.toString());
     }
-    throw c.redirect(callbackURL);
+    throw c2.redirect(callbackURL);
   }
 );
 
@@ -1693,7 +1708,9 @@ var forgetPassword = createAuthEndpoint(
       });
     }
     const { email } = ctx.body;
-    const user = await ctx.context.internalAdapter.findUserByEmail(email);
+    const user = await ctx.context.internalAdapter.findUserByEmail(email, {
+      includeAccounts: true
+    });
     if (!user) {
       ctx.context.logger.error("Reset Password: User not found", { email });
       return ctx.json(
@@ -1893,11 +1910,17 @@ var sendVerificationEmail = createAuthEndpoint(
       });
     }
     const { email } = ctx.body;
+    const user = await ctx.context.internalAdapter.findUserByEmail(email);
+    if (!user) {
+      throw new APIError7("BAD_REQUEST", {
+        message: "User not found"
+      });
+    }
     const token = await createEmailVerificationToken(ctx.context.secret, email);
     const url = `${ctx.context.baseURL}/verify-email?token=${token}&callbackURL=${ctx.body.callbackURL || ctx.query?.currentURL || "/"}`;
     await ctx.context.options.emailAndPassword.sendVerificationEmail(
-      email,
       url,
+      user.user,
       token
     );
     return ctx.json({
@@ -1921,12 +1944,8 @@ var verifyEmail = createAuthEndpoint(
       jwt = await validateJWT2("HS256", Buffer.from(ctx.context.secret), token);
     } catch (e) {
       ctx.context.logger.error("Failed to verify email", e);
-      return ctx.json(null, {
-        status: 400,
-        statusText: "INVALID_TOKEN",
-        body: {
-          message: "Invalid token"
-        }
+      throw new APIError7("BAD_REQUEST", {
+        message: "Invalid token"
       });
     }
     const schema = z9.object({
@@ -1934,20 +1953,19 @@ var verifyEmail = createAuthEndpoint(
     });
     const parsed = schema.parse(jwt.payload);
     const user = await ctx.context.internalAdapter.findUserByEmail(
-      parsed.email
+      parsed.email,
+      { includeAccounts: true }
     );
     if (!user) {
-      return ctx.json(null, {
-        status: 400,
-        statusText: "USER_NOT_FOUND",
-        body: {
-          message: "User not found"
-        }
+      throw new APIError7("BAD_REQUEST", {
+        message: "User not found"
       });
     }
     const account = user.accounts.find((a) => a.providerId === "credential");
     if (!account) {
-      throw ctx.redirect;
+      throw new APIError7("BAD_REQUEST", {
+        message: "Account not found"
+      });
     }
     await ctx.context.internalAdapter.updateUserByEmail(parsed.email, {
       emailVerified: true
@@ -2281,8 +2299,8 @@ var error = createAuthEndpoint(
     method: "GET",
     metadata: HIDE_METADATA
   },
-  async (c) => {
-    const query = new URL(c.request?.url || "").searchParams.get("error") || "Unknown";
+  async (c2) => {
+    const query = new URL(c2.request?.url || "").searchParams.get("error") || "Unknown";
     return new Response(html(query), {
       headers: {
         "Content-Type": "text/html"
@@ -2370,11 +2388,11 @@ var signUpEmail = () => createAuthEndpoint(
     }
     const hash = await ctx.context.password.hash(password);
     await ctx.context.internalAdapter.linkAccount({
-      id: generateRandomString(32, alphabet("a-z", "0-9", "A-Z")),
       userId: createdUser.id,
       providerId: "credential",
       accountId: createdUser.id,
-      password: hash
+      password: hash,
+      expiresAt: getDate(60 * 60 * 24 * 30, "sec")
     });
     const session = await ctx.context.internalAdapter.createSession(
       createdUser.id,
@@ -2393,8 +2411,8 @@ var signUpEmail = () => createAuthEndpoint(
       );
       const url = `${ctx.context.baseURL}/verify-email?token=${token}&callbackURL=${body.callbackURL || ctx.query?.currentURL || "/"}`;
       await ctx.context.options.emailAndPassword.sendVerificationEmail?.(
-        createdUser.email,
         url,
+        createdUser,
         token
       );
     }
@@ -2675,26 +2693,26 @@ function getEndpoints(ctx, options) {
   let api = {};
   for (const [key, value] of Object.entries(endpoints)) {
     api[key] = async (context) => {
-      let c = await ctx;
+      let c2 = await ctx;
       for (const plugin of options.plugins || []) {
         if (plugin.hooks?.before) {
           for (const hook of plugin.hooks.before) {
             const match = hook.matcher({
               ...value,
               ...context,
-              context: c
+              context: c2
             });
             if (match) {
               const hookRes = await hook.handler({
                 ...context,
                 context: {
-                  ...c,
+                  ...c2,
                   ...context.context
                 }
               });
               if (hookRes && "context" in hookRes) {
-                c = {
-                  ...c,
+                c2 = {
+                  ...c2,
                   ...hookRes.context
                 };
               }
@@ -2705,7 +2723,7 @@ function getEndpoints(ctx, options) {
       const endpointRes = await value({
         ...context,
         context: {
-          ...c,
+          ...c2,
           ...context.context
         }
       });
@@ -3224,7 +3242,7 @@ async function getMigrations(config2) {
     }
     let toBeAddedFields = {};
     for (const [fieldName, field] of Object.entries(value.fields)) {
-      const column = table.columns.find((c) => c.name === fieldName);
+      const column = table.columns.find((c2) => c2.name === fieldName);
       if (!column) {
         toBeAddedFields[fieldName] = field;
         continue;
@@ -3551,11 +3569,11 @@ function constantTimeEqual(a, b) {
   if (aBuffer.length !== bBuffer.length) {
     return false;
   }
-  let c = 0;
+  let c2 = 0;
   for (let i = 0; i < aBuffer.length; i++) {
-    c |= aBuffer[i] ^ bBuffer[i];
+    c2 |= aBuffer[i] ^ bBuffer[i];
   }
-  return c === 0;
+  return c2 === 0;
 }
 
 // src/crypto/password.ts
@@ -3747,12 +3765,11 @@ var createInternalAdapter = (adapter, ctx) => {
         ]
       });
     },
-    createSession: async (userId, request, dontRememberMe, inputData) => {
+    createSession: async (userId, request, dontRememberMe, override) => {
       const headers = request instanceof Request ? request.headers : request;
       const data = {
         id: generateId(),
         userId,
-        ...inputData,
         /**
          * If the user doesn't want to be remembered
          * set the session to expire in 1 day.
@@ -3760,7 +3777,8 @@ var createInternalAdapter = (adapter, ctx) => {
          */
         expiresAt: dontRememberMe ? getDate(60 * 60 * 24, "sec") : getDate(sessionExpiration, "sec"),
         ipAddress: headers?.get("x-forwarded-for") || "",
-        userAgent: headers?.get("user-agent") || ""
+        userAgent: headers?.get("user-agent") || "",
+        ...override
       };
       const session = await createWithHooks(data, "session");
       if (secondaryStorage && session) {
@@ -3873,7 +3891,7 @@ var createInternalAdapter = (adapter, ctx) => {
         ]
       });
     },
-    findUserByEmail: async (email) => {
+    findUserByEmail: async (email, options2) => {
       const user = await adapter.findOne({
         model: tables.user.tableName,
         where: [
@@ -3884,18 +3902,24 @@ var createInternalAdapter = (adapter, ctx) => {
         ]
       });
       if (!user) return null;
-      const accounts = await adapter.findMany({
-        model: tables.account.tableName,
-        where: [
-          {
-            value: user.id,
-            field: tables.account.fields.userId.fieldName || "userId"
-          }
-        ]
-      });
+      if (options2?.includeAccounts) {
+        const accounts = await adapter.findMany({
+          model: tables.account.tableName,
+          where: [
+            {
+              value: user.id,
+              field: tables.account.fields.userId.fieldName || "userId"
+            }
+          ]
+        });
+        return {
+          user,
+          accounts
+        };
+      }
       return {
         user,
-        accounts
+        accounts: []
       };
     },
     findUserById: async (userId) => {
@@ -3913,6 +3937,7 @@ var createInternalAdapter = (adapter, ctx) => {
     linkAccount: async (account) => {
       const _account = await createWithHooks(
         {
+          id: generateId(),
           ...account
         },
         "account"
@@ -4109,7 +4134,7 @@ function runPluginInit(ctx) {
   let options = ctx.options;
   const plugins = options.plugins || [];
   let context = ctx;
-  const dbHooks = [options.databaseHooks];
+  const dbHooks = [];
   for (const plugin of plugins) {
     if (plugin.init) {
       const result = plugin.init(ctx);
@@ -4129,6 +4154,7 @@ function runPluginInit(ctx) {
       }
     }
   }
+  dbHooks.push(options.databaseHooks);
   context.internalAdapter = createInternalAdapter(ctx.adapter, {
     options,
     hooks: dbHooks.filter((u) => u !== void 0)

package/dist/next-js.d.ts

@@ -1,4 +1,4 @@
-import { a as Auth } from './index-Bt0CUdx4.js';
+import { a as Auth } from './index-B5SM-JCa.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-Bt0CUdx4.js';
+import { a as Auth } from './index-B5SM-JCa.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-CJ44EC0j.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-45sX2yHG.js';
 export { i as ac } from './index-DfAHOgpj.js';
-import { H as HookEndpointContext } from './index-Bt0CUdx4.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-Bt0CUdx4.js';
+import { H as HookEndpointContext } from './index-B5SM-JCa.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-B5SM-JCa.js';
 import './types-IzAbV4nB.js';
 import 'zod';
 import './helper-DPDj8Nix.js';