better-auth 1.2.5-beta.9 → 1.2.6-beta.1

package/dist/plugins/two-factor/index.cjs

@@ -2,7 +2,7 @@
 
 const random = require('../../shared/better-auth.CYeOI8C-.cjs');
 const zod = require('zod');
-const account = require('../../shared/better-auth.4J4_zAGP.cjs');
+const refreshToken = require('../../shared/better-auth.b0MLzqQX.cjs');
 const betterCall = require('better-call');
 const cookies_index = require('../../cookies/index.cjs');
 const schema$1 = require('../../shared/better-auth.C5H9XEzZ.cjs');
@@ -10,7 +10,7 @@ require('../../shared/better-auth.DiSjtgs9.cjs');
 require('../../shared/better-auth.GpOOav9x.cjs');
 require('defu');
 const crypto_index = require('../../crypto/index.cjs');
-const verifyMiddleware = require('../../shared/better-auth.wspQErD2.cjs');
+const verifyMiddleware = require('../../shared/better-auth.TNTVT6jt.cjs');
 const errorCode = require('../../shared/better-auth.C1-vpKly.cjs');
 require('@better-auth/utils/hash');
 require('@noble/ciphers/chacha');
@@ -29,7 +29,7 @@ const client = require('../../shared/better-auth.DnER2-iT.cjs');
 require('@better-auth/utils/random');
 require('../../social-providers/index.cjs');
 require('@better-fetch/fetch');
-require('../../shared/better-auth.DgXCgiHI.cjs');
+require('../../shared/better-auth.BLV8UOn8.cjs');
 require('../../shared/better-auth.C1hdVENX.cjs');
 require('../../shared/better-auth.ANpbi45u.cjs');
 require('../../shared/better-auth.QbbyHMYf.cjs');
@@ -87,7 +87,7 @@ const backupCode2fa = (options) => {
   return {
     id: "backup_code",
     endpoints: {
-      verifyBackupCode: account.createAuthEndpoint(
+      verifyBackupCode: refreshToken.createAuthEndpoint(
         "/two-factor/verify-backup-code",
         {
           method: "POST",
@@ -166,14 +166,14 @@ const backupCode2fa = (options) => {
           });
         }
       ),
-      generateBackupCodes: account.createAuthEndpoint(
+      generateBackupCodes: refreshToken.createAuthEndpoint(
         "/two-factor/generate-backup-codes",
         {
           method: "POST",
           body: zod.z.object({
             password: zod.z.string()
           }),
-          use: [account.sessionMiddleware]
+          use: [refreshToken.sessionMiddleware]
         },
         async (ctx) => {
           const user = ctx.context.session.user;
@@ -205,7 +205,7 @@ const backupCode2fa = (options) => {
           });
         }
       ),
-      viewBackupCodes: account.createAuthEndpoint(
+      viewBackupCodes: refreshToken.createAuthEndpoint(
         "/two-factor/view-backup-codes",
         {
           method: "GET",
@@ -257,7 +257,7 @@ const otp2fa = (options) => {
     period: (options?.period || 3) * 60 * 1e3
   };
   const twoFactorTable = "twoFactor";
-  const send2FaOTP = account.createAuthEndpoint(
+  const send2FaOTP = refreshToken.createAuthEndpoint(
     "/two-factor/send-otp",
     {
       method: "POST",
@@ -328,7 +328,7 @@ const otp2fa = (options) => {
       return ctx.json({ status: true });
     }
   );
-  const verifyOTP = account.createAuthEndpoint(
+  const verifyOTP = refreshToken.createAuthEndpoint(
     "/two-factor/verify-otp",
     {
       method: "POST",
@@ -436,11 +436,11 @@ const totp2fa = (options) => {
     period: options?.period || 30
   };
   const twoFactorTable = "twoFactor";
-  const generateTOTP = account.createAuthEndpoint(
+  const generateTOTP = refreshToken.createAuthEndpoint(
     "/totp/generate",
     {
       method: "POST",
-      use: [account.sessionMiddleware],
+      use: [refreshToken.sessionMiddleware],
       metadata: {
         openapi: {
           summary: "Generate TOTP code",
@@ -496,11 +496,11 @@ const totp2fa = (options) => {
       return { code };
     }
   );
-  const getTOTPURI = account.createAuthEndpoint(
+  const getTOTPURI = refreshToken.createAuthEndpoint(
     "/two-factor/get-totp-uri",
     {
       method: "POST",
-      use: [account.sessionMiddleware],
+      use: [refreshToken.sessionMiddleware],
       body: zod.z.object({
         password: zod.z.string({
           description: "User password"
@@ -568,7 +568,7 @@ const totp2fa = (options) => {
       };
     }
   );
-  const verifyTOTP = account.createAuthEndpoint(
+  const verifyTOTP = refreshToken.createAuthEndpoint(
     "/two-factor/verify-totp",
     {
       method: "POST",
@@ -731,7 +731,7 @@ const twoFactor = (options) => {
       ...totp.endpoints,
       ...otp$1.endpoints,
       ...backupCode.endpoints,
-      enableTwoFactor: account.createAuthEndpoint(
+      enableTwoFactor: refreshToken.createAuthEndpoint(
         "/two-factor/enable",
         {
           method: "POST",
@@ -740,7 +740,7 @@ const twoFactor = (options) => {
               description: "User password"
             })
           }),
-          use: [account.sessionMiddleware],
+          use: [refreshToken.sessionMiddleware],
           metadata: {
             openapi: {
               summary: "Enable two factor authentication",
@@ -782,7 +782,7 @@ const twoFactor = (options) => {
           });
           if (!isPasswordValid) {
             throw new betterCall.APIError("BAD_REQUEST", {
-              message: account.BASE_ERROR_CODES.INVALID_PASSWORD
+              message: refreshToken.BASE_ERROR_CODES.INVALID_PASSWORD
             });
           }
           const secret = random.generateRandomString(32);
@@ -840,7 +840,7 @@ const twoFactor = (options) => {
           return ctx.json({ totpURI, backupCodes: backupCodes.backupCodes });
         }
       ),
-      disableTwoFactor: account.createAuthEndpoint(
+      disableTwoFactor: refreshToken.createAuthEndpoint(
         "/two-factor/disable",
         {
           method: "POST",
@@ -849,7 +849,7 @@ const twoFactor = (options) => {
               description: "User password"
             }).min(8)
           }),
-          use: [account.sessionMiddleware],
+          use: [refreshToken.sessionMiddleware],
           metadata: {
             openapi: {
               summary: "Disable two factor authentication",
@@ -926,7 +926,7 @@ const twoFactor = (options) => {
           matcher(context) {
             return context.path === "/sign-in/email" || context.path === "/sign-in/username" || context.path === "/sign-in/phone-number";
           },
-          handler: account.createAuthMiddleware(async (ctx) => {
+          handler: refreshToken.createAuthMiddleware(async (ctx) => {
             const data = ctx.context.newSession;
             if (!data) {
               return;

package/dist/plugins/two-factor/index.d.cts

@@ -1,11 +1,11 @@
 import { z } from 'zod';
 import * as better_call from 'better-call';
-import { U as User, I as InferOptionSchema, d as AuthEndpoint, G as GenericEndpointContext, S as Session, H as HookEndpointContext } from '../../shared/better-auth.CxMUffeh.cjs';
+import { U as User, I as InferOptionSchema, d as AuthEndpoint, G as GenericEndpointContext, S as Session, H as HookEndpointContext } from '../../shared/better-auth.BDAwKjlL.cjs';
 import { L as LiteralString } from '../../shared/better-auth.Bi8FQwDD.cjs';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
-import 'kysely';
-import '../../shared/better-auth.CzK7QJBv.cjs';
+import '../../shared/better-auth.CH6fRG6d.cjs';
 import 'jose';
+import 'kysely';
 import 'better-sqlite3';
 
 interface BackupCodeOptions {

package/dist/plugins/two-factor/index.d.mts

@@ -1,11 +1,11 @@
 import { z } from 'zod';
 import * as better_call from 'better-call';
-import { U as User, I as InferOptionSchema, d as AuthEndpoint, G as GenericEndpointContext, S as Session, H as HookEndpointContext } from '../../shared/better-auth.dzwyqpra.mjs';
+import { U as User, I as InferOptionSchema, d as AuthEndpoint, G as GenericEndpointContext, S as Session, H as HookEndpointContext } from '../../shared/better-auth.CTQDLJN7.mjs';
 import { L as LiteralString } from '../../shared/better-auth.Bi8FQwDD.mjs';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
-import 'kysely';
-import '../../shared/better-auth.BjoUuJNr.mjs';
+import '../../shared/better-auth.BTnAiI8e.mjs';
 import 'jose';
+import 'kysely';
 import 'better-sqlite3';
 
 interface BackupCodeOptions {

package/dist/plugins/two-factor/index.d.ts

@@ -1,11 +1,11 @@
 import { z } from 'zod';
 import * as better_call from 'better-call';
-import { U as User, I as InferOptionSchema, d as AuthEndpoint, G as GenericEndpointContext, S as Session, H as HookEndpointContext } from '../../shared/better-auth.CixnJ90x.js';
+import { U as User, I as InferOptionSchema, d as AuthEndpoint, G as GenericEndpointContext, S as Session, H as HookEndpointContext } from '../../shared/better-auth.tpz8D0AA.js';
 import { L as LiteralString } from '../../shared/better-auth.Bi8FQwDD.js';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
-import 'kysely';
-import '../../shared/better-auth.Dd96RDNl.js';
+import '../../shared/better-auth.BAfIsot3.js';
 import 'jose';
+import 'kysely';
 import 'better-sqlite3';
 
 interface BackupCodeOptions {

package/dist/plugins/two-factor/index.mjs

@@ -1,6 +1,6 @@
 import { g as generateRandomString } from '../../shared/better-auth.B4Qoxdgc.mjs';
 import { z } from 'zod';
-import { a as createAuthEndpoint, s as sessionMiddleware, c as createAuthMiddleware, B as BASE_ERROR_CODES } from '../../shared/better-auth.ybwxmbrM.mjs';
+import { a as createAuthEndpoint, s as sessionMiddleware, c as createAuthMiddleware, B as BASE_ERROR_CODES } from '../../shared/better-auth.DQ-pFMwp.mjs';
 import { APIError } from 'better-call';
 import { setSessionCookie, deleteSessionCookie } from '../../cookies/index.mjs';
 import { m as mergeSchema } from '../../shared/better-auth.CepcSj5H.mjs';
@@ -8,7 +8,7 @@ import '../../shared/better-auth.8zoxzg-F.mjs';
 import '../../shared/better-auth.DH3YjMQH.mjs';
 import 'defu';
 import { symmetricEncrypt, symmetricDecrypt } from '../../crypto/index.mjs';
-import { v as verifyTwoFactorMiddleware, T as TRUST_DEVICE_COOKIE_NAME, a as TWO_FACTOR_COOKIE_NAME } from '../../shared/better-auth.oyDBIJLs.mjs';
+import { v as verifyTwoFactorMiddleware, T as TRUST_DEVICE_COOKIE_NAME, a as TWO_FACTOR_COOKIE_NAME } from '../../shared/better-auth.2rfXmCNS.mjs';
 import { T as TWO_FACTOR_ERROR_CODES } from '../../shared/better-auth.BcoSd9tC.mjs';
 import '@better-auth/utils/hash';
 import '@noble/ciphers/chacha';
@@ -27,7 +27,7 @@ export { t as twoFactorClient } from '../../shared/better-auth.Ddw8bVyV.mjs';
 import '@better-auth/utils/random';
 import '../../social-providers/index.mjs';
 import '@better-fetch/fetch';
-import '../../shared/better-auth.DiMBK1Ep.mjs';
+import '../../shared/better-auth.B2THyVQH.mjs';
 import '../../shared/better-auth.CW6D9eSx.mjs';
 import '../../shared/better-auth.DdzSJf-n.mjs';
 import '../../shared/better-auth.BdyOG_p4.mjs';

package/dist/plugins/username/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 const zod = require('zod');
-const account = require('../../shared/better-auth.4J4_zAGP.cjs');
+const refreshToken = require('../../shared/better-auth.b0MLzqQX.cjs');
 const betterCall = require('better-call');
 const cookies_index = require('../../cookies/index.cjs');
 const schema$1 = require('../../shared/better-auth.C5H9XEzZ.cjs');
@@ -12,7 +12,7 @@ const errorCode = require('../../shared/better-auth.C1-vpKly.cjs');
 require('../../social-providers/index.cjs');
 require('@better-fetch/fetch');
 require('jose');
-require('../../shared/better-auth.DgXCgiHI.cjs');
+require('../../shared/better-auth.BLV8UOn8.cjs');
 require('../../shared/better-auth.C1hdVENX.cjs');
 require('@better-auth/utils/hash');
 require('@better-auth/utils/base64');
@@ -73,7 +73,7 @@ const username = (options) => {
   return {
     id: "username",
     endpoints: {
-      signInUsername: account.createAuthEndpoint(
+      signInUsername: refreshToken.createAuthEndpoint(
         "/sign-in/username",
         {
           method: "POST",
@@ -163,12 +163,12 @@ const username = (options) => {
             });
           }
           if (!user.emailVerified && ctx.context.options.emailAndPassword?.requireEmailVerification) {
-            await account.sendVerificationEmailFn(ctx, user);
+            await refreshToken.sendVerificationEmailFn(ctx, user);
             throw new betterCall.APIError("FORBIDDEN", {
               message: ERROR_CODES.EMAIL_NOT_VERIFIED
             });
           }
-          const account$1 = await ctx.context.adapter.findOne({
+          const account = await ctx.context.adapter.findOne({
             model: "account",
             where: [
               {
@@ -181,12 +181,12 @@ const username = (options) => {
               }
             ]
           });
-          if (!account$1) {
+          if (!account) {
             throw new betterCall.APIError("UNAUTHORIZED", {
               message: ERROR_CODES.INVALID_USERNAME_OR_PASSWORD
             });
           }
-          const currentPassword = account$1?.password;
+          const currentPassword = account?.password;
           if (!currentPassword) {
             ctx.context.logger.error("Password not found", { username });
             throw new betterCall.APIError("UNAUTHORIZED", {
@@ -212,7 +212,7 @@ const username = (options) => {
             return ctx.json(null, {
               status: 500,
               body: {
-                message: account.BASE_ERROR_CODES.FAILED_TO_CREATE_SESSION
+                message: refreshToken.BASE_ERROR_CODES.FAILED_TO_CREATE_SESSION
               }
             });
           }
@@ -244,7 +244,7 @@ const username = (options) => {
           matcher(context) {
             return context.path === "/sign-up/email" || context.path === "/update-user";
           },
-          handler: account.createAuthMiddleware(async (ctx) => {
+          handler: refreshToken.createAuthMiddleware(async (ctx) => {
             const username2 = ctx.body.username;
             if (username2) {
               const minUsernameLength = options?.minUsernameLength || 3;

package/dist/plugins/username/index.d.cts

@@ -1,10 +1,10 @@
 import { z } from 'zod';
 import * as better_call from 'better-call';
-import { I as InferOptionSchema, H as HookEndpointContext } from '../../shared/better-auth.CxMUffeh.cjs';
+import { I as InferOptionSchema, H as HookEndpointContext } from '../../shared/better-auth.BDAwKjlL.cjs';
 import '../../shared/better-auth.Bi8FQwDD.cjs';
-import 'kysely';
-import '../../shared/better-auth.CzK7QJBv.cjs';
+import '../../shared/better-auth.CH6fRG6d.cjs';
 import 'jose';
+import 'kysely';
 import 'better-sqlite3';
 
 declare const schema: {

package/dist/plugins/username/index.d.mts

@@ -1,10 +1,10 @@
 import { z } from 'zod';
 import * as better_call from 'better-call';
-import { I as InferOptionSchema, H as HookEndpointContext } from '../../shared/better-auth.dzwyqpra.mjs';
+import { I as InferOptionSchema, H as HookEndpointContext } from '../../shared/better-auth.CTQDLJN7.mjs';
 import '../../shared/better-auth.Bi8FQwDD.mjs';
-import 'kysely';
-import '../../shared/better-auth.BjoUuJNr.mjs';
+import '../../shared/better-auth.BTnAiI8e.mjs';
 import 'jose';
+import 'kysely';
 import 'better-sqlite3';
 
 declare const schema: {

package/dist/plugins/username/index.d.ts

@@ -1,10 +1,10 @@
 import { z } from 'zod';
 import * as better_call from 'better-call';
-import { I as InferOptionSchema, H as HookEndpointContext } from '../../shared/better-auth.CixnJ90x.js';
+import { I as InferOptionSchema, H as HookEndpointContext } from '../../shared/better-auth.tpz8D0AA.js';
 import '../../shared/better-auth.Bi8FQwDD.js';
-import 'kysely';
-import '../../shared/better-auth.Dd96RDNl.js';
+import '../../shared/better-auth.BAfIsot3.js';
 import 'jose';
+import 'kysely';
 import 'better-sqlite3';
 
 declare const schema: {

package/dist/plugins/username/index.mjs

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { c as createAuthMiddleware, a as createAuthEndpoint, b as sendVerificationEmailFn, B as BASE_ERROR_CODES } from '../../shared/better-auth.ybwxmbrM.mjs';
+import { c as createAuthMiddleware, a as createAuthEndpoint, b as sendVerificationEmailFn, B as BASE_ERROR_CODES } from '../../shared/better-auth.DQ-pFMwp.mjs';
 import { APIError } from 'better-call';
 import { setSessionCookie } from '../../cookies/index.mjs';
 import { m as mergeSchema } from '../../shared/better-auth.CepcSj5H.mjs';
@@ -10,7 +10,7 @@ import { T as TWO_FACTOR_ERROR_CODES } from '../../shared/better-auth.BcoSd9tC.m
 import '../../social-providers/index.mjs';
 import '@better-fetch/fetch';
 import 'jose';
-import '../../shared/better-auth.DiMBK1Ep.mjs';
+import '../../shared/better-auth.B2THyVQH.mjs';
 import '../../shared/better-auth.CW6D9eSx.mjs';
 import '@better-auth/utils/hash';
 import '@better-auth/utils/base64';

package/dist/shared/{better-auth.oyDBIJLs.mjs → better-auth.2rfXmCNS.mjs}

@@ -1,5 +1,5 @@
 import { APIError } from 'better-call';
-import { c as createAuthMiddleware, g as getSessionFromCtx } from './better-auth.ybwxmbrM.mjs';
+import { c as createAuthMiddleware, g as getSessionFromCtx } from './better-auth.DQ-pFMwp.mjs';
 import { setSessionCookie } from '../cookies/index.mjs';
 import { z } from 'zod';
 import './better-auth.CepcSj5H.mjs';

package/dist/shared/{better-auth.KTt7CS7L.mjs → better-auth.9knM1kR4.mjs}

@@ -1,6 +1,6 @@
 import { APIError } from 'better-call';
 import { z } from 'zod';
-import { c as createAuthMiddleware, s as sessionMiddleware, a as createAuthEndpoint, g as getSessionFromCtx, B as BASE_ERROR_CODES, M as requestOnlySessionMiddleware } from './better-auth.ybwxmbrM.mjs';
+import { c as createAuthMiddleware, s as sessionMiddleware, a as createAuthEndpoint, g as getSessionFromCtx, B as BASE_ERROR_CODES, N as requestOnlySessionMiddleware } from './better-auth.DQ-pFMwp.mjs';
 import './better-auth.8zoxzg-F.mjs';
 import '@better-auth/utils/base64';
 import '@better-auth/utils/hmac';

package/dist/shared/{better-auth.DiMBK1Ep.mjs → better-auth.B2THyVQH.mjs}

@@ -144,4 +144,57 @@ async function validateToken(token, jwksEndpoint) {
   return verified;
 }
 
-export { validateToken as a, getOAuth2Tokens as b, createAuthorizationURL as c, generateCodeChallenge as g, validateAuthorizationCode as v };
+async function refreshAccessToken({
+  refreshToken,
+  options,
+  tokenEndpoint,
+  authentication,
+  extraParams,
+  grantType = "refresh_token"
+}) {
+  const body = new URLSearchParams();
+  const headers = {
+    "content-type": "application/x-www-form-urlencoded",
+    accept: "application/json"
+  };
+  body.set("grant_type", grantType);
+  body.set("refresh_token", refreshToken);
+  if (authentication === "basic") {
+    const encodedCredentials = btoa(
+      `${options.clientId}:${options.clientSecret}`
+    );
+    headers["authorization"] = `Basic ${encodedCredentials}`;
+  } else {
+    body.set("client_id", options.clientId);
+    body.set("client_secret", options.clientSecret);
+  }
+  if (extraParams) {
+    for (const [key, value] of Object.entries(extraParams)) {
+      body.set(key, value);
+    }
+  }
+  const { data, error } = await betterFetch(tokenEndpoint, {
+    method: "POST",
+    body,
+    headers
+  });
+  if (error) {
+    throw error;
+  }
+  const tokens = {
+    accessToken: data.access_token,
+    refreshToken: data.refresh_token,
+    tokenType: data.token_type,
+    scopes: data.scope?.split(" "),
+    idToken: data.id_token
+  };
+  if (data.expires_in) {
+    const now = /* @__PURE__ */ new Date();
+    tokens.accessTokenExpiresAt = new Date(
+      now.getTime() + data.expires_in * 1e3
+    );
+  }
+  return tokens;
+}
+
+export { validateToken as a, getOAuth2Tokens as b, createAuthorizationURL as c, generateCodeChallenge as g, refreshAccessToken as r, validateAuthorizationCode as v };