better-auth 0.4.1 → 0.4.2

package/dist/plugins.js

@@ -40,9 +40,10 @@ import { generateCodeVerifier } from "oslo/oauth2";
 import { z as z3 } 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 {
@@ -55,9 +56,6 @@ var BetterAuthError = class extends Error {
   }
 };
 
-// src/social-providers/utils.ts
-import { OAuth2Tokens } from "arctic";
-
 // src/utils/base-url.ts
 function checkHasPath(url) {
   try {
@@ -138,7 +136,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);
@@ -148,7 +154,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);
@@ -196,7 +202,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",
@@ -220,7 +226,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: {
@@ -253,20 +259,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({
@@ -278,7 +285,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: {
@@ -304,21 +311,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({
@@ -329,7 +337,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: {
@@ -343,7 +351,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()
@@ -369,7 +377,6 @@ var github = (options) => {
 };
 
 // src/social-providers/google.ts
-import { Google } from "arctic";
 import { parseJWT as parseJWT2 } from "oslo/jwt";
 
 // src/utils/logger.ts
@@ -416,11 +423,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",
@@ -435,11 +437,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) => {
@@ -471,7 +476,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";
@@ -482,14 +487,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({
@@ -503,7 +508,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: {
@@ -539,20 +544,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({
@@ -564,7 +570,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",
@@ -591,20 +597,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({
@@ -615,7 +621,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",
@@ -642,24 +648,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({
@@ -671,7 +674,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",
@@ -4573,7 +4576,7 @@ import { createFetch } from "@better-fetch/fetch";
 import "nanostores";
 
 // src/client/fetch-plugins.ts
-import { betterFetch as betterFetch10 } from "@better-fetch/fetch";
+import { betterFetch as betterFetch9 } from "@better-fetch/fetch";
 
 // src/client/session-atom.ts
 import { atom as atom2 } from "nanostores";

package/dist/react.d.ts

@@ -3,9 +3,9 @@ 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-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/social.d.ts

@@ -1,4 +1,4 @@
-export { j as AppleOptions, i as AppleProfile, n as DiscordOptions, D as DiscordProfile, v as FacebookOptions, F as FacebookProfile, d as GithubOptions, G as GithubProfile, f as GoogleOptions, e as GoogleProfile, M as MicrosoftEntraIDProfile, l as MicrosoftOptions, O as OAuthProvider, b as OAuthProviderList, P as ProviderOptions, a as SocialProviders, r as SpotifyOptions, q as SpotifyProfile, t as TwitchOptions, T as TwitchProfile, y as TwitterOption, x as TwitterProfile, k as apple, p as discord, w as facebook, g as github, h as google, m as microsoft, c as oAuthProviderList, o as oAuthProviders, s as spotify, u as twitch, z as twitter } from './types-Bs23H3QM.js';
+export { j as AppleOptions, i as AppleProfile, n as DiscordOptions, D as DiscordProfile, v as FacebookOptions, F as FacebookProfile, d as GithubOptions, G as GithubProfile, f as GoogleOptions, e as GoogleProfile, M as MicrosoftEntraIDProfile, l as MicrosoftOptions, O as OAuthProvider, b as OAuthProviderList, P as ProviderOptions, a as SocialProviders, r as SpotifyOptions, q as SpotifyProfile, t as TwitchOptions, T as TwitchProfile, y as TwitterOption, x as TwitterProfile, k as apple, p as discord, w as facebook, g as github, h as google, m as microsoft, c as oAuthProviderList, o as oAuthProviders, s as spotify, u as twitch, z as twitter } from './types-DoyeJ_dw.js';
 import 'arctic';
 import './helper-DPDj8Nix.js';
 import 'zod';