better-auth 0.3.4 → 0.3.5-beta.2

package/dist/adapters/drizzle.d.ts

@@ -1,4 +1,4 @@
-import { A as Adapter } from '../index-CHZzPeLv.js';
+import { A as Adapter } from '../index-DUQYmBZY.js';
 import 'zod';
 import 'kysely';
 import '../index-QaO4zgiz.js';

package/dist/adapters/mongodb.d.ts

@@ -1,5 +1,5 @@
 import { Db } from 'mongodb';
-import { W as Where } from '../index-CHZzPeLv.js';
+import { W as Where } from '../index-DUQYmBZY.js';
 import 'zod';
 import 'kysely';
 import '../index-QaO4zgiz.js';

package/dist/adapters/prisma.d.ts

@@ -1,4 +1,4 @@
-import { A as Adapter } from '../index-CHZzPeLv.js';
+import { A as Adapter } from '../index-DUQYmBZY.js';
 import 'zod';
 import 'kysely';
 import '../index-QaO4zgiz.js';

package/dist/api.d.ts

@@ -1,4 +1,4 @@
-export { f as AuthEndpoint, g as AuthMiddleware, v as callbackOAuth, T as changePassword, e as createAuthEndpoint, d 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-CHZzPeLv.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-DUQYmBZY.js';
 import './helper-DPDj8Nix.js';
 import 'zod';
 export { APIError } from 'better-call';

package/dist/api.js

@@ -1273,10 +1273,10 @@ function generateRandomInteger(max) {
   }
   return result;
 }
-function generateRandomString(length, alphabet2) {
+function generateRandomString(length, alphabet3) {
   let result = "";
   for (let i = 0; i < length; i++) {
-    result += alphabet2[generateRandomInteger(alphabet2.length)];
+    result += alphabet3[generateRandomInteger(alphabet3.length)];
   }
   return result;
 }
@@ -1973,7 +1973,6 @@ var setPassword = createAuthEndpoint(
     const passwordHash = await ctx.context.password.hash(newPassword);
     if (!account) {
       await ctx.context.internalAdapter.linkAccount({
-        id: generateRandomString(32, alphabet("a-z", "0-9", "A-Z")),
         userId: session.user.id,
         providerId: "credential",
         accountId: session.user.id,
@@ -2219,14 +2218,11 @@ var signUpEmail = () => createAuthEndpoint(
       additionalFields
     );
     const createdUser = await ctx.context.internalAdapter.createUser({
-      id: generateRandomString(32, alphabet("a-z", "0-9", "A-Z")),
       email: email.toLowerCase(),
       name,
       image,
-      emailVerified: false,
-      createdAt: /* @__PURE__ */ new Date(),
-      updatedAt: /* @__PURE__ */ new Date(),
-      ...additionalData
+      ...additionalData,
+      emailVerified: false
     });
     if (!createdUser) {
       throw new APIError9("BAD_REQUEST", {
@@ -2540,7 +2536,33 @@ function getEndpoints(ctx, options) {
   let api = {};
   for (const [key, value] of Object.entries(endpoints)) {
     api[key] = async (context) => {
-      const c = await ctx;
+      let c = 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
+            });
+            if (match) {
+              const hookRes = await hook.handler({
+                ...context,
+                context: {
+                  ...c,
+                  ...context.context
+                }
+              });
+              if (hookRes && "context" in hookRes) {
+                c = {
+                  ...c,
+                  ...hookRes.context
+                };
+              }
+            }
+          }
+        }
+      }
       const endpointRes = await value({
         ...context,
         context: {

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, f as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber, e as anonymous } from '../index-D1AQaiQ6.js';
-export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-D1AQaiQ6.js';
+import { o as organization, f as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber, e as anonymous } from '../index-BYsLBcLO.js';
+export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-BYsLBcLO.js';
 import { P as Prettify } from '../helper-DPDj8Nix.js';
-import { F as FieldAttribute, B as BetterAuthOptions, c as BetterAuthPlugin } from '../index-CHZzPeLv.js';
+import { F as FieldAttribute, B as BetterAuthOptions, b as BetterAuthPlugin } from '../index-DUQYmBZY.js';
 import '../index-QaO4zgiz.js';
 import 'arctic';
 import 'zod';

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-CHZzPeLv.js';
+import './index-DUQYmBZY.js';
 import 'kysely';
 import './index-QaO4zgiz.js';
 import 'arctic';

package/dist/{index-D1AQaiQ6.d.ts → index-BYsLBcLO.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 } from './index-CHZzPeLv.js';
+import { H as HookEndpointContext } from './index-DUQYmBZY.js';
 import * as nanostores from 'nanostores';
 import { atom } from 'nanostores';
 import * as _simplewebauthn_types from '@simplewebauthn/types';
@@ -4636,7 +4636,7 @@ declare const anonymous: (options?: AnonymousOptions) => {
                     name: string;
                     image?: string | undefined;
                     id: string;
-                    emailVerified: boolean;
+                    emailVerified?: boolean | undefined;
                     createdAt: Date;
                     updatedAt: Date;
                 };

package/dist/{index-CHZzPeLv.d.ts → index-DUQYmBZY.d.ts}

@@ -1181,7 +1181,7 @@ declare const createInternalAdapter: (adapter: Adapter, ctx: {
         name: string;
         image?: string | undefined;
         id: string;
-        emailVerified: boolean;
+        emailVerified?: boolean | undefined;
         createdAt: Date;
         updatedAt: Date;
     } | null>;
@@ -1251,7 +1251,7 @@ declare const createInternalAdapter: (adapter: Adapter, ctx: {
         updatedAt: Date;
         image?: string | undefined;
     } | null>;
-    linkAccount: (account: Account) => Promise<{
+    linkAccount: (account: Omit<Account, "id"> & Record<string, any>) => Promise<{
         id: string;
         providerId: string;
         accountId: string;
@@ -1357,17 +1357,17 @@ declare const signInOAuth: {
             /**
              * OAuth2 provider to use`
              */
-            provider: z.ZodEnum<["github", ...("apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter")[]]>;
+            provider: z.ZodEnum<["github", ...("github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter")[]]>;
             /**
              * If this is true the session will only be valid for the current browser session
              */
             dontRememberMe: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
         }, "strip", z.ZodTypeAny, {
-            provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+            provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
             callbackURL?: string | undefined;
             dontRememberMe?: boolean | undefined;
         }, {
-            provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+            provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
             callbackURL?: string | undefined;
             dontRememberMe?: boolean | undefined;
         }>;
@@ -1402,17 +1402,17 @@ declare const signInOAuth: {
             /**
              * OAuth2 provider to use`
              */
-            provider: z.ZodEnum<["github", ...("apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter")[]]>;
+            provider: z.ZodEnum<["github", ...("github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter")[]]>;
             /**
              * If this is true the session will only be valid for the current browser session
              */
             dontRememberMe: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
         }, "strip", z.ZodTypeAny, {
-            provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+            provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
             callbackURL?: string | undefined;
             dontRememberMe?: boolean | undefined;
         }, {
-            provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+            provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
             callbackURL?: string | undefined;
             dontRememberMe?: boolean | undefined;
         }>;
@@ -2517,7 +2517,7 @@ declare const signUpEmail: <O extends BetterAuthOptions>() => {
             name: string;
             image?: string | undefined;
             id: string;
-            emailVerified: boolean;
+            emailVerified?: boolean | undefined;
             createdAt: Date;
             updatedAt: Date;
         };
@@ -2628,14 +2628,14 @@ declare function getEndpoints<C extends AuthContext, Option extends BetterAuthOp
                 }>>;
                 body: zod.ZodObject<{
                     callbackURL: zod.ZodOptional<zod.ZodString>;
-                    provider: zod.ZodEnum<["github", ...("apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter")[]]>;
+                    provider: zod.ZodEnum<["github", ...("github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter")[]]>;
                     dontRememberMe: zod.ZodOptional<zod.ZodDefault<zod.ZodBoolean>>;
                 }, "strip", zod.ZodTypeAny, {
-                    provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+                    provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
                     callbackURL?: string | undefined;
                     dontRememberMe?: boolean | undefined;
                 }, {
-                    provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+                    provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
                     callbackURL?: string | undefined;
                     dontRememberMe?: boolean | undefined;
                 }>;
@@ -2660,14 +2660,14 @@ declare function getEndpoints<C extends AuthContext, Option extends BetterAuthOp
                 }>>;
                 body: zod.ZodObject<{
                     callbackURL: zod.ZodOptional<zod.ZodString>;
-                    provider: zod.ZodEnum<["github", ...("apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter")[]]>;
+                    provider: zod.ZodEnum<["github", ...("github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter")[]]>;
                     dontRememberMe: zod.ZodOptional<zod.ZodDefault<zod.ZodBoolean>>;
                 }, "strip", zod.ZodTypeAny, {
-                    provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+                    provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
                     callbackURL?: string | undefined;
                     dontRememberMe?: boolean | undefined;
                 }, {
-                    provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+                    provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
                     callbackURL?: string | undefined;
                     dontRememberMe?: boolean | undefined;
                 }>;
@@ -2884,7 +2884,7 @@ declare function getEndpoints<C extends AuthContext, Option extends BetterAuthOp
                     name: string;
                     image?: string | undefined;
                     id: string;
-                    emailVerified: boolean;
+                    emailVerified?: boolean | undefined;
                     createdAt: Date;
                     updatedAt: Date;
                 };
@@ -3741,14 +3741,14 @@ declare const router: <C extends AuthContext, Option extends BetterAuthOptions>(
                 }>>;
                 body: zod.ZodObject<{
                     callbackURL: zod.ZodOptional<zod.ZodString>;
-                    provider: zod.ZodEnum<["github", ...("apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter")[]]>;
+                    provider: zod.ZodEnum<["github", ...("github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter")[]]>;
                     dontRememberMe: zod.ZodOptional<zod.ZodDefault<zod.ZodBoolean>>;
                 }, "strip", zod.ZodTypeAny, {
-                    provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+                    provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
                     callbackURL?: string | undefined;
                     dontRememberMe?: boolean | undefined;
                 }, {
-                    provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+                    provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
                     callbackURL?: string | undefined;
                     dontRememberMe?: boolean | undefined;
                 }>;
@@ -3773,14 +3773,14 @@ declare const router: <C extends AuthContext, Option extends BetterAuthOptions>(
                 }>>;
                 body: zod.ZodObject<{
                     callbackURL: zod.ZodOptional<zod.ZodString>;
-                    provider: zod.ZodEnum<["github", ...("apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter")[]]>;
+                    provider: zod.ZodEnum<["github", ...("github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter")[]]>;
                     dontRememberMe: zod.ZodOptional<zod.ZodDefault<zod.ZodBoolean>>;
                 }, "strip", zod.ZodTypeAny, {
-                    provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+                    provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
                     callbackURL?: string | undefined;
                     dontRememberMe?: boolean | undefined;
                 }, {
-                    provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+                    provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
                     callbackURL?: string | undefined;
                     dontRememberMe?: boolean | undefined;
                 }>;
@@ -3997,7 +3997,7 @@ declare const router: <C extends AuthContext, Option extends BetterAuthOptions>(
                     name: string;
                     image?: string | undefined;
                     id: string;
-                    emailVerified: boolean;
+                    emailVerified?: boolean | undefined;
                     createdAt: Date;
                     updatedAt: Date;
                 };
@@ -4856,14 +4856,14 @@ declare const betterAuth: <O extends BetterAuthOptions>(options: O) => {
                 }>>;
                 body: zod.ZodObject<{
                     callbackURL: zod.ZodOptional<zod.ZodString>;
-                    provider: zod.ZodEnum<["github", ...("apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter")[]]>;
+                    provider: zod.ZodEnum<["github", ...("github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter")[]]>;
                     dontRememberMe: zod.ZodOptional<zod.ZodDefault<zod.ZodBoolean>>;
                 }, "strip", zod.ZodTypeAny, {
-                    provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+                    provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
                     callbackURL?: string | undefined;
                     dontRememberMe?: boolean | undefined;
                 }, {
-                    provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+                    provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
                     callbackURL?: string | undefined;
                     dontRememberMe?: boolean | undefined;
                 }>;
@@ -4888,14 +4888,14 @@ declare const betterAuth: <O extends BetterAuthOptions>(options: O) => {
                 }>>;
                 body: zod.ZodObject<{
                     callbackURL: zod.ZodOptional<zod.ZodString>;
-                    provider: zod.ZodEnum<["github", ...("apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter")[]]>;
+                    provider: zod.ZodEnum<["github", ...("github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter")[]]>;
                     dontRememberMe: zod.ZodOptional<zod.ZodDefault<zod.ZodBoolean>>;
                 }, "strip", zod.ZodTypeAny, {
-                    provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+                    provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
                     callbackURL?: string | undefined;
                     dontRememberMe?: boolean | undefined;
                 }, {
-                    provider: "apple" | "discord" | "facebook" | "github" | "google" | "microsoft" | "spotify" | "twitch" | "twitter";
+                    provider: "github" | "apple" | "discord" | "facebook" | "microsoft" | "google" | "spotify" | "twitch" | "twitter";
                     callbackURL?: string | undefined;
                     dontRememberMe?: boolean | undefined;
                 }>;
@@ -5112,7 +5112,7 @@ declare const betterAuth: <O extends BetterAuthOptions>(options: O) => {
                     name: string;
                     image?: string | undefined;
                     id: string;
-                    emailVerified: boolean;
+                    emailVerified?: boolean | undefined;
                     createdAt: Date;
                     updatedAt: Date;
                 };
@@ -5922,4 +5922,4 @@ type Auth = {
     options: BetterAuthOptions;
 };
 
-export { csrfMiddleware as $, type Adapter as A, type BetterAuthOptions as B, revokeSession as C, revokeSessions as D, signOut as E, type FieldAttribute as F, type GenericEndpointContext as G, type HookEndpointContext as H, type InferFieldsInputClient as I, forgetPassword as J, forgetPasswordCallback as K, resetPassword as L, createEmailVerificationToken as M, sendVerificationEmail as N, verifyEmail as O, type PluginSchema as P, updateUser as Q, type RateLimit as R, type SecondaryStorage as S, changePassword as T, setPassword as U, deleteUser as V, type Where as W, getCSRFToken as X, error as Y, ok as Z, signUpEmail as _, type Auth as a, betterAuth as a0, type AuthContext as b, type BetterAuthPlugin as c, createAuthMiddleware as d, createAuthEndpoint as e, type AuthEndpoint as f, type AuthMiddleware as g, type InferFieldsOutput as h, type AdditionalUserFieldsInput as i, type AdditionalUserFieldsOutput as j, type AdditionalSessionFieldsInput as k, type AdditionalSessionFieldsOutput as l, type InferUser as m, type InferSession as n, optionsMiddleware as o, type InferPluginTypes as p, init as q, getEndpoints as r, router as s, signInOAuth as t, signInEmail as u, callbackOAuth as v, getSession as w, getSessionFromCtx as x, sessionMiddleware as y, listSessions as z };
+export { csrfMiddleware as $, type Adapter as A, type BetterAuthOptions as B, revokeSession as C, revokeSessions as D, signOut as E, type FieldAttribute as F, type GenericEndpointContext as G, type HookEndpointContext as H, type InferFieldsInputClient as I, forgetPassword as J, forgetPasswordCallback as K, resetPassword as L, createEmailVerificationToken as M, sendVerificationEmail as N, verifyEmail as O, type PluginSchema as P, updateUser as Q, type RateLimit as R, type SecondaryStorage as S, changePassword as T, setPassword as U, deleteUser as V, type Where as W, getCSRFToken as X, error as Y, ok as Z, signUpEmail as _, type Auth as a, betterAuth as a0, type BetterAuthPlugin as b, createAuthMiddleware as c, createAuthEndpoint as d, type AuthEndpoint as e, type AuthMiddleware as f, type InferFieldsOutput as g, type AdditionalUserFieldsInput as h, type AdditionalUserFieldsOutput as i, type AdditionalSessionFieldsInput as j, type AdditionalSessionFieldsOutput as k, type InferUser as l, type InferSession as m, type InferPluginTypes as n, optionsMiddleware as o, init as p, type AuthContext as q, getEndpoints as r, router as s, signInOAuth as t, signInEmail as u, callbackOAuth as v, getSession as w, getSessionFromCtx as x, sessionMiddleware as y, listSessions as z };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { a as Auth, a0 as betterAuth } from './index-CHZzPeLv.js';
+export { a as Auth, a0 as betterAuth } from './index-DUQYmBZY.js';
 import 'zod';
 import 'kysely';
 import './index-QaO4zgiz.js';

package/dist/index.js

@@ -1363,10 +1363,10 @@ function generateRandomInteger(max) {
   }
   return result;
 }
-function generateRandomString(length, alphabet2) {
+function generateRandomString(length, alphabet3) {
   let result = "";
   for (let i = 0; i < length; i++) {
-    result += alphabet2[generateRandomInteger(alphabet2.length)];
+    result += alphabet3[generateRandomInteger(alphabet3.length)];
   }
   return result;
 }
@@ -2063,7 +2063,6 @@ var setPassword = createAuthEndpoint(
     const passwordHash = await ctx.context.password.hash(newPassword);
     if (!account) {
       await ctx.context.internalAdapter.linkAccount({
-        id: generateRandomString(32, alphabet("a-z", "0-9", "A-Z")),
         userId: session.user.id,
         providerId: "credential",
         accountId: session.user.id,
@@ -2309,14 +2308,11 @@ var signUpEmail = () => createAuthEndpoint(
       additionalFields
     );
     const createdUser = await ctx.context.internalAdapter.createUser({
-      id: generateRandomString(32, alphabet("a-z", "0-9", "A-Z")),
       email: email.toLowerCase(),
       name,
       image,
-      emailVerified: false,
-      createdAt: /* @__PURE__ */ new Date(),
-      updatedAt: /* @__PURE__ */ new Date(),
-      ...additionalData
+      ...additionalData,
+      emailVerified: false
     });
     if (!createdUser) {
       throw new APIError9("BAD_REQUEST", {
@@ -2630,7 +2626,33 @@ function getEndpoints(ctx, options) {
   let api = {};
   for (const [key, value] of Object.entries(endpoints)) {
     api[key] = async (context) => {
-      const c = await ctx;
+      let c = 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
+            });
+            if (match) {
+              const hookRes = await hook.handler({
+                ...context,
+                context: {
+                  ...c,
+                  ...context.context
+                }
+              });
+              if (hookRes && "context" in hookRes) {
+                c = {
+                  ...c,
+                  ...hookRes.context
+                };
+              }
+            }
+          }
+        }
+      }
       const endpointRes = await value({
         ...context,
         context: {
@@ -3608,7 +3630,6 @@ var createInternalAdapter = (adapter, ctx) => {
       const createdUser = await createWithHooks(
         {
           id: generateId(),
-          emailVerified: false,
           createdAt: /* @__PURE__ */ new Date(),
           updatedAt: /* @__PURE__ */ new Date(),
           ...user
@@ -3779,7 +3800,13 @@ var createInternalAdapter = (adapter, ctx) => {
       return user;
     },
     linkAccount: async (account) => {
-      const _account = await createWithHooks(account, "account");
+      const _account = await createWithHooks(
+        {
+          ...account,
+          id: generateId()
+        },
+        "account"
+      );
       return _account;
     },
     updateUser: async (userId, data) => {

package/dist/next-js.d.ts

@@ -1,4 +1,4 @@
-import { a as Auth } from './index-CHZzPeLv.js';
+import { a as Auth } from './index-DUQYmBZY.js';
 import { U as User, S as Session } from './index-QaO4zgiz.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-CHZzPeLv.js';
+import { a as Auth } from './index-DUQYmBZY.js';
 import 'zod';
 import 'kysely';
 import './index-QaO4zgiz.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, 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-D1AQaiQ6.js';
+export { A as AnonymousOptions, O as OrganizationOptions, b as Passkey, P as PasskeyOptions, U as UserWithPhoneNumber, 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-BYsLBcLO.js';
 export { i as ac } from './index-DfAHOgpj.js';
-import { b as AuthContext } from './index-CHZzPeLv.js';
-export { f as AuthEndpoint, g as AuthMiddleware, c as BetterAuthPlugin, P as PluginSchema, e as createAuthEndpoint, d as createAuthMiddleware, o as optionsMiddleware } from './index-CHZzPeLv.js';
+import { H as HookEndpointContext } from './index-DUQYmBZY.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-DUQYmBZY.js';
 import './index-QaO4zgiz.js';
 import 'arctic';
 import 'zod';
@@ -20,9 +20,14 @@ import 'mysql2';
  */
 declare const bearer: () => {
     id: "bearer";
-    onRequest(request: Request, ctx: AuthContext): Promise<{
-        request: Request;
-    } | undefined>;
+    hooks: {
+        before: {
+            matcher(context: HookEndpointContext): boolean;
+            handler: (c: HookEndpointContext) => Promise<{
+                context: HookEndpointContext;
+            } | undefined>;
+        }[];
+    };
 };
 
 declare const HIDE_METADATA: {

package/dist/plugins.js

@@ -1193,10 +1193,10 @@ function generateRandomInteger(max) {
   }
   return result;
 }
-function generateRandomString(length, alphabet2) {
+function generateRandomString(length, alphabet3) {
   let result = "";
   for (let i = 0; i < length; i++) {
-    result += alphabet2[generateRandomInteger(alphabet2.length)];
+    result += alphabet3[generateRandomInteger(alphabet3.length)];
   }
   return result;
 }
@@ -1893,7 +1893,6 @@ var setPassword = createAuthEndpoint(
     const passwordHash = await ctx.context.password.hash(newPassword);
     if (!account) {
       await ctx.context.internalAdapter.linkAccount({
-        id: generateRandomString(32, alphabet("a-z", "0-9", "A-Z")),
         userId: session.user.id,
         providerId: "credential",
         accountId: session.user.id,
@@ -2174,14 +2173,11 @@ var signUpEmail = () => createAuthEndpoint(
       additionalFields
     );
     const createdUser = await ctx.context.internalAdapter.createUser({
-      id: generateRandomString(32, alphabet("a-z", "0-9", "A-Z")),
       email: email.toLowerCase(),
       name,
       image,
-      emailVerified: false,
-      createdAt: /* @__PURE__ */ new Date(),
-      updatedAt: /* @__PURE__ */ new Date(),
-      ...additionalData
+      ...additionalData,
+      emailVerified: false
     });
     if (!createdUser) {
       throw new APIError8("BAD_REQUEST", {
@@ -4859,7 +4855,7 @@ var passkey = (options) => {
               authenticatorAttachment: "platform"
             }
           });
-          const id = generateRandomString(32, alphabet("a-z", "0-9"));
+          const id = generateId();
           await ctx.setSignedCookie(
             opts.advanced.webAuthnChallengeCookie,
             id,
@@ -4928,7 +4924,7 @@ var passkey = (options) => {
               id: session?.user.id || ""
             }
           };
-          const id = generateRandomString(32, alphabet("a-z", "0-9"));
+          const id = generateId();
           await ctx.setSignedCookie(
             opts.advanced.webAuthnChallengeCookie,
             id,
@@ -5014,7 +5010,7 @@ var passkey = (options) => {
               credentialBackedUp
             } = registrationInfo;
             const pubKey = Buffer.from(credentialPublicKey).toString("base64");
-            const userID = generateRandomString(32, alphabet("a-z", "0-9"));
+            const userID = generateId();
             const newPasskey = {
               name: ctx.body.name,
               userId: userData.id,
@@ -5425,23 +5421,42 @@ import { serializeSigned } from "better-call";
 var bearer = () => {
   return {
     id: "bearer",
-    async onRequest(request, ctx) {
-      const token = request.headers.get("authorization")?.replace("Bearer ", "");
-      if (!token) {
-        return;
-      }
-      const headers = request.headers || new Headers();
-      const signedToken = await serializeSigned("", token, ctx.secret);
-      headers.set(
-        "cookie",
-        `${ctx.authCookies.sessionToken.name}=${signedToken.replace("=", "")}`
-      );
-      return {
-        request: new Request(request.url, {
-          method: request.method,
-          headers
-        })
-      };
+    hooks: {
+      before: [
+        {
+          matcher(context) {
+            return Boolean(
+              context.request?.headers.get("authorization") || context.headers?.get("authorization")
+            );
+          },
+          handler: async (c) => {
+            const token = c.request?.headers.get("authorization")?.replace("Bearer ", "") || c.headers?.get("authorization")?.replace("Bearer ", "");
+            if (!token) {
+              return;
+            }
+            const signedToken = await serializeSigned(
+              "",
+              token,
+              c.context.secret
+            );
+            if (c.request) {
+              c.request.headers.set(
+                "cookie",
+                `${c.context.authCookies.sessionToken.name}=${signedToken.replace("=", "")}`
+              );
+            }
+            if (c.headers) {
+              c.headers.set(
+                "cookie",
+                `${c.context.authCookies.sessionToken.name}=${signedToken.replace("=", "")}`
+              );
+            }
+            return {
+              context: c
+            };
+          }
+        }
+      ]
     }
   };
 };
@@ -6016,7 +6031,6 @@ var anonymous = (options) => {
           }
           const hash = await ctx.context.password.hash(password);
           const updateUserAccount = await ctx.context.internalAdapter.linkAccount({
-            id: generateRandomString(32, alphabet("a-z", "0-9", "A-Z")),
             userId: updatedUser.id,
             providerId: "credential",
             password: hash,

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-CHZzPeLv.js';
+import './index-DUQYmBZY.js';
 import 'kysely';
 import './index-QaO4zgiz.js';
 import 'arctic';

package/dist/solid-start.d.ts

@@ -1,4 +1,4 @@
-import { a as Auth } from './index-CHZzPeLv.js';
+import { a as Auth } from './index-DUQYmBZY.js';
 import 'zod';
 import 'kysely';
 import './index-QaO4zgiz.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-CHZzPeLv.js';
+import './index-DUQYmBZY.js';
 import 'kysely';
 import './index-QaO4zgiz.js';
 import 'arctic';

package/dist/svelte-kit.d.ts

@@ -1,4 +1,4 @@
-import { a as Auth, B as BetterAuthOptions } from './index-CHZzPeLv.js';
+import { a as Auth, B as BetterAuthOptions } from './index-DUQYmBZY.js';
 import 'zod';
 import 'kysely';
 import './index-QaO4zgiz.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-CHZzPeLv.js';
+import './index-DUQYmBZY.js';
 import 'kysely';
 import './index-QaO4zgiz.js';
 import 'arctic';

package/dist/types.d.ts

@@ -1,5 +1,5 @@
-import { c as BetterAuthPlugin, a as Auth, I as InferFieldsInputClient, h as InferFieldsOutput } from './index-CHZzPeLv.js';
-export { A as Adapter, k as AdditionalSessionFieldsInput, l as AdditionalSessionFieldsOutput, i as AdditionalUserFieldsInput, j as AdditionalUserFieldsOutput, b 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-CHZzPeLv.js';
+import { b as BetterAuthPlugin, a as Auth, I as InferFieldsInputClient, g as InferFieldsOutput } from './index-DUQYmBZY.js';
+export { A as Adapter, j as AdditionalSessionFieldsInput, k as AdditionalSessionFieldsOutput, h as AdditionalUserFieldsInput, i as AdditionalUserFieldsOutput, q as AuthContext, B as BetterAuthOptions, G as GenericEndpointContext, H as HookEndpointContext, n as InferPluginTypes, m as InferSession, l as InferUser, P as PluginSchema, R as RateLimit, S as SecondaryStorage, W as Where, p as init } from './index-DUQYmBZY.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 './index-QaO4zgiz.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-CHZzPeLv.js';
+import './index-DUQYmBZY.js';
 import 'kysely';
 import './index-QaO4zgiz.js';
 import 'arctic';

package/package.json

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