better-auth 0.0.8-beta.2 → 0.0.8-beta.21

package/dist/social.js

@@ -1,7 +1,10 @@
+import { Discord, Facebook, GitHub, Google, Spotify, Twitch, Twitter } from 'arctic';
+import { parseJWT } from 'oslo/jwt';
+import { betterFetch } from '@better-fetch/fetch';
+import { createOAuth2Request, sendTokenRequest } from 'arctic/dist/request';
+import { createConsola } from 'consola';
+
 // src/social-providers/apple.ts
-import "arctic";
-import { parseJWT } from "oslo/jwt";
-import { betterFetch } from "@better-fetch/fetch";
 
 // src/error/better-auth-error.ts
 var BetterAuthError = class extends Error {
@@ -23,41 +26,44 @@ function checkHasPath(url) {
 function withPath(url, path = "/api/auth") {
   const hasPath = checkHasPath(url);
   if (hasPath) {
-    return {
-      baseURL: new URL(url).origin,
-      withPath: url
-    };
+    return url;
   }
   path = path.startsWith("/") ? path : `/${path}`;
-  return {
-    baseURL: url,
-    withPath: `${url}${path}`
-  };
+  return `${url}${path}`;
 }
 function getBaseURL(url, path) {
-  if (url) {
-    return withPath(url, path);
-  }
   const env = typeof process !== "undefined" ? process.env : {};
-  const fromEnv = env.BETTER_AUTH_URL || env.AUTH_URL || env.NEXT_PUBLIC_AUTH_URL || env.NEXT_PUBLIC_BETTER_AUTH_URL || env.PUBLIC_AUTH_URL || env.PUBLIC_BETTER_AUTH_URL || env.NUXT_PUBLIC_BETTER_AUTH_URL || env.NUXT_PUBLIC_AUTH_URL;
+  const fromEnv = env.BETTER_AUTH_URL || env.NEXT_PUBLIC_BETTER_AUTH_URL || env.PUBLIC_BETTER_AUTH_URL || env.NUXT_PUBLIC_BETTER_AUTH_URL || env.NUXT_PUBLIC_AUTH_URL;
   if (fromEnv) {
     return withPath(fromEnv, path);
   }
-  const isDev = !fromEnv && (env.NODE_ENV === "development" || env.NODE_ENV === "test");
-  if (isDev) {
-    return {
-      baseURL: "http://localhost:3000",
-      withPath: "http://localhost:3000/api/auth"
-    };
+  if (typeof window !== "undefined") {
+    return withPath(window.location.origin, path);
   }
-  throw new BetterAuthError(
-    "Could not infer baseURL from environment variables"
-  );
+  return void 0;
 }
 
 // src/social-providers/utils.ts
 function getRedirectURI(providerId, redirectURI) {
-  return redirectURI || `${getBaseURL()}/api/auth/callback/${providerId}`;
+  return redirectURI || `${getBaseURL()}/callback/${providerId}`;
+}
+async function validateAuthorizationCode({
+  code,
+  codeVerifier,
+  redirectURI,
+  options,
+  tokenEndpoint
+}) {
+  const body = new URLSearchParams();
+  body.set("grant_type", "authorization_code");
+  body.set("code", code);
+  body.set("code_verifier", codeVerifier || "");
+  body.set("redirect_uri", redirectURI);
+  body.set("client_id", options.clientId);
+  body.set("client_secret", options.clientSecret);
+  const request = createOAuth2Request(tokenEndpoint, body);
+  const tokens = await sendTokenRequest(request);
+  return tokens;
 }
 
 // src/social-providers/apple.ts
@@ -114,19 +120,11 @@ var apple = ({
     }
   };
 };
-
-// src/social-providers/discord.ts
-import { betterFetch as betterFetch2 } from "@better-fetch/fetch";
-import { Discord } from "arctic";
-var discord = ({
-  clientId,
-  clientSecret,
-  redirectURI
-}) => {
+var discord = (options) => {
   const discordArctic = new Discord(
-    clientId,
-    clientSecret,
-    getRedirectURI("discord", redirectURI)
+    options.clientId,
+    options.clientSecret,
+    getRedirectURI("discord", options.redirectURI)
   );
   return {
     id: "discord",
@@ -135,14 +133,22 @@ var discord = ({
       const _scope = scopes || ["email"];
       return discordArctic.createAuthorizationURL(state, _scope);
     },
-    validateAuthorizationCode: discordArctic.validateAuthorizationCode,
+    validateAuthorizationCode: async (code, codeVerifier, redirectURI) => {
+      return validateAuthorizationCode({
+        code,
+        codeVerifier,
+        redirectURI: redirectURI || getRedirectURI("discord", options.redirectURI),
+        options,
+        tokenEndpoint: "https://discord.com/api/oauth2/token"
+      });
+    },
     async getUserInfo(token) {
-      const { data: profile, error } = await betterFetch2(
+      const { data: profile, error } = await betterFetch(
         "https://discord.com/api/users/@me",
         {
           auth: {
             type: "Bearer",
-            token: token.accessToken
+            token: token.accessToken()
           }
         }
       );
@@ -161,19 +167,11 @@ var discord = ({
     }
   };
 };
-
-// src/social-providers/facebook.ts
-import { betterFetch as betterFetch3 } from "@better-fetch/fetch";
-import { Facebook } from "arctic";
-var facebook = ({
-  clientId,
-  clientSecret,
-  redirectURI
-}) => {
+var facebook = (options) => {
   const facebookArctic = new Facebook(
-    clientId,
-    clientSecret,
-    getRedirectURI("facebook", redirectURI)
+    options.clientId,
+    options.clientSecret,
+    getRedirectURI("facebook", options.redirectURI)
   );
   return {
     id: "facebook",
@@ -182,14 +180,22 @@ var facebook = ({
       const _scopes = scopes || ["email", "public_profile"];
       return facebookArctic.createAuthorizationURL(state, _scopes);
     },
-    validateAuthorizationCode: facebookArctic.validateAuthorizationCode,
+    validateAuthorizationCode: async (code, codeVerifier, redirectURI) => {
+      return validateAuthorizationCode({
+        code,
+        codeVerifier,
+        redirectURI: redirectURI || getRedirectURI("facebook", options.redirectURI),
+        options,
+        tokenEndpoint: "https://graph.facebook.com/v16.0/oauth/access_token"
+      });
+    },
     async getUserInfo(token) {
-      const { data: profile, error } = await betterFetch3(
+      const { data: profile, error } = await betterFetch(
         "https://graph.facebook.com/me",
         {
           auth: {
             type: "Bearer",
-            token: token.accessToken
+            token: token.accessToken()
           }
         }
       );
@@ -208,10 +214,6 @@ var facebook = ({
     }
   };
 };
-
-// src/social-providers/github.ts
-import { betterFetch as betterFetch4 } from "@better-fetch/fetch";
-import { GitHub } from "arctic";
 var github = ({
   clientId,
   clientSecret,
@@ -229,14 +231,17 @@ var github = ({
       const _scopes = scopes || ["user:email"];
       return githubArctic.createAuthorizationURL(state, _scopes);
     },
-    validateAuthorizationCode: githubArctic.validateAuthorizationCode,
+    validateAuthorizationCode: async (state) => {
+      return await githubArctic.validateAuthorizationCode(state);
+    },
     async getUserInfo(token) {
-      const { data: profile, error } = await betterFetch4(
+      console.log(`Bearer ${token.accessToken()}`);
+      const { data: profile, error } = await betterFetch(
         "https://api.github.com/user",
         {
-          method: "GET",
-          headers: {
-            Authorization: `Bearer ${token.accessToken}`
+          auth: {
+            type: "Bearer",
+            token: token.accessToken()
           }
         }
       );
@@ -245,10 +250,10 @@ var github = ({
       }
       let emailVerified = false;
       if (!profile.email) {
-        const { data, error: error2 } = await betterFetch4("https://api.github.com/user/emails", {
-          headers: {
-            Authorization: `Bearer ${token.accessToken}`,
-            "User-Agent": "better-auth"
+        const { data, error: error2 } = await betterFetch("https://api.github.com/user/emails", {
+          auth: {
+            type: "Bearer",
+            token: token.accessToken()
           }
         });
         if (!error2) {
@@ -271,41 +276,81 @@ var github = ({
     }
   };
 };
-
-// src/social-providers/google.ts
-import { Google } from "arctic";
-import { parseJWT as parseJWT2 } from "oslo/jwt";
-var google = ({
-  clientId,
-  clientSecret,
-  redirectURI
-}) => {
+var consola = createConsola({
+  formatOptions: {
+    date: false,
+    colors: true,
+    compact: true
+  },
+  defaults: {
+    tag: "Better Auth"
+  }
+});
+var createLogger = (options) => {
+  return {
+    log: (...args) => {
+      consola.log("", ...args);
+    },
+    error: (...args) => {
+      consola.error("", ...args);
+    },
+    warn: (...args) => {
+      consola.warn("", ...args);
+    },
+    info: (...args) => {
+      consola.info("", ...args);
+    },
+    debug: (...args) => {
+      consola.debug("", ...args);
+    },
+    box: (...args) => {
+      consola.box("", ...args);
+    },
+    success: (...args) => {
+      consola.success("", ...args);
+    },
+    break: (...args) => {
+      console.log("\n");
+    }
+  };
+};
+var logger = createLogger();
+var google = (options) => {
   const googleArctic = new Google(
-    clientId,
-    clientSecret,
-    getRedirectURI("google", redirectURI)
+    options.clientId,
+    options.clientSecret,
+    getRedirectURI("google", options.redirectURI)
   );
   return {
     id: "google",
     name: "Google",
-    createAuthorizationURL({ state, scopes, codeVerifier }) {
+    createAuthorizationURL({ state, scopes, codeVerifier, redirectURI }) {
+      if (!options.clientId || !options.clientSecret) {
+        logger.error(
+          "clientId and clientSecret is required for Google. Make sure to you have provided them in the options"
+        );
+        throw new BetterAuthError("clientId is required for Google");
+      }
       if (!codeVerifier) {
         throw new BetterAuthError("codeVerifier is required for Google");
       }
       const _scopes = scopes || ["email", "profile"];
       return googleArctic.createAuthorizationURL(state, codeVerifier, _scopes);
     },
-    validateAuthorizationCode: async (code, codeVerifier) => {
-      if (!codeVerifier) {
-        throw new BetterAuthError("codeVerifier is required for Google");
-      }
-      return googleArctic.validateAuthorizationCode(code, codeVerifier);
+    validateAuthorizationCode: async (code, codeVerifier, redirectURI) => {
+      return validateAuthorizationCode({
+        code,
+        codeVerifier,
+        redirectURI: redirectURI || getRedirectURI("google", options.redirectURI),
+        options,
+        tokenEndpoint: "https://oauth2.googleapis.com/token"
+      });
     },
     async getUserInfo(token) {
       if (!token.idToken) {
         return null;
       }
-      const user = parseJWT2(token.idToken())?.payload;
+      const user = parseJWT(token.idToken())?.payload;
       return {
         user: {
           id: user.sub,
@@ -319,19 +364,11 @@ var google = ({
     }
   };
 };
-
-// src/social-providers/spotify.ts
-import { betterFetch as betterFetch5 } from "@better-fetch/fetch";
-import { Spotify } from "arctic";
-var spotify = ({
-  clientId,
-  clientSecret,
-  redirectURI
-}) => {
+var spotify = (options) => {
   const spotifyArctic = new Spotify(
-    clientId,
-    clientSecret,
-    getRedirectURI("spotify", redirectURI)
+    options.clientId,
+    options.clientSecret,
+    getRedirectURI("spotify", options.redirectURI)
   );
   return {
     id: "spotify",
@@ -340,14 +377,22 @@ var spotify = ({
       const _scopes = scopes || ["user-read-email"];
       return spotifyArctic.createAuthorizationURL(state, _scopes);
     },
-    validateAuthorizationCode: spotifyArctic.validateAuthorizationCode,
+    validateAuthorizationCode: async (code, codeVerifier, redirectURI) => {
+      return validateAuthorizationCode({
+        code,
+        codeVerifier,
+        redirectURI: redirectURI || getRedirectURI("spotify", options.redirectURI),
+        options,
+        tokenEndpoint: "https://accounts.spotify.com/api/token"
+      });
+    },
     async getUserInfo(token) {
-      const { data: profile, error } = await betterFetch5(
+      const { data: profile, error } = await betterFetch(
         "https://api.spotify.com/v1/me",
         {
           method: "GET",
           headers: {
-            Authorization: `Bearer ${token.accessToken}`
+            Authorization: `Bearer ${token.accessToken()}`
           }
         }
       );
@@ -367,19 +412,11 @@ var spotify = ({
     }
   };
 };
-
-// src/social-providers/twitch.ts
-import { betterFetch as betterFetch6 } from "@better-fetch/fetch";
-import { Twitch } from "arctic";
-var twitch = ({
-  clientId,
-  clientSecret,
-  redirectURI
-}) => {
+var twitch = (options) => {
   const twitchArctic = new Twitch(
-    clientId,
-    clientSecret,
-    getRedirectURI("twitch", redirectURI)
+    options.clientId,
+    options.clientSecret,
+    getRedirectURI("twitch", options.redirectURI)
   );
   return {
     id: "twitch",
@@ -388,14 +425,22 @@ var twitch = ({
       const _scopes = scopes || ["activity:write", "read"];
       return twitchArctic.createAuthorizationURL(state, _scopes);
     },
-    validateAuthorizationCode: twitchArctic.validateAuthorizationCode,
+    validateAuthorizationCode: async (code, codeVerifier, redirectURI) => {
+      return validateAuthorizationCode({
+        code,
+        codeVerifier,
+        redirectURI: redirectURI || getRedirectURI("twitch", options.redirectURI),
+        options,
+        tokenEndpoint: "https://id.twitch.tv/oauth2/token"
+      });
+    },
     async getUserInfo(token) {
-      const { data: profile, error } = await betterFetch6(
+      const { data: profile, error } = await betterFetch(
         "https://api.twitch.tv/helix/users",
         {
           method: "GET",
           headers: {
-            Authorization: `Bearer ${token.accessToken}`
+            Authorization: `Bearer ${token.accessToken()}`
           }
         }
       );
@@ -415,19 +460,11 @@ var twitch = ({
     }
   };
 };
-
-// src/social-providers/twitter.ts
-import { betterFetch as betterFetch7 } from "@better-fetch/fetch";
-import { Twitter } from "arctic";
-var twitter = ({
-  clientId,
-  clientSecret,
-  redirectURI
-}) => {
+var twitter = (options) => {
   const twitterArctic = new Twitter(
-    clientId,
-    clientSecret,
-    getRedirectURI("twitter", redirectURI)
+    options.clientId,
+    options.clientSecret,
+    getRedirectURI("twitter", options.redirectURI)
   );
   return {
     id: "twitter",
@@ -440,19 +477,22 @@ var twitter = ({
         _scopes
       );
     },
-    validateAuthorizationCode: async (code, codeVerifier) => {
-      if (!codeVerifier) {
-        throw new BetterAuthError("codeVerifier is required for Twitter");
-      }
-      return twitterArctic.validateAuthorizationCode(code, codeVerifier);
+    validateAuthorizationCode: async (code, codeVerifier, redirectURI) => {
+      return validateAuthorizationCode({
+        code,
+        codeVerifier,
+        redirectURI: redirectURI || getRedirectURI("twitch", options.redirectURI),
+        options,
+        tokenEndpoint: "https://id.twitch.tv/oauth2/token"
+      });
     },
     async getUserInfo(token) {
-      const { data: profile, error } = await betterFetch7(
+      const { data: profile, error } = await betterFetch(
         "https://api.x.com/2/users/me?user.fields=profile_image_url",
         {
           method: "GET",
           headers: {
-            Authorization: `Bearer ${token.accessToken}`
+            Authorization: `Bearer ${token.accessToken()}`
           }
         }
       );
@@ -476,9 +516,6 @@ var twitter = ({
   };
 };
 
-// src/types/provider.ts
-import "arctic";
-
 // src/social-providers/index.ts
 var oAuthProviders = {
   apple,
@@ -491,16 +528,7 @@ var oAuthProviders = {
   twitter
 };
 var oAuthProviderList = Object.keys(oAuthProviders);
-export {
-  apple,
-  discord,
-  facebook,
-  github,
-  google,
-  oAuthProviderList,
-  oAuthProviders,
-  spotify,
-  twitch,
-  twitter
-};
+
+export { apple, discord, facebook, github, google, oAuthProviderList, oAuthProviders, spotify, twitch, twitter };
+//# sourceMappingURL=social.js.map
 //# sourceMappingURL=social.js.map