better-auth 0.3.3-beta.1 → 0.3.3-beta.3

package/dist/adapters/drizzle.d.ts

@@ -1,6 +1,6 @@
-import { A as Adapter } from '../index-DHmaFGpa.js';
+import { A as Adapter } from '../index-Cj2o9gfR.js';
 import 'kysely';
-import '../index-BlnDgm2S.js';
+import '../index-CT4RHCuS.js';
 import 'arctic';
 import 'zod';
 import '../helper-DPDj8Nix.js';

package/dist/adapters/mongodb.d.ts

@@ -1,7 +1,7 @@
 import { Db } from 'mongodb';
-import { W as Where } from '../index-DHmaFGpa.js';
+import { W as Where } from '../index-Cj2o9gfR.js';
 import 'kysely';
-import '../index-BlnDgm2S.js';
+import '../index-CT4RHCuS.js';
 import 'arctic';
 import 'zod';
 import '../helper-DPDj8Nix.js';

package/dist/adapters/prisma.d.ts

@@ -1,6 +1,6 @@
-import { A as Adapter } from '../index-DHmaFGpa.js';
+import { A as Adapter } from '../index-Cj2o9gfR.js';
 import 'kysely';
-import '../index-BlnDgm2S.js';
+import '../index-CT4RHCuS.js';
 import 'arctic';
 import 'zod';
 import '../helper-DPDj8Nix.js';

package/dist/api.d.ts

@@ -1,9 +1,9 @@
-export { f as AuthEndpoint, g as AuthMiddleware, n as callbackOAuth, L as changePassword, e as createAuthEndpoint, d as createAuthMiddleware, D as createEmailVerificationToken, V as csrfMiddleware, N as deleteUser, Q as error, y as forgetPassword, z as forgetPasswordCallback, O as getCSRFToken, l as getEndpoints, p as getSession, q as getSessionFromCtx, u as listSessions, T as ok, o as optionsMiddleware, C as resetPassword, v as revokeSession, w as revokeSessions, r as router, E as sendVerificationEmail, t as sessionMiddleware, M as setPassword, m as signInEmail, s as signInOAuth, x as signOut, U as signUpEmail, K as updateUser, J as verifyEmail } from './index-DHmaFGpa.js';
+export { f as AuthEndpoint, g as AuthMiddleware, n as callbackOAuth, L as changePassword, e as createAuthEndpoint, d as createAuthMiddleware, D as createEmailVerificationToken, V as csrfMiddleware, N as deleteUser, Q as error, y as forgetPassword, z as forgetPasswordCallback, O as getCSRFToken, l as getEndpoints, p as getSession, q as getSessionFromCtx, u as listSessions, T as ok, o as optionsMiddleware, C as resetPassword, v as revokeSession, w as revokeSessions, r as router, E as sendVerificationEmail, t as sessionMiddleware, M as setPassword, m as signInEmail, s as signInOAuth, x as signOut, U as signUpEmail, K as updateUser, J as verifyEmail } from './index-Cj2o9gfR.js';
 import 'zod';
 import './helper-DPDj8Nix.js';
 import 'better-call';
 import 'kysely';
-import './index-BlnDgm2S.js';
+import './index-CT4RHCuS.js';
 import 'arctic';
 import 'better-sqlite3';
 import 'mysql2';

package/dist/api.js

@@ -362,26 +362,27 @@ var facebook = (options) => {
 // src/social-providers/github.ts
 import { betterFetch as betterFetch5 } from "@better-fetch/fetch";
 import { GitHub } from "arctic";
-var github = ({
-  clientId,
-  clientSecret,
-  scope,
-  redirectURI
-}) => {
+var github = (options) => {
   const githubArctic = new GitHub(
-    clientId,
-    clientSecret,
-    getRedirectURI("github", redirectURI)
+    options.clientId,
+    options.clientSecret,
+    getRedirectURI("github", options.redirectURI)
   );
+  const tokenEndpoint = "https://github.com/login/oauth/access_token";
   return {
     id: "github",
     name: "Github",
     createAuthorizationURL({ state, scopes }) {
-      const _scopes = scope || scopes || ["user:email"];
+      const _scopes = options.scope || scopes || ["user:email"];
       return githubArctic.createAuthorizationURL(state, _scopes);
     },
-    validateAuthorizationCode: async (state) => {
-      return await githubArctic.validateAuthorizationCode(state);
+    validateAuthorizationCode: async (code, _, redirect) => {
+      return validateAuthorizationCode({
+        code,
+        redirectURI: options.redirectURI || getRedirectURI("google", redirect),
+        options,
+        tokenEndpoint
+      });
     },
     async getUserInfo(token) {
       const { data: profile, error: error2 } = await betterFetch5(
@@ -415,9 +416,7 @@ var github = ({
           name: profile.name,
           email: profile.email,
           image: profile.avatar_url,
-          emailVerified,
-          createdAt: /* @__PURE__ */ new Date(),
-          updatedAt: /* @__PURE__ */ new Date()
+          emailVerified
         },
         data: profile
       };
@@ -1397,6 +1396,7 @@ var callbackOAuth = createAuthEndpoint(
     }
     const { callbackURL, currentURL, dontRememberMe } = parsedState.data;
     if (!user || data.success === false) {
+      logger.error("Unable to get user info", data.error);
       throw c.redirect(
         `${c.context.baseURL}/error?error=oauth_validation_failed`
       );
@@ -2239,48 +2239,92 @@ var signUpEmail = createAuthEndpoint(
   },
   async (ctx) => {
     if (!ctx.context.options.emailAndPassword?.enabled) {
-      return ctx.json(null, {
-        status: 400,
-        body: {
-          message: "Email and password is not enabled"
+      return ctx.json(
+        {
+          user: null,
+          session: null,
+          error: {
+            message: "Email and password is not enabled"
+          }
+        },
+        {
+          status: 400,
+          body: {
+            message: "Email and password is not enabled"
+          }
         }
-      });
+      );
     }
     const { name, email, password, image } = ctx.body;
     const isValidEmail = z11.string().email().safeParse(email);
     if (!isValidEmail.success) {
-      return ctx.json(null, {
-        status: 400,
-        body: {
-          message: "Invalid email address"
+      return ctx.json(
+        {
+          user: null,
+          session: null,
+          error: {
+            message: "Invalid email address"
+          }
+        },
+        {
+          status: 400,
+          body: {
+            message: "Invalid email address"
+          }
         }
-      });
+      );
     }
     const minPasswordLength = ctx.context.password.config.minPasswordLength;
     if (password.length < minPasswordLength) {
       ctx.context.logger.error("Password is too short");
-      return ctx.json(null, {
-        status: 400,
-        body: { message: "Password is too short" }
-      });
+      return ctx.json(
+        {
+          user: null,
+          session: null,
+          error: {
+            message: "Password is too short"
+          }
+        },
+        {
+          status: 400,
+          body: { message: "Password is too short" }
+        }
+      );
     }
     const maxPasswordLength = ctx.context.password.config.maxPasswordLength;
     if (password.length > maxPasswordLength) {
       ctx.context.logger.error("Password is too long");
-      return ctx.json(null, {
-        status: 400,
-        body: { message: "Password is too long" }
-      });
+      return ctx.json(
+        {
+          user: null,
+          session: null,
+          error: {
+            message: "Password is too long"
+          }
+        },
+        {
+          status: 400,
+          body: { message: "Password is too long" }
+        }
+      );
     }
     const dbUser = await ctx.context.internalAdapter.findUserByEmail(email);
-    const hash = await ctx.context.password.hash(password);
     if (dbUser?.user) {
-      return ctx.json(null, {
-        status: 400,
-        body: {
-          message: "User already exists"
+      return ctx.json(
+        {
+          user: null,
+          session: null,
+          error: {
+            message: "User already exists"
+          }
+        },
+        {
+          status: 400,
+          body: {
+            message: "User already exists"
+          }
         }
-      });
+      );
     }
     const createdUser = await ctx.context.internalAdapter.createUser({
       id: generateRandomString(32, alphabet("a-z", "0-9", "A-Z")),
@@ -2292,13 +2336,23 @@ var signUpEmail = createAuthEndpoint(
       updatedAt: /* @__PURE__ */ new Date()
     });
     if (!createdUser) {
-      return ctx.json(null, {
-        status: 400,
-        body: {
-          message: "Could not create user"
+      return ctx.json(
+        {
+          user: null,
+          session: null,
+          error: {
+            message: "Could not create user"
+          }
+        },
+        {
+          status: 400,
+          body: {
+            message: "Could not create user"
+          }
         }
-      });
+      );
     }
+    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,
@@ -2311,12 +2365,21 @@ var signUpEmail = createAuthEndpoint(
       ctx.request
     );
     if (!session) {
-      return ctx.json(null, {
-        status: 400,
-        body: {
-          message: "Could not create session"
+      return ctx.json(
+        {
+          user: null,
+          session: null,
+          error: {
+            message: "Could not create session"
+          }
+        },
+        {
+          status: 400,
+          body: {
+            message: "Could not create session"
+          }
         }
-      });
+      );
     }
     await setSessionCookie(ctx, session.id);
     if (ctx.context.options.emailAndPassword.sendEmailVerificationOnSignUp) {
@@ -2334,7 +2397,8 @@ var signUpEmail = createAuthEndpoint(
     return ctx.json(
       {
         user: createdUser,
-        session
+        session,
+        error: null
       },
       {
         body: ctx.body.callbackURL ? {

package/dist/client/plugins.d.ts

@@ -2,14 +2,14 @@ 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-8Ml1biZQ.js';
-export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-8Ml1biZQ.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-CMf5Aw2R.js';
+export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-CMf5Aw2R.js';
 import { P as Prettify } from '../helper-DPDj8Nix.js';
-import '../index-BlnDgm2S.js';
+import '../index-CT4RHCuS.js';
 import 'arctic';
 import 'zod';
 import 'better-call';
-import '../index-DHmaFGpa.js';
+import '../index-Cj2o9gfR.js';
 import 'kysely';
 import 'better-sqlite3';
 import 'mysql2';

package/dist/client.d.ts

@@ -6,9 +6,9 @@ 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-DHmaFGpa.js';
+import './index-Cj2o9gfR.js';
 import 'kysely';
-import './index-BlnDgm2S.js';
+import './index-CT4RHCuS.js';
 import 'arctic';
 import 'better-call';
 import 'better-sqlite3';

package/dist/{index-8Ml1biZQ.d.ts → index-CMf5Aw2R.d.ts}

@@ -1,11 +1,11 @@
-import { U as User, S as Session } from './index-BlnDgm2S.js';
+import { U as User, S as Session } from './index-CT4RHCuS.js';
 import * as better_call from 'better-call';
 import { z, ZodObject, ZodOptional, ZodArray, ZodLiteral } from 'zod';
 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-DHmaFGpa.js';
+import { H as HookEndpointContext } from './index-Cj2o9gfR.js';
 import * as nanostores from 'nanostores';
 import { atom } from 'nanostores';
 import * as _simplewebauthn_types from '@simplewebauthn/types';
@@ -4302,6 +4302,10 @@ declare const magicLink: (options: MagicLinkOptions) => {
     };
 };
 
+interface UserWithPhoneNumber extends User {
+    phoneNumber: string;
+    phoneNumberVerified: boolean;
+}
 declare const phoneNumber: (options?: {
     otp?: {
         /**
@@ -4320,6 +4324,12 @@ declare const phoneNumber: (options?: {
         expiresIn?: number;
     };
     enableAutoSignIn?: boolean;
+    /**
+     * Function to validate phone number
+     *
+     * by default any string is accepted
+     */
+    phoneNumberValidator?: (phoneNumber: string) => boolean;
 }) => {
     id: "phone-number";
     endpoints: {
@@ -4411,6 +4421,9 @@ declare const phoneNumber: (options?: {
                     callbackURL?: string | undefined;
                 }>;
             }>): Promise<{
+                user: null;
+                session: null;
+            } | {
                 user: {
                     id: string;
                     email: string;
@@ -4427,7 +4440,7 @@ declare const phoneNumber: (options?: {
                     ipAddress?: string | undefined;
                     userAgent?: string | undefined;
                 };
-            } | null>;
+            }>;
             path: "/sign-up/phone-number";
             options: {
                 method: "POST";
@@ -4762,4 +4775,4 @@ declare const anonymous: () => {
     };
 };
 
-export { type Invitation as I, type Member as M, type OrganizationOptions as O, type PasskeyOptions as P, twoFactorClient as a, type Passkey as b, passkeyClient as c, phoneNumber as d, anonymous as e, type Organization as f, getPasskeyActions as g, magicLink as m, organization as o, passkey as p, twoFactor as t, username as u };
+export { type Invitation as I, type Member as M, type OrganizationOptions as O, type PasskeyOptions as P, type UserWithPhoneNumber as U, twoFactorClient as a, type Passkey as b, passkeyClient as c, phoneNumber as d, anonymous as e, type Organization as f, getPasskeyActions as g, magicLink as m, organization as o, passkey as p, twoFactor as t, username as u };

package/dist/{index-BlnDgm2S.d.ts → index-CT4RHCuS.d.ts}

@@ -431,7 +431,7 @@ interface GithubProfile {
 }
 interface GithubOptions extends ProviderOptions {
 }
-declare const github: ({ clientId, clientSecret, scope, redirectURI, }: GithubOptions) => {
+declare const github: (options: GithubOptions) => {
     id: "github";
     name: string;
     createAuthorizationURL({ state, scopes }: {
@@ -440,7 +440,7 @@ declare const github: ({ clientId, clientSecret, scope, redirectURI, }: GithubOp
         scopes?: string[];
         redirectURI?: string;
     }): URL;
-    validateAuthorizationCode: (state: string) => Promise<arctic.OAuth2Tokens>;
+    validateAuthorizationCode: (code: string, _: string | undefined, redirect: string | undefined) => Promise<arctic.OAuth2Tokens>;
     getUserInfo(token: arctic.OAuth2Tokens): Promise<{
         user: {
             id: string;
@@ -448,8 +448,6 @@ declare const github: ({ clientId, clientSecret, scope, redirectURI, }: GithubOp
             email: string;
             image: string;
             emailVerified: boolean;
-            createdAt: Date;
-            updatedAt: Date;
         };
         data: GithubProfile;
     } | null>;
@@ -751,7 +749,7 @@ declare const oAuthProviders: {
             data: FacebookProfile;
         } | null>;
     };
-    github: ({ clientId, clientSecret, scope, redirectURI, }: GithubOptions) => {
+    github: (options: GithubOptions) => {
         id: "github";
         name: string;
         createAuthorizationURL({ state, scopes }: {
@@ -760,7 +758,7 @@ declare const oAuthProviders: {
             scopes?: string[];
             redirectURI?: string;
         }): URL;
-        validateAuthorizationCode: (state: string) => Promise<arctic.OAuth2Tokens>;
+        validateAuthorizationCode: (code: string, _: string | undefined, redirect: string | undefined) => Promise<arctic.OAuth2Tokens>;
         getUserInfo(token: arctic.OAuth2Tokens): Promise<{
             user: {
                 id: string;
@@ -768,8 +766,6 @@ declare const oAuthProviders: {
                 email: string;
                 image: string;
                 emailVerified: boolean;
-                createdAt: Date;
-                updatedAt: Date;
             };
             data: GithubProfile;
         } | null>;

package/dist/{index-DHmaFGpa.d.ts → index-Cj2o9gfR.d.ts}

@@ -1,5 +1,5 @@
 import { Kysely, Migration, PostgresPool, Dialect } from 'kysely';
-import { S as Session, U as User, A as Account, V as Verification, O as OAuthProvider, a as AppleProfile, D as DiscordProfile, F as FacebookProfile, G as GithubProfile, b as GoogleProfile, M as MicrosoftEntraIDProfile, c as SpotifyProfile, T as TwitchProfile, d as TwitterProfile, e as SocialProviders, f as OAuthProviderList } from './index-BlnDgm2S.js';
+import { S as Session, U as User, A as Account, V as Verification, O as OAuthProvider, a as AppleProfile, D as DiscordProfile, F as FacebookProfile, G as GithubProfile, b as GoogleProfile, M as MicrosoftEntraIDProfile, c as SpotifyProfile, T as TwitchProfile, d as TwitterProfile, e as SocialProviders, f as OAuthProviderList } from './index-CT4RHCuS.js';
 import * as better_call from 'better-call';
 import { ContextTools, CookieOptions, Endpoint, EndpointResponse, Context, Prettify as Prettify$1 } from 'better-call';
 import * as arctic from 'arctic';
@@ -484,7 +484,7 @@ declare const init: (opts: BetterAuthOptions) => Promise<{
             scopes?: string[];
             redirectURI?: string;
         }): URL;
-        validateAuthorizationCode: (state: string) => Promise<arctic.OAuth2Tokens>;
+        validateAuthorizationCode: (code: string, _: string | undefined, redirect: string | undefined) => Promise<arctic.OAuth2Tokens>;
         getUserInfo(token: arctic.OAuth2Tokens): Promise<{
             user: {
                 id: string;
@@ -492,8 +492,6 @@ declare const init: (opts: BetterAuthOptions) => Promise<{
                 email: string;
                 image: string;
                 emailVerified: boolean;
-                createdAt: Date;
-                updatedAt: Date;
             };
             data: GithubProfile;
         } | null>;
@@ -2341,6 +2339,12 @@ declare const signUpEmail: {
             callbackURL?: string | undefined;
         }>;
     }>): Promise<{
+        user: null;
+        session: null;
+        error: {
+            message: string;
+        };
+    } | {
         user: {
             id: string;
             email: string;
@@ -2357,7 +2361,8 @@ declare const signUpEmail: {
             ipAddress?: string | undefined;
             userAgent?: string | undefined;
         };
-    } | null>;
+        error: null;
+    }>;
     path: "/sign-up/email";
     options: {
         method: "POST";
@@ -2681,6 +2686,12 @@ declare function getEndpoints<C extends AuthContext, Option extends BetterAuthOp
                     callbackURL?: string | undefined;
                 }>;
             }>): Promise<{
+                user: null;
+                session: null;
+                error: {
+                    message: string;
+                };
+            } | {
                 user: {
                     id: string;
                     email: string;
@@ -2697,7 +2708,8 @@ declare function getEndpoints<C extends AuthContext, Option extends BetterAuthOp
                     ipAddress?: string | undefined;
                     userAgent?: string | undefined;
                 };
-            } | null>;
+                error: null;
+            }>;
             path: "/sign-up/email";
             options: {
                 method: "POST";
@@ -3743,6 +3755,12 @@ declare const router: <C extends AuthContext, Option extends BetterAuthOptions>(
                     callbackURL?: string | undefined;
                 }>;
             }>): Promise<{
+                user: null;
+                session: null;
+                error: {
+                    message: string;
+                };
+            } | {
                 user: {
                     id: string;
                     email: string;
@@ -3759,7 +3777,8 @@ declare const router: <C extends AuthContext, Option extends BetterAuthOptions>(
                     ipAddress?: string | undefined;
                     userAgent?: string | undefined;
                 };
-            } | null>;
+                error: null;
+            }>;
             path: "/sign-up/email";
             options: {
                 method: "POST";
@@ -4807,6 +4826,12 @@ declare const betterAuth: <O extends BetterAuthOptions>(options: O) => {
                     callbackURL?: string | undefined;
                 }>;
             }>): Promise<{
+                user: null;
+                session: null;
+                error: {
+                    message: string;
+                };
+            } | {
                 user: {
                     id: string;
                     email: string;
@@ -4823,7 +4848,8 @@ declare const betterAuth: <O extends BetterAuthOptions>(options: O) => {
                     ipAddress?: string | undefined;
                     userAgent?: string | undefined;
                 };
-            } | null>;
+                error: null;
+            }>;
             path: "/sign-up/email";
             options: {
                 method: "POST";

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-export { a as Auth, X as betterAuth } from './index-DHmaFGpa.js';
+export { a as Auth, X as betterAuth } from './index-Cj2o9gfR.js';
 import 'kysely';
-import './index-BlnDgm2S.js';
+import './index-CT4RHCuS.js';
 import 'arctic';
 import 'zod';
 import './helper-DPDj8Nix.js';