better-auth 0.4.2 → 0.4.3

package/dist/index.js

@@ -9,7 +9,7 @@ import { z } from "zod";
 import { xchacha20poly1305 } from "@noble/ciphers/chacha";
 import { bytesToHex, hexToBytes, utf8ToBytes } from "@noble/ciphers/utils";
 import { managedNonce } from "@noble/ciphers/webcrypto";
-import { sha256 } from "@noble/hashes/sha256";
+import { sha256 } from "oslo/crypto";
 async function hs256(secretKey, message) {
   const enc = new TextEncoder();
   const algorithm = { name: "HMAC", hash: "SHA-256" };
@@ -107,7 +107,7 @@ import { z as z4 } from "zod";
 import { parseJWT } from "oslo/jwt";
 
 // src/social-providers/utils.ts
-import { OAuth2Tokens } from "arctic";
+import { sha256 as sha2562 } from "oslo/crypto";
 
 // src/error/better-auth-error.ts
 var BetterAuthError = class extends Error {
@@ -156,7 +156,6 @@ function getBaseURL(url, path) {
 
 // src/social-providers/utils.ts
 import { betterFetch } from "@better-fetch/fetch";
-import { sha256 as sha2562 } from "@noble/hashes/sha256";
 import { base64url } from "oslo/encoding";
 function getRedirectURI(providerId, redirectURI) {
   return redirectURI || `${getBaseURL()}/callback/${providerId}`;
@@ -187,16 +186,18 @@ async function validateAuthorizationCode({
   if (error2) {
     throw error2;
   }
-  const tokens = new OAuth2Tokens(data);
+  const tokens = getOAuth2Tokens(data);
   return tokens;
 }
-function generateCodeChallenge(codeVerifier) {
-  const codeChallengeBytes = sha2562(new TextEncoder().encode(codeVerifier));
-  return base64url.encode(codeChallengeBytes, {
+async function generateCodeChallenge(codeVerifier) {
+  const codeChallengeBytes = await sha2562(
+    new TextEncoder().encode(codeVerifier)
+  );
+  return base64url.encode(new Uint8Array(codeChallengeBytes), {
     includePadding: false
   });
 }
-function createAuthorizationURL({
+async function createAuthorizationURL({
   id,
   options,
   authorizationEndpoint,
@@ -215,12 +216,22 @@ function createAuthorizationURL({
     options.redirectURI || getRedirectURI(id)
   );
   if (!disablePkce && codeVerifier) {
-    const codeChallenge = generateCodeChallenge(codeVerifier);
+    const codeChallenge = await generateCodeChallenge(codeVerifier);
     url.searchParams.set("code_challenge_method", "S256");
     url.searchParams.set("code_challenge", codeChallenge);
   }
   return url;
 }
+function getOAuth2Tokens(data) {
+  return {
+    tokenType: data.token_type,
+    accessToken: data.access_token,
+    refreshToken: data.refresh_token,
+    accessTokenExpiresAt: data.expires_at ? new Date((Date.now() + data.expires_in) * 1e3) : void 0,
+    scopes: data.scope?.split(" ") || [],
+    idToken: data.id_token
+  };
+}
 
 // src/social-providers/apple.ts
 var apple = (options) => {
@@ -244,7 +255,10 @@ var apple = (options) => {
       });
     },
     async getUserInfo(token) {
-      const data = parseJWT(token.idToken())?.payload;
+      if (!token.idToken) {
+        return null;
+      }
+      const data = parseJWT(token.idToken)?.payload;
       if (!data) {
         return null;
       }
@@ -290,7 +304,7 @@ var discord = (options) => {
         "https://discord.com/api/users/@me",
         {
           headers: {
-            authorization: `Bearer ${token.accessToken()}`
+            authorization: `Bearer ${token.accessToken}`
           }
         }
       );
@@ -324,9 +338,9 @@ var facebook = (options) => {
   return {
     id: "facebook",
     name: "Facebook",
-    createAuthorizationURL({ state, scopes, codeVerifier }) {
+    async createAuthorizationURL({ state, scopes, codeVerifier }) {
       const _scopes = options.scope || scopes || ["email", "public_profile"];
-      return createAuthorizationURL({
+      return await createAuthorizationURL({
         id: "facebook",
         options,
         authorizationEndpoint: "https://www.facebook.com/v16.0/dialog/oauth",
@@ -350,7 +364,7 @@ var facebook = (options) => {
         {
           auth: {
             type: "Bearer",
-            token: token.accessToken()
+            token: token.accessToken
           }
         }
       );
@@ -402,7 +416,7 @@ var github = (options) => {
         {
           auth: {
             type: "Bearer",
-            token: token.accessToken()
+            token: token.accessToken
           }
         }
       );
@@ -414,7 +428,7 @@ var github = (options) => {
         const { data, error: error3 } = await betterFetch4("https://api.github.com/user/emails", {
           auth: {
             type: "Bearer",
-            token: token.accessToken()
+            token: token.accessToken
           }
         });
         if (!error3) {
@@ -520,7 +534,7 @@ var google = (options) => {
       if (!token.idToken) {
         return null;
       }
-      const user = parseJWT2(token.idToken())?.payload;
+      const user = parseJWT2(token.idToken)?.payload;
       return {
         user: {
           id: user.sub,
@@ -566,13 +580,16 @@ var microsoft = (options) => {
       });
     },
     async getUserInfo(token) {
-      const user = parseJWT3(token.idToken())?.payload;
+      if (!token.idToken) {
+        return null;
+      }
+      const user = parseJWT3(token.idToken)?.payload;
       const profilePhotoSize = options.profilePhotoSize || 48;
       await betterFetch5(
         `https://graph.microsoft.com/v1.0/me/photos/${profilePhotoSize}x${profilePhotoSize}/$value`,
         {
           headers: {
-            Authorization: `Bearer ${token.accessToken()}`
+            Authorization: `Bearer ${token.accessToken}`
           },
           async onResponse(context) {
             if (options.disableProfilePhoto || !context.response.ok) {
@@ -635,7 +652,7 @@ var spotify = (options) => {
         {
           method: "GET",
           headers: {
-            Authorization: `Bearer ${token.accessToken()}`
+            Authorization: `Bearer ${token.accessToken}`
           }
         }
       );
@@ -686,7 +703,7 @@ var twitch = (options) => {
         {
           method: "GET",
           headers: {
-            Authorization: `Bearer ${token.accessToken()}`
+            Authorization: `Bearer ${token.accessToken}`
           }
         }
       );
@@ -739,7 +756,7 @@ var twitter = (options) => {
         {
           method: "GET",
           headers: {
-            Authorization: `Bearer ${token.accessToken()}`
+            Authorization: `Bearer ${token.accessToken}`
           }
         }
       );
@@ -763,9 +780,6 @@ var twitter = (options) => {
   };
 };
 
-// src/social-providers/types.ts
-import "arctic";
-
 // src/social-providers/index.ts
 var oAuthProviders = {
   apple,
@@ -1165,7 +1179,7 @@ var signInOAuth = createAuthEndpoint(
       c.context.secret,
       cookie.pkCodeVerifier.options
     );
-    const url = provider.createAuthorizationURL({
+    const url = await provider.createAuthorizationURL({
       state: state.state,
       codeVerifier
     });
@@ -1416,11 +1430,11 @@ var HIDE_METADATA = {
 
 // src/utils/getAccount.ts
 function getAccountTokens(tokens) {
-  const accessToken = tokens.accessToken();
-  let refreshToken = tokens.hasRefreshToken() ? tokens.refreshToken() : void 0;
+  const accessToken = tokens.accessToken;
+  let refreshToken = tokens.refreshToken;
   let accessTokenExpiresAt = void 0;
   try {
-    accessTokenExpiresAt = tokens.accessTokenExpiresAt();
+    accessTokenExpiresAt = tokens.accessTokenExpiresAt;
   } catch {
   }
   return {

package/dist/next-js.d.ts

@@ -1,5 +1,5 @@
-import { a as Auth } from './index-C-85i2-P.js';
-import { U as User, S as Session } from './types-DoyeJ_dw.js';
+import { a as Auth } from './index-DTlKO6LZ.js';
+import { U as User, S as Session } from './types-IzAbV4nB.js';
 import { NextRequest } from 'next/server';
 import 'zod';
 import 'kysely';
@@ -7,7 +7,6 @@ import 'better-call';
 import './helper-DPDj8Nix.js';
 import 'better-sqlite3';
 import 'mysql2';
-import 'arctic';
 
 declare function toNextJsHandler(auth: Auth | Auth["handler"]): {
     GET: (request: Request) => Promise<Response>;

package/dist/node.d.ts

@@ -1,9 +1,8 @@
 import * as http from 'http';
-import { a as Auth } from './index-C-85i2-P.js';
+import { a as Auth } from './index-DTlKO6LZ.js';
 import 'zod';
 import 'kysely';
-import './types-DoyeJ_dw.js';
-import 'arctic';
+import './types-IzAbV4nB.js';
 import './helper-DPDj8Nix.js';
 import 'better-call';
 import 'better-sqlite3';

package/dist/plugins.d.ts

@@ -1,10 +1,9 @@
-export { A as AnonymousOptions, O as OrganizationOptions, b as Passkey, P as PasskeyOptions, U as UserWithPhoneNumber, f as UserWithRole, i as admin, h as adminMiddleware, 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-BOgQnoz7.js';
+export { A as AnonymousOptions, O as OrganizationOptions, b as Passkey, P as PasskeyOptions, U as UserWithPhoneNumber, f as UserWithRole, i as admin, h as adminMiddleware, 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-BJjwxSm5.js';
 export { i as ac } from './index-DfAHOgpj.js';
-import { H as HookEndpointContext } from './index-C-85i2-P.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-C-85i2-P.js';
-import './types-DoyeJ_dw.js';
+import { H as HookEndpointContext } from './index-DTlKO6LZ.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-DTlKO6LZ.js';
+import './types-IzAbV4nB.js';
 import 'zod';
-import 'arctic';
 import './helper-DPDj8Nix.js';
 import 'better-call';
 import './statement-CfnyN34h.js';

package/dist/plugins.js

@@ -43,7 +43,7 @@ import { z as z3 } from "zod";
 import { parseJWT } from "oslo/jwt";
 
 // src/social-providers/utils.ts
-import { OAuth2Tokens } from "arctic";
+import { sha256 } from "oslo/crypto";
 
 // src/error/better-auth-error.ts
 var BetterAuthError = class extends Error {
@@ -96,7 +96,6 @@ function getOrigin(url) {
 
 // src/social-providers/utils.ts
 import { betterFetch } from "@better-fetch/fetch";
-import { sha256 } from "@noble/hashes/sha256";
 import { base64url } from "oslo/encoding";
 function getRedirectURI(providerId, redirectURI) {
   return redirectURI || `${getBaseURL()}/callback/${providerId}`;
@@ -127,16 +126,18 @@ async function validateAuthorizationCode({
   if (error2) {
     throw error2;
   }
-  const tokens = new OAuth2Tokens(data);
+  const tokens = getOAuth2Tokens(data);
   return tokens;
 }
-function generateCodeChallenge(codeVerifier) {
-  const codeChallengeBytes = sha256(new TextEncoder().encode(codeVerifier));
-  return base64url.encode(codeChallengeBytes, {
+async function generateCodeChallenge(codeVerifier) {
+  const codeChallengeBytes = await sha256(
+    new TextEncoder().encode(codeVerifier)
+  );
+  return base64url.encode(new Uint8Array(codeChallengeBytes), {
     includePadding: false
   });
 }
-function createAuthorizationURL({
+async function createAuthorizationURL({
   id,
   options,
   authorizationEndpoint,
@@ -155,12 +156,22 @@ function createAuthorizationURL({
     options.redirectURI || getRedirectURI(id)
   );
   if (!disablePkce && codeVerifier) {
-    const codeChallenge = generateCodeChallenge(codeVerifier);
+    const codeChallenge = await generateCodeChallenge(codeVerifier);
     url.searchParams.set("code_challenge_method", "S256");
     url.searchParams.set("code_challenge", codeChallenge);
   }
   return url;
 }
+function getOAuth2Tokens(data) {
+  return {
+    tokenType: data.token_type,
+    accessToken: data.access_token,
+    refreshToken: data.refresh_token,
+    accessTokenExpiresAt: data.expires_at ? new Date((Date.now() + data.expires_in) * 1e3) : void 0,
+    scopes: data.scope?.split(" ") || [],
+    idToken: data.id_token
+  };
+}
 
 // src/social-providers/apple.ts
 var apple = (options) => {
@@ -184,7 +195,10 @@ var apple = (options) => {
       });
     },
     async getUserInfo(token) {
-      const data = parseJWT(token.idToken())?.payload;
+      if (!token.idToken) {
+        return null;
+      }
+      const data = parseJWT(token.idToken)?.payload;
       if (!data) {
         return null;
       }
@@ -230,7 +244,7 @@ var discord = (options) => {
         "https://discord.com/api/users/@me",
         {
           headers: {
-            authorization: `Bearer ${token.accessToken()}`
+            authorization: `Bearer ${token.accessToken}`
           }
         }
       );
@@ -264,9 +278,9 @@ var facebook = (options) => {
   return {
     id: "facebook",
     name: "Facebook",
-    createAuthorizationURL({ state, scopes, codeVerifier }) {
+    async createAuthorizationURL({ state, scopes, codeVerifier }) {
       const _scopes = options.scope || scopes || ["email", "public_profile"];
-      return createAuthorizationURL({
+      return await createAuthorizationURL({
         id: "facebook",
         options,
         authorizationEndpoint: "https://www.facebook.com/v16.0/dialog/oauth",
@@ -290,7 +304,7 @@ var facebook = (options) => {
         {
           auth: {
             type: "Bearer",
-            token: token.accessToken()
+            token: token.accessToken
           }
         }
       );
@@ -342,7 +356,7 @@ var github = (options) => {
         {
           auth: {
             type: "Bearer",
-            token: token.accessToken()
+            token: token.accessToken
           }
         }
       );
@@ -354,7 +368,7 @@ var github = (options) => {
         const { data, error: error3 } = await betterFetch4("https://api.github.com/user/emails", {
           auth: {
             type: "Bearer",
-            token: token.accessToken()
+            token: token.accessToken
           }
         });
         if (!error3) {
@@ -460,7 +474,7 @@ var google = (options) => {
       if (!token.idToken) {
         return null;
       }
-      const user = parseJWT2(token.idToken())?.payload;
+      const user = parseJWT2(token.idToken)?.payload;
       return {
         user: {
           id: user.sub,
@@ -506,13 +520,16 @@ var microsoft = (options) => {
       });
     },
     async getUserInfo(token) {
-      const user = parseJWT3(token.idToken())?.payload;
+      if (!token.idToken) {
+        return null;
+      }
+      const user = parseJWT3(token.idToken)?.payload;
       const profilePhotoSize = options.profilePhotoSize || 48;
       await betterFetch5(
         `https://graph.microsoft.com/v1.0/me/photos/${profilePhotoSize}x${profilePhotoSize}/$value`,
         {
           headers: {
-            Authorization: `Bearer ${token.accessToken()}`
+            Authorization: `Bearer ${token.accessToken}`
           },
           async onResponse(context) {
             if (options.disableProfilePhoto || !context.response.ok) {
@@ -575,7 +592,7 @@ var spotify = (options) => {
         {
           method: "GET",
           headers: {
-            Authorization: `Bearer ${token.accessToken()}`
+            Authorization: `Bearer ${token.accessToken}`
           }
         }
       );
@@ -626,7 +643,7 @@ var twitch = (options) => {
         {
           method: "GET",
           headers: {
-            Authorization: `Bearer ${token.accessToken()}`
+            Authorization: `Bearer ${token.accessToken}`
           }
         }
       );
@@ -679,7 +696,7 @@ var twitter = (options) => {
         {
           method: "GET",
           headers: {
-            Authorization: `Bearer ${token.accessToken()}`
+            Authorization: `Bearer ${token.accessToken}`
           }
         }
       );
@@ -703,9 +720,6 @@ var twitter = (options) => {
   };
 };
 
-// src/social-providers/types.ts
-import "arctic";
-
 // src/social-providers/index.ts
 var oAuthProviders = {
   apple,
@@ -980,7 +994,7 @@ var signInOAuth = createAuthEndpoint(
       c.context.secret,
       cookie.pkCodeVerifier.options
     );
-    const url = provider.createAuthorizationURL({
+    const url = await provider.createAuthorizationURL({
       state: state.state,
       codeVerifier
     });
@@ -1231,11 +1245,11 @@ var HIDE_METADATA = {
 
 // src/utils/getAccount.ts
 function getAccountTokens(tokens) {
-  const accessToken = tokens.accessToken();
-  let refreshToken = tokens.hasRefreshToken() ? tokens.refreshToken() : void 0;
+  const accessToken = tokens.accessToken;
+  let refreshToken = tokens.refreshToken;
   let accessTokenExpiresAt = void 0;
   try {
-    accessTokenExpiresAt = tokens.accessTokenExpiresAt();
+    accessTokenExpiresAt = tokens.accessTokenExpiresAt;
   } catch {
   }
   return {
@@ -1964,7 +1978,7 @@ var deleteUser = createAuthEndpoint(
 import { xchacha20poly1305 } from "@noble/ciphers/chacha";
 import { bytesToHex, hexToBytes, utf8ToBytes } from "@noble/ciphers/utils";
 import { managedNonce } from "@noble/ciphers/webcrypto";
-import { sha256 as sha2562 } from "@noble/hashes/sha256";
+import { sha256 as sha2562 } from "oslo/crypto";
 async function hs256(secretKey, message) {
   const enc = new TextEncoder();
   const algorithm = { name: "HMAC", hash: "SHA-256" };
@@ -1982,17 +1996,23 @@ async function hs256(secretKey, message) {
   );
   return btoa(String.fromCharCode(...new Uint8Array(signature)));
 }
-var symmetricEncrypt = ({ key, data }) => {
-  const keyAsBytes = sha2562(key);
+var symmetricEncrypt = async ({
+  key,
+  data
+}) => {
+  const keyAsBytes = await sha2562(new TextEncoder().encode(key));
   const dataAsBytes = utf8ToBytes(data);
-  const chacha = managedNonce(xchacha20poly1305)(keyAsBytes);
+  const chacha = managedNonce(xchacha20poly1305)(new Uint8Array(keyAsBytes));
   return bytesToHex(chacha.encrypt(dataAsBytes));
 };
-var symmetricDecrypt = ({ key, data }) => {
-  const keyAsBytes = sha2562(key);
+var symmetricDecrypt = async ({
+  key,
+  data
+}) => {
+  const keyAsBytes = await sha2562(new TextEncoder().encode(key));
   const dataAsBytes = hexToBytes(data);
-  const chacha = managedNonce(xchacha20poly1305)(keyAsBytes);
-  return chacha.decrypt(dataAsBytes);
+  const chacha = managedNonce(xchacha20poly1305)(new Uint8Array(keyAsBytes));
+  return new TextDecoder().decode(chacha.decrypt(dataAsBytes));
 };
 
 // src/api/routes/csrf.ts
@@ -4004,7 +4024,7 @@ function generateBackupCodesFn(options) {
 async function generateBackupCodes(secret, options) {
   const key = secret;
   const backupCodes = options?.customBackupCodesGenerate ? options.customBackupCodesGenerate() : generateBackupCodesFn();
-  const encCodes = symmetricEncrypt({
+  const encCodes = await symmetricEncrypt({
     data: JSON.stringify(backupCodes),
     key
   });
@@ -4258,12 +4278,11 @@ var totp2fa = (options) => {
         });
       }
       const totp = new TOTPController2(opts);
-      const secret = Buffer.from(
-        symmetricDecrypt({
-          key: ctx.context.secret,
-          data: ctx.context.session.user.twoFactorSecret
-        })
-      );
+      const decrypted = await symmetricDecrypt({
+        key: ctx.context.secret,
+        data: ctx.context.session.user.twoFactorSecret
+      });
+      const secret = Buffer.from(decrypted);
       const status = await totp.verify(ctx.body.code, secret);
       if (!status) {
         return ctx.context.invalid();
@@ -4376,7 +4395,7 @@ var twoFactor = (options) => {
             });
           }
           const secret = generateRandomString(16, alphabet("a-z", "0-9", "-"));
-          const encryptedSecret = symmetricEncrypt({
+          const encryptedSecret = await symmetricEncrypt({
             key: ctx.context.secret,
             data: secret
           });

package/dist/react.d.ts

@@ -3,10 +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-C-85i2-P.js';
+import './index-DTlKO6LZ.js';
 import 'kysely';
-import './types-DoyeJ_dw.js';
-import 'arctic';
+import './types-IzAbV4nB.js';
 import 'better-call';
 import 'better-sqlite3';
 import 'mysql2';

package/dist/social.d.ts

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