better-auth 0.4.2 → 0.4.3-beta.1

package/dist/adapters/drizzle.d.ts

@@ -1,8 +1,7 @@
-import { A as Adapter } from '../index-C-85i2-P.js';
+import { A as Adapter } from '../index-CBfuy92d.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/adapters/mongodb.d.ts

@@ -1,9 +1,8 @@
 import { Db } from 'mongodb';
-import { W as Where } from '../index-C-85i2-P.js';
+import { W as Where } from '../index-CBfuy92d.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/adapters/prisma.d.ts

@@ -1,8 +1,7 @@
-import { A as Adapter } from '../index-C-85i2-P.js';
+import { A as Adapter } from '../index-CBfuy92d.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/api.d.ts

@@ -1,9 +1,8 @@
-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';
+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-CBfuy92d.js';
 import './helper-DPDj8Nix.js';
 import 'zod';
 export { APIError } from 'better-call';
 import 'kysely';
-import './types-DoyeJ_dw.js';
-import 'arctic';
+import './types-IzAbV4nB.js';
 import 'better-sqlite3';
 import 'mysql2';

package/dist/api.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) {
@@ -440,45 +454,94 @@ var github = (options) => {
 import { parseJWT as parseJWT2 } from "oslo/jwt";
 
 // src/utils/logger.ts
-import { createConsola } from "consola";
-var consola = createConsola({
-  formatOptions: {
-    date: false,
-    colors: true,
-    compact: true
-  },
-  defaults: {
-    tag: "Better Auth"
+var LOG_LEVELS = {
+  debug: 0,
+  info: 1,
+  success: 2,
+  warn: 3,
+  error: 4
+};
+var LIBRARY_NAME = "Better Auth";
+var formatDate = (date) => {
+  const pad = (num) => num.toString().padStart(2, "0");
+  const year = date.getFullYear();
+  const month = pad(date.getMonth() + 1);
+  const day = pad(date.getDate());
+  const hours = pad(date.getHours());
+  const minutes = pad(date.getMinutes());
+  const seconds = pad(date.getSeconds());
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+};
+var colorize = (text, color) => {
+  const colors = {
+    reset: "\x1B[0m",
+    green: "\x1B[32m",
+    yellow: "\x1B[33m",
+    red: "\x1B[31m",
+    blue: "\x1B[34m",
+    cyan: "\x1B[36m"
+  };
+  return `${colors[color]}${text}${colors.reset}`;
+};
+var defaultFormat = (level, message, timestamp, libraryName, ...args) => {
+  let formattedLevel = level.toUpperCase();
+  let colorizedMessage = message;
+  switch (level) {
+    case "debug":
+      formattedLevel = colorize(formattedLevel, "cyan");
+      break;
+    case "info":
+      formattedLevel = colorize(formattedLevel, "blue");
+      break;
+    case "success":
+      formattedLevel = colorize(`\u2713 ${formattedLevel}`, "green");
+      colorizedMessage = colorize(message, "green");
+      break;
+    case "warn":
+      formattedLevel = colorize(formattedLevel, "yellow");
+      break;
+    case "error":
+      formattedLevel = colorize(formattedLevel, "red");
+      break;
   }
-});
-var createLogger = (options) => {
+  return `[${timestamp}] [${libraryName}] ${formattedLevel}: ${colorizedMessage} ${args.length ? JSON.stringify(args) : ""}`;
+};
+function createLogger(options = {}) {
+  const {
+    disabled = false,
+    minLevel = "info",
+    customFormat = defaultFormat
+  } = options;
+  const loggerFunction = (level) => {
+    return (message, ...args) => {
+      if (disabled) return;
+      if (LOG_LEVELS[level] >= LOG_LEVELS[minLevel]) {
+        const timestamp = formatDate(/* @__PURE__ */ new Date());
+        const formattedMessage = customFormat(
+          level,
+          message,
+          timestamp,
+          LIBRARY_NAME,
+          ...args
+        );
+        console.log(formattedMessage);
+      }
+    };
+  };
   return {
-    log: (...args) => {
-      !options?.disabled && consola.log("", ...args);
-    },
-    error: (...args) => {
-      !options?.disabled && consola.error("", ...args);
-    },
-    warn: (...args) => {
-      !options?.disabled && consola.warn("", ...args);
-    },
-    info: (...args) => {
-      !options?.disabled && consola.info("", ...args);
-    },
-    debug: (...args) => {
-      !options?.disabled && consola.debug("", ...args);
+    debug: loggerFunction("debug"),
+    info: loggerFunction("info"),
+    break: () => {
+      console.log("\n");
     },
-    box: (...args) => {
-      !options?.disabled && consola.box("", ...args);
-    },
-    success: (...args) => {
-      !options?.disabled && consola.success("", ...args);
-    },
-    break: (...args) => {
-      !options?.disabled && console.log("\n");
+    success: loggerFunction("success"),
+    warn: loggerFunction("warn"),
+    error: loggerFunction("error"),
+    setMinLevel: (level) => {
+      options.minLevel = level;
     }
   };
-};
+}
 var logger = createLogger();
 
 // src/social-providers/google.ts
@@ -520,7 +583,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 +629,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 +701,7 @@ var spotify = (options) => {
         {
           method: "GET",
           headers: {
-            Authorization: `Bearer ${token.accessToken()}`
+            Authorization: `Bearer ${token.accessToken}`
           }
         }
       );
@@ -686,7 +752,7 @@ var twitch = (options) => {
         {
           method: "GET",
           headers: {
-            Authorization: `Bearer ${token.accessToken()}`
+            Authorization: `Bearer ${token.accessToken}`
           }
         }
       );
@@ -739,7 +805,7 @@ var twitter = (options) => {
         {
           method: "GET",
           headers: {
-            Authorization: `Bearer ${token.accessToken()}`
+            Authorization: `Bearer ${token.accessToken}`
           }
         }
       );
@@ -763,9 +829,6 @@ var twitter = (options) => {
   };
 };
 
-// src/social-providers/types.ts
-import "arctic";
-
 // src/social-providers/index.ts
 var oAuthProviders = {
   apple,
@@ -1059,7 +1122,7 @@ var signInOAuth = createAuthEndpoint(
       c.context.secret,
       cookie.pkCodeVerifier.options
     );
-    const url = provider.createAuthorizationURL({
+    const url = await provider.createAuthorizationURL({
       state: state.state,
       codeVerifier
     });
@@ -1310,11 +1373,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/cli.js

@@ -10,45 +10,94 @@ import { Command } from "commander";
 import { loadConfig } from "c12";
 
 // src/utils/logger.ts
-import { createConsola } from "consola";
-var consola = createConsola({
-  formatOptions: {
-    date: false,
-    colors: true,
-    compact: true
-  },
-  defaults: {
-    tag: "Better Auth"
+var LOG_LEVELS = {
+  debug: 0,
+  info: 1,
+  success: 2,
+  warn: 3,
+  error: 4
+};
+var LIBRARY_NAME = "Better Auth";
+var formatDate = (date) => {
+  const pad = (num) => num.toString().padStart(2, "0");
+  const year = date.getFullYear();
+  const month = pad(date.getMonth() + 1);
+  const day = pad(date.getDate());
+  const hours = pad(date.getHours());
+  const minutes = pad(date.getMinutes());
+  const seconds = pad(date.getSeconds());
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+};
+var colorize = (text, color) => {
+  const colors = {
+    reset: "\x1B[0m",
+    green: "\x1B[32m",
+    yellow: "\x1B[33m",
+    red: "\x1B[31m",
+    blue: "\x1B[34m",
+    cyan: "\x1B[36m"
+  };
+  return `${colors[color]}${text}${colors.reset}`;
+};
+var defaultFormat = (level, message, timestamp, libraryName, ...args) => {
+  let formattedLevel = level.toUpperCase();
+  let colorizedMessage = message;
+  switch (level) {
+    case "debug":
+      formattedLevel = colorize(formattedLevel, "cyan");
+      break;
+    case "info":
+      formattedLevel = colorize(formattedLevel, "blue");
+      break;
+    case "success":
+      formattedLevel = colorize(`\u2713 ${formattedLevel}`, "green");
+      colorizedMessage = colorize(message, "green");
+      break;
+    case "warn":
+      formattedLevel = colorize(formattedLevel, "yellow");
+      break;
+    case "error":
+      formattedLevel = colorize(formattedLevel, "red");
+      break;
   }
-});
-var createLogger = (options) => {
+  return `[${timestamp}] [${libraryName}] ${formattedLevel}: ${colorizedMessage} ${args.length ? JSON.stringify(args) : ""}`;
+};
+function createLogger(options = {}) {
+  const {
+    disabled = false,
+    minLevel = "info",
+    customFormat = defaultFormat
+  } = options;
+  const loggerFunction = (level) => {
+    return (message, ...args) => {
+      if (disabled) return;
+      if (LOG_LEVELS[level] >= LOG_LEVELS[minLevel]) {
+        const timestamp = formatDate(/* @__PURE__ */ new Date());
+        const formattedMessage = customFormat(
+          level,
+          message,
+          timestamp,
+          LIBRARY_NAME,
+          ...args
+        );
+        console.log(formattedMessage);
+      }
+    };
+  };
   return {
-    log: (...args) => {
-      !options?.disabled && consola.log("", ...args);
-    },
-    error: (...args) => {
-      !options?.disabled && consola.error("", ...args);
-    },
-    warn: (...args) => {
-      !options?.disabled && consola.warn("", ...args);
-    },
-    info: (...args) => {
-      !options?.disabled && consola.info("", ...args);
-    },
-    debug: (...args) => {
-      !options?.disabled && consola.debug("", ...args);
+    debug: loggerFunction("debug"),
+    info: loggerFunction("info"),
+    break: () => {
+      console.log("\n");
     },
-    box: (...args) => {
-      !options?.disabled && consola.box("", ...args);
-    },
-    success: (...args) => {
-      !options?.disabled && consola.success("", ...args);
-    },
-    break: (...args) => {
-      !options?.disabled && console.log("\n");
+    success: loggerFunction("success"),
+    warn: loggerFunction("warn"),
+    error: loggerFunction("error"),
+    setMinLevel: (level) => {
+      options.minLevel = level;
     }
   };
-};
+}
 var logger = createLogger();
 
 // src/cli/get-config.ts

package/dist/client/plugins.d.ts

@@ -2,14 +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-BOgQnoz7.js';
-export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-BOgQnoz7.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-CmVVvxZr.js';
+export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-CmVVvxZr.js';
 import { P as Prettify } from '../helper-DPDj8Nix.js';
-import { F as FieldAttribute, B as BetterAuthOptions, b as BetterAuthPlugin } from '../index-C-85i2-P.js';
+import { F as FieldAttribute, B as BetterAuthOptions, b as BetterAuthPlugin } from '../index-CBfuy92d.js';
 import * as better_call from 'better-call';
 import { z } from 'zod';
-import { U as User } from '../types-DoyeJ_dw.js';
-import { OAuth2Tokens } from 'arctic';
+import { O as OAuth2Tokens, U as User } from '../types-IzAbV4nB.js';
 import '@simplewebauthn/types';
 import 'kysely';
 import 'better-sqlite3';

package/dist/client.d.ts

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