better-auth 0.4.1 → 0.4.2

package/dist/adapters/drizzle.d.ts

@@ -1,7 +1,7 @@
-import { A as Adapter } from '../index-C6jmDLjB.js';
+import { A as Adapter } from '../index-C-85i2-P.js';
 import 'zod';
 import 'kysely';
-import '../types-Bs23H3QM.js';
+import '../types-DoyeJ_dw.js';
 import 'arctic';
 import '../helper-DPDj8Nix.js';
 import 'better-call';

package/dist/adapters/mongodb.d.ts

@@ -1,8 +1,8 @@
 import { Db } from 'mongodb';
-import { W as Where } from '../index-C6jmDLjB.js';
+import { W as Where } from '../index-C-85i2-P.js';
 import 'zod';
 import 'kysely';
-import '../types-Bs23H3QM.js';
+import '../types-DoyeJ_dw.js';
 import 'arctic';
 import '../helper-DPDj8Nix.js';
 import 'better-call';

package/dist/adapters/prisma.d.ts

@@ -1,7 +1,7 @@
-import { A as Adapter } from '../index-C6jmDLjB.js';
+import { A as Adapter } from '../index-C-85i2-P.js';
 import 'zod';
 import 'kysely';
-import '../types-Bs23H3QM.js';
+import '../types-DoyeJ_dw.js';
 import 'arctic';
 import '../helper-DPDj8Nix.js';
 import 'better-call';

package/dist/api.d.ts

@@ -1,9 +1,9 @@
-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-C6jmDLjB.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-C-85i2-P.js';
 import './helper-DPDj8Nix.js';
 import 'zod';
 export { APIError } from 'better-call';
 import 'kysely';
-import './types-Bs23H3QM.js';
+import './types-DoyeJ_dw.js';
 import 'arctic';
 import 'better-sqlite3';
 import 'mysql2';

package/dist/api.js

@@ -104,9 +104,10 @@ import { generateCodeVerifier } from "oslo/oauth2";
 import { z as z4 } from "zod";
 
 // src/social-providers/apple.ts
-import "arctic";
 import { parseJWT } from "oslo/jwt";
-import "@better-fetch/fetch";
+
+// src/social-providers/utils.ts
+import { OAuth2Tokens } from "arctic";
 
 // src/error/better-auth-error.ts
 var BetterAuthError = class extends Error {
@@ -119,9 +120,6 @@ var BetterAuthError = class extends Error {
   }
 };
 
-// src/social-providers/utils.ts
-import { OAuth2Tokens } from "arctic";
-
 // src/utils/base-url.ts
 function checkHasPath(url) {
   try {
@@ -198,7 +196,15 @@ function generateCodeChallenge(codeVerifier) {
     includePadding: false
   });
 }
-function createAuthorizationURL(id, options, authorizationEndpoint, state, codeVerifier, scopes, disablePkce) {
+function createAuthorizationURL({
+  id,
+  options,
+  authorizationEndpoint,
+  state,
+  codeVerifier,
+  scopes,
+  disablePkce
+}) {
   const url = new URL(authorizationEndpoint);
   url.searchParams.set("response_type", "code");
   url.searchParams.set("client_id", options.clientId);
@@ -208,7 +214,7 @@ function createAuthorizationURL(id, options, authorizationEndpoint, state, codeV
     "redirect_uri",
     options.redirectURI || getRedirectURI(id)
   );
-  if (!disablePkce) {
+  if (!disablePkce && codeVerifier) {
     const codeChallenge = generateCodeChallenge(codeVerifier);
     url.searchParams.set("code_challenge_method", "S256");
     url.searchParams.set("code_challenge", codeChallenge);
@@ -256,7 +262,7 @@ var apple = (options) => {
 };
 
 // src/social-providers/discord.ts
-import { betterFetch as betterFetch3 } from "@better-fetch/fetch";
+import { betterFetch as betterFetch2 } from "@better-fetch/fetch";
 var discord = (options) => {
   return {
     id: "discord",
@@ -280,7 +286,7 @@ var discord = (options) => {
       });
     },
     async getUserInfo(token) {
-      const { data: profile, error: error2 } = await betterFetch3(
+      const { data: profile, error: error2 } = await betterFetch2(
         "https://discord.com/api/users/@me",
         {
           headers: {
@@ -313,20 +319,21 @@ var discord = (options) => {
 };
 
 // src/social-providers/facebook.ts
-import { betterFetch as betterFetch4 } from "@better-fetch/fetch";
-import { Facebook } from "arctic";
+import { betterFetch as betterFetch3 } from "@better-fetch/fetch";
 var facebook = (options) => {
-  const facebookArctic = new Facebook(
-    options.clientId,
-    options.clientSecret,
-    getRedirectURI("facebook", options.redirectURI)
-  );
   return {
     id: "facebook",
     name: "Facebook",
-    createAuthorizationURL({ state, scopes }) {
+    createAuthorizationURL({ state, scopes, codeVerifier }) {
       const _scopes = options.scope || scopes || ["email", "public_profile"];
-      return facebookArctic.createAuthorizationURL(state, _scopes);
+      return createAuthorizationURL({
+        id: "facebook",
+        options,
+        authorizationEndpoint: "https://www.facebook.com/v16.0/dialog/oauth",
+        scopes: _scopes,
+        state,
+        codeVerifier
+      });
     },
     validateAuthorizationCode: async (code, codeVerifier, redirectURI) => {
       return validateAuthorizationCode({
@@ -338,7 +345,7 @@ var facebook = (options) => {
       });
     },
     async getUserInfo(token) {
-      const { data: profile, error: error2 } = await betterFetch4(
+      const { data: profile, error: error2 } = await betterFetch3(
         "https://graph.facebook.com/me",
         {
           auth: {
@@ -364,21 +371,22 @@ var facebook = (options) => {
 };
 
 // src/social-providers/github.ts
-import { betterFetch as betterFetch5 } from "@better-fetch/fetch";
-import { GitHub } from "arctic";
+import { betterFetch as betterFetch4 } from "@better-fetch/fetch";
 var github = (options) => {
-  const githubArctic = new GitHub(
-    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 }) {
+    createAuthorizationURL({ state, scopes, codeVerifier }) {
       const _scopes = options.scope || scopes || ["user:email"];
-      return githubArctic.createAuthorizationURL(state, _scopes);
+      return createAuthorizationURL({
+        id: "github",
+        options,
+        authorizationEndpoint: "https://github.com/login/oauth/authorize",
+        scopes: _scopes,
+        state,
+        codeVerifier
+      });
     },
     validateAuthorizationCode: async (code, _, redirect) => {
       return validateAuthorizationCode({
@@ -389,7 +397,7 @@ var github = (options) => {
       });
     },
     async getUserInfo(token) {
-      const { data: profile, error: error2 } = await betterFetch5(
+      const { data: profile, error: error2 } = await betterFetch4(
         "https://api.github.com/user",
         {
           auth: {
@@ -403,7 +411,7 @@ var github = (options) => {
       }
       let emailVerified = false;
       if (!profile.email) {
-        const { data, error: error3 } = await betterFetch5("https://api.github.com/user/emails", {
+        const { data, error: error3 } = await betterFetch4("https://api.github.com/user/emails", {
           auth: {
             type: "Bearer",
             token: token.accessToken()
@@ -429,7 +437,6 @@ var github = (options) => {
 };
 
 // src/social-providers/google.ts
-import { Google } from "arctic";
 import { parseJWT as parseJWT2 } from "oslo/jwt";
 
 // src/utils/logger.ts
@@ -476,11 +483,6 @@ var logger = createLogger();
 
 // src/social-providers/google.ts
 var google = (options) => {
-  const googleArctic = new Google(
-    options.clientId,
-    options.clientSecret,
-    getRedirectURI("google", options.redirectURI)
-  );
   return {
     id: "google",
     name: "Google",
@@ -495,11 +497,14 @@ var google = (options) => {
         throw new BetterAuthError("codeVerifier is required for Google");
       }
       const _scopes = options.scope || scopes || ["email", "profile"];
-      const url = googleArctic.createAuthorizationURL(
+      const url = createAuthorizationURL({
+        id: "google",
+        options,
+        authorizationEndpoint: "https://accounts.google.com/o/oauth2/auth",
+        scopes: _scopes,
         state,
-        codeVerifier,
-        _scopes
-      );
+        codeVerifier
+      });
       return url;
     },
     validateAuthorizationCode: async (code, codeVerifier, redirectURI) => {
@@ -531,7 +536,7 @@ var google = (options) => {
 };
 
 // src/social-providers/microsoft-entra-id.ts
-import { betterFetch as betterFetch6 } from "@better-fetch/fetch";
+import { betterFetch as betterFetch5 } from "@better-fetch/fetch";
 import { parseJWT as parseJWT3 } from "oslo/jwt";
 var microsoft = (options) => {
   const tenant = options.tenantId || "common";
@@ -542,14 +547,14 @@ var microsoft = (options) => {
     name: "Microsoft EntraID",
     createAuthorizationURL(data) {
       const scopes = options.scope || data.scopes || ["openid", "profile", "email", "User.Read"];
-      return createAuthorizationURL(
-        "microsoft",
+      return createAuthorizationURL({
+        id: "microsoft",
         options,
         authorizationEndpoint,
-        data.state,
-        data.codeVerifier,
+        state: data.state,
+        codeVerifier: data.codeVerifier,
         scopes
-      );
+      });
     },
     validateAuthorizationCode(code, codeVerifier, redirectURI) {
       return validateAuthorizationCode({
@@ -563,7 +568,7 @@ var microsoft = (options) => {
     async getUserInfo(token) {
       const user = parseJWT3(token.idToken())?.payload;
       const profilePhotoSize = options.profilePhotoSize || 48;
-      await betterFetch6(
+      await betterFetch5(
         `https://graph.microsoft.com/v1.0/me/photos/${profilePhotoSize}x${profilePhotoSize}/$value`,
         {
           headers: {
@@ -599,20 +604,21 @@ var microsoft = (options) => {
 };
 
 // src/social-providers/spotify.ts
-import { betterFetch as betterFetch7 } from "@better-fetch/fetch";
-import { Spotify } from "arctic";
+import { betterFetch as betterFetch6 } from "@better-fetch/fetch";
 var spotify = (options) => {
-  const spotifyArctic = new Spotify(
-    options.clientId,
-    options.clientSecret,
-    getRedirectURI("spotify", options.redirectURI)
-  );
   return {
     id: "spotify",
     name: "Spotify",
-    createAuthorizationURL({ state, scopes }) {
+    createAuthorizationURL({ state, scopes, codeVerifier }) {
       const _scopes = options.scope || scopes || ["user-read-email"];
-      return spotifyArctic.createAuthorizationURL(state, _scopes);
+      return createAuthorizationURL({
+        id: "spotify",
+        options,
+        authorizationEndpoint: "https://accounts.spotify.com/authorize",
+        scopes: _scopes,
+        state,
+        codeVerifier
+      });
     },
     validateAuthorizationCode: async (code, codeVerifier, redirectURI) => {
       return validateAuthorizationCode({
@@ -624,7 +630,7 @@ var spotify = (options) => {
       });
     },
     async getUserInfo(token) {
-      const { data: profile, error: error2 } = await betterFetch7(
+      const { data: profile, error: error2 } = await betterFetch6(
         "https://api.spotify.com/v1/me",
         {
           method: "GET",
@@ -651,20 +657,20 @@ var spotify = (options) => {
 };
 
 // src/social-providers/twitch.ts
-import { betterFetch as betterFetch8 } from "@better-fetch/fetch";
-import { Twitch } from "arctic";
+import { betterFetch as betterFetch7 } from "@better-fetch/fetch";
 var twitch = (options) => {
-  const twitchArctic = new Twitch(
-    options.clientId,
-    options.clientSecret,
-    getRedirectURI("twitch", options.redirectURI)
-  );
   return {
     id: "twitch",
     name: "Twitch",
     createAuthorizationURL({ state, scopes }) {
       const _scopes = options.scope || scopes || ["activity:write", "read"];
-      return twitchArctic.createAuthorizationURL(state, _scopes);
+      return createAuthorizationURL({
+        id: "twitch",
+        options,
+        authorizationEndpoint: "https://id.twitch.tv/oauth2/authorize",
+        scopes: _scopes,
+        state
+      });
     },
     validateAuthorizationCode: async (code, codeVerifier, redirectURI) => {
       return validateAuthorizationCode({
@@ -675,7 +681,7 @@ var twitch = (options) => {
       });
     },
     async getUserInfo(token) {
-      const { data: profile, error: error2 } = await betterFetch8(
+      const { data: profile, error: error2 } = await betterFetch7(
         "https://api.twitch.tv/helix/users",
         {
           method: "GET",
@@ -702,24 +708,21 @@ var twitch = (options) => {
 };
 
 // src/social-providers/twitter.ts
-import { betterFetch as betterFetch9 } from "@better-fetch/fetch";
-import { Twitter } from "arctic";
+import { betterFetch as betterFetch8 } from "@better-fetch/fetch";
 var twitter = (options) => {
-  const twitterArctic = new Twitter(
-    options.clientId,
-    options.clientSecret,
-    getRedirectURI("twitter", options.redirectURI)
-  );
   return {
     id: "twitter",
     name: "Twitter",
     createAuthorizationURL(data) {
       const _scopes = options.scope || data.scopes || ["account_info.read"];
-      return twitterArctic.createAuthorizationURL(
-        data.state,
-        data.codeVerifier,
-        _scopes
-      );
+      return createAuthorizationURL({
+        id: "twitter",
+        options,
+        authorizationEndpoint: "https://twitter.com/i/oauth2/authorize",
+        scopes: _scopes,
+        state: data.state,
+        codeVerifier: data.codeVerifier
+      });
     },
     validateAuthorizationCode: async (code, codeVerifier, redirectURI) => {
       return validateAuthorizationCode({
@@ -731,7 +734,7 @@ var twitter = (options) => {
       });
     },
     async getUserInfo(token) {
-      const { data: profile, error: error2 } = await betterFetch9(
+      const { data: profile, error: error2 } = await betterFetch8(
         "https://api.x.com/2/users/me?user.fields=profile_image_url",
         {
           method: "GET",

package/dist/cli.js

@@ -2,7 +2,6 @@
 
 // src/cli/index.ts
 import { Command as Command3 } from "commander";
-import "dotenv/config";
 
 // src/cli/commands/migrate.ts
 import { Command } from "commander";
@@ -267,7 +266,7 @@ var createKyselyAdapter = async (config) => {
 };
 
 // src/cli/commands/migrate.ts
-import ora from "ora";
+import yoctoSpinner from "yocto-spinner";
 import chalk from "chalk";
 import prompts from "prompts";
 
@@ -726,7 +725,7 @@ var migrate = new Command("migrate").option(
     );
     process.exit(1);
   }
-  const spinner = ora("preparing migration...").start();
+  const spinner = yoctoSpinner({ text: "preparing migration..." }).start();
   const { toBeAdded, toBeCreated, runMigrations } = await getMigrations(config);
   if (!toBeAdded.length && !toBeCreated.length) {
     spinner.stop();
@@ -766,7 +765,7 @@ import { Command as Command2 } from "commander";
 import { z as z2 } from "zod";
 import { existsSync as existsSync3 } from "fs";
 import path4 from "path";
-import ora2 from "ora";
+import yoctoSpinner2 from "yocto-spinner";
 import prompts2 from "prompts";
 
 // src/adapters/kysely-adapter/index.ts
@@ -1105,7 +1104,7 @@ var generate = new Command2("generate").option(
     );
     return;
   }
-  const spinner = ora2("preparing schema...").start();
+  const spinner = yoctoSpinner2({ text: "preparing schema..." }).start();
   const adapter = await getAdapter(config, true).catch((e) => {
     logger.error(e.message);
     process.exit(1);

package/dist/client/plugins.d.ts

@@ -2,13 +2,13 @@ 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, j as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber, e as anonymous, i as admin } from '../index-DCBFTxDp.js';
-export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-DCBFTxDp.js';
+import { o as organization, j as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber, e as anonymous, i as admin } from '../index-BOgQnoz7.js';
+export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-BOgQnoz7.js';
 import { P as Prettify } from '../helper-DPDj8Nix.js';
-import { F as FieldAttribute, B as BetterAuthOptions, b as BetterAuthPlugin } from '../index-C6jmDLjB.js';
+import { F as FieldAttribute, B as BetterAuthOptions, b as BetterAuthPlugin } from '../index-C-85i2-P.js';
 import * as better_call from 'better-call';
 import { z } from 'zod';
-import { U as User } from '../types-Bs23H3QM.js';
+import { U as User } from '../types-DoyeJ_dw.js';
 import { OAuth2Tokens } from 'arctic';
 import '@simplewebauthn/types';
 import 'kysely';

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-C6jmDLjB.js';
+import './index-C-85i2-P.js';
 import 'kysely';
-import './types-Bs23H3QM.js';
+import './types-DoyeJ_dw.js';
 import 'arctic';
 import 'better-call';
 import 'better-sqlite3';

package/dist/{index-DCBFTxDp.d.ts → index-BOgQnoz7.d.ts}

@@ -1,11 +1,11 @@
-import { U as User, S as Session } from './types-Bs23H3QM.js';
+import { U as User, S as Session } from './types-DoyeJ_dw.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, g as AuthContext } from './index-C6jmDLjB.js';
+import { H as HookEndpointContext, g as AuthContext } from './index-C-85i2-P.js';
 import * as nanostores from 'nanostores';
 import { atom } from 'nanostores';
 import * as _simplewebauthn_types from '@simplewebauthn/types';

package/dist/{index-C6jmDLjB.d.ts → index-C-85i2-P.d.ts}

@@ -1,7 +1,7 @@
 import * as zod from 'zod';
 import { ZodSchema, z, ZodString, ZodOptional, ZodObject } from 'zod';
 import { Kysely, Migration, PostgresPool, Dialect } from 'kysely';
-import { O as OAuthProvider, U as User, S as Session, a as SocialProviders, A as Account, b as OAuthProviderList, V as Verification } from './types-Bs23H3QM.js';
+import { O as OAuthProvider, U as User, S as Session, a as SocialProviders, A as Account, b as OAuthProviderList, V as Verification } from './types-DoyeJ_dw.js';
 import * as better_call from 'better-call';
 import { ContextTools, CookieOptions, Endpoint, EndpointResponse, Context, Prettify as Prettify$1 } from 'better-call';
 import { L as LiteralString, D as DeepPartial, U as UnionToIntersection, S as StripEmptyObjects, P as Prettify } from './helper-DPDj8Nix.js';

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-export { a as Auth, a0 as betterAuth } from './index-C6jmDLjB.js';
+export { a as Auth, a0 as betterAuth } from './index-C-85i2-P.js';
 import 'zod';
 import 'kysely';
-import './types-Bs23H3QM.js';
+import './types-DoyeJ_dw.js';
 import 'arctic';
 import './helper-DPDj8Nix.js';
 import 'better-call';