better-auth 1.2.4-beta.1 → 1.2.4-beta.12

package/dist/plugins/phone-number/index.mjs

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { a as createAuthEndpoint, g as getSessionFromCtx, B as BASE_ERROR_CODES } from '../../shared/better-auth.npe3WWSD.mjs';
+import { a as createAuthEndpoint, g as getSessionFromCtx, B as BASE_ERROR_CODES } from '../../shared/better-auth.CFZLHBFT.mjs';
 import { APIError } from 'better-call';
 import { m as mergeSchema } from '../../shared/better-auth.C24Bzw4w.mjs';
 import { g as generateRandomString } from '../../shared/better-auth.B4Qoxdgc.mjs';
@@ -23,11 +23,11 @@ import '@better-auth/utils/hex';
 import '@noble/hashes/utils';
 import '../../shared/better-auth.DdzSJf-n.mjs';
 import '@better-auth/utils/random';
-import '../../shared/better-auth.CoMXyQ1y.mjs';
+import '../../shared/better-auth.CbXAPXob.mjs';
 import '../../shared/better-auth.BUPPRXfK.mjs';
 import '@better-auth/utils/hmac';
 import '../../shared/better-auth.DDEbWX-S.mjs';
-import '../../shared/better-auth.NcLhHEks.mjs';
+import '../../shared/better-auth.VTXNLFMT.mjs';
 import 'jose/errors';
 import '../../shared/better-auth.tB5eU6EY.mjs';
 import '@better-auth/utils/binary';
@@ -47,6 +47,7 @@ const phoneNumber = (options) => {
   };
   const ERROR_CODES = {
     INVALID_PHONE_NUMBER: "Invalid phone number",
+    PHONE_NUMBER_EXIST: "Phone number already exist",
     INVALID_PHONE_NUMBER_OR_PASSWORD: "Invalid phone number or password",
     UNEXPECTED_ERROR: "Unexpected error",
     OTP_NOT_FOUND: "OTP not found",
@@ -254,14 +255,7 @@ const phoneNumber = (options) => {
             },
             ctx.request
           );
-          return ctx.json(
-            { code },
-            {
-              body: {
-                message: "Code sent"
-              }
-            }
-          );
+          return ctx.json({ message: "code sent" });
         }
       ),
       verifyPhoneNumber: createAuthEndpoint(
@@ -354,6 +348,20 @@ const phoneNumber = (options) => {
                 message: BASE_ERROR_CODES.USER_NOT_FOUND
               });
             }
+            const existingUser = await ctx.context.adapter.findMany({
+              model: "user",
+              where: [
+                {
+                  field: "phoneNumber",
+                  value: ctx.body.phoneNumber
+                }
+              ]
+            });
+            if (existingUser.length) {
+              throw ctx.error("BAD_REQUEST", {
+                message: ERROR_CODES.PHONE_NUMBER_EXIST
+              });
+            }
             let user2 = await ctx.context.internalAdapter.updateUser(
               session.user.id,
               {

package/dist/plugins/sso/index.cjs

@@ -2,7 +2,7 @@
 
 const zod = require('zod');
 const betterCall = require('better-call');
-const account = require('../../shared/better-auth.BzKRBwSF.cjs');
+const account = require('../../shared/better-auth.GVCiTzec.cjs');
 const cookies_index = require('../../cookies/index.cjs');
 require('../../shared/better-auth.CHyZMcYK.cjs');
 require('../../shared/better-auth.DiSjtgs9.cjs');
@@ -11,7 +11,7 @@ require('defu');
 const validateAuthorizationCode = require('../../shared/better-auth.DdjqxOIu.cjs');
 require('@better-auth/utils/hash');
 require('@better-auth/utils/base64');
-const state = require('../../shared/better-auth.GgQnT00n.cjs');
+const state = require('../../shared/better-auth.CHHC_PJT.cjs');
 const fetch = require('@better-fetch/fetch');
 const jose = require('jose');
 require('../../social-providers/index.cjs');
@@ -29,7 +29,7 @@ require('../../shared/better-auth.C1hdVENX.cjs');
 require('../../shared/better-auth.Bg6iw3ig.cjs');
 require('@better-auth/utils/hmac');
 require('../../shared/better-auth.BMYo0QR-.cjs');
-require('../../shared/better-auth.DhfiEsxl.cjs');
+require('../../shared/better-auth.C-R0J0n1.cjs');
 require('jose/errors');
 require('../../shared/better-auth.D3mtHEZg.cjs');
 require('@better-auth/utils/binary');

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

@@ -1,7 +1,7 @@
 import * as better_call from 'better-call';
 import { z } from 'zod';
 import { O as OAuth2Tokens } from '../../shared/better-auth.GFrhA2ZN.cjs';
-import { U as User } from '../../shared/better-auth.BAR_8WbD.cjs';
+import { U as User } from '../../shared/better-auth.CPKTEzG-.cjs';
 import '../../shared/better-auth.Bi8FQwDD.cjs';
 import 'jose';
 import 'kysely';

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

@@ -1,7 +1,7 @@
 import * as better_call from 'better-call';
 import { z } from 'zod';
 import { O as OAuth2Tokens } from '../../shared/better-auth.Dzvtygs8.mjs';
-import { U as User } from '../../shared/better-auth.imLEY-xr.mjs';
+import { U as User } from '../../shared/better-auth.Ck0xlDsK.mjs';
 import '../../shared/better-auth.Bi8FQwDD.mjs';
 import 'jose';
 import 'kysely';

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

@@ -1,7 +1,7 @@
 import * as better_call from 'better-call';
 import { z } from 'zod';
 import { O as OAuth2Tokens } from '../../shared/better-auth.BRpbZ8Wm.js';
-import { U as User } from '../../shared/better-auth.purQujiV.js';
+import { U as User } from '../../shared/better-auth.DiHCWsNg.js';
 import '../../shared/better-auth.Bi8FQwDD.js';
 import 'jose';
 import 'kysely';

package/dist/plugins/sso/index.mjs

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { APIError } from 'better-call';
-import { a as createAuthEndpoint, h as handleOAuthUserInfo, s as sessionMiddleware } from '../../shared/better-auth.npe3WWSD.mjs';
+import { a as createAuthEndpoint, h as handleOAuthUserInfo, s as sessionMiddleware } from '../../shared/better-auth.CFZLHBFT.mjs';
 import { setSessionCookie } from '../../cookies/index.mjs';
 import '../../shared/better-auth.C24Bzw4w.mjs';
 import '../../shared/better-auth.8zoxzg-F.mjs';
@@ -9,7 +9,7 @@ import 'defu';
 import { v as validateAuthorizationCode, a as validateToken, c as createAuthorizationURL } from '../../shared/better-auth.D7syfoJW.mjs';
 import '@better-auth/utils/hash';
 import '@better-auth/utils/base64';
-import { p as parseState, g as generateState } from '../../shared/better-auth.CoMXyQ1y.mjs';
+import { p as parseState, g as generateState } from '../../shared/better-auth.CbXAPXob.mjs';
 import { betterFetch, BetterFetchError } from '@better-fetch/fetch';
 import { decodeJwt } from 'jose';
 import '../../social-providers/index.mjs';
@@ -27,7 +27,7 @@ import '../../shared/better-auth.CW6D9eSx.mjs';
 import '../../shared/better-auth.BUPPRXfK.mjs';
 import '@better-auth/utils/hmac';
 import '../../shared/better-auth.DDEbWX-S.mjs';
-import '../../shared/better-auth.NcLhHEks.mjs';
+import '../../shared/better-auth.VTXNLFMT.mjs';
 import 'jose/errors';
 import '../../shared/better-auth.tB5eU6EY.mjs';
 import '@better-auth/utils/binary';

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.BzKRBwSF.cjs');
+const account = require('../../shared/better-auth.GVCiTzec.cjs');
 const betterCall = require('better-call');
 const cookies_index = require('../../cookies/index.cjs');
 const schema$1 = require('../../shared/better-auth.CHyZMcYK.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.CMz4USTt.cjs');
+const verifyMiddleware = require('../../shared/better-auth.B6Xcg5N5.cjs');
 const errorCode = require('../../shared/better-auth.C1-vpKly.cjs');
 require('@better-auth/utils/hash');
 require('@noble/ciphers/chacha');
@@ -32,21 +32,21 @@ require('@better-fetch/fetch');
 require('../../shared/better-auth.DdjqxOIu.cjs');
 require('../../shared/better-auth.C1hdVENX.cjs');
 require('../../shared/better-auth.ANpbi45u.cjs');
-require('../../shared/better-auth.GgQnT00n.cjs');
+require('../../shared/better-auth.CHHC_PJT.cjs');
 require('../../shared/better-auth.Bg6iw3ig.cjs');
 require('../../shared/better-auth.BMYo0QR-.cjs');
-require('../../shared/better-auth.DhfiEsxl.cjs');
+require('../../shared/better-auth.C-R0J0n1.cjs');
 require('jose/errors');
 require('../../shared/better-auth.D3mtHEZg.cjs');
 require('@better-auth/utils/binary');
 require('../../shared/better-auth.YUF6P-PB.cjs');
 
 function generateBackupCodesFn(options) {
-  return Array.from({ length: 10 }).fill(null).map(() => random.generateRandomString(10, "a-z", "0-9", "A-Z")).map((code) => `${code.slice(0, 5)}-${code.slice(5)}`);
+  return Array.from({ length: options?.amount ?? 10 }).fill(null).map(() => random.generateRandomString(options?.length ?? 10, "a-z", "0-9", "A-Z")).map((code) => `${code.slice(0, 5)}-${code.slice(5)}`);
 }
 async function generateBackupCodes(secret, options) {
   const key = secret;
-  const backupCodes = options?.customBackupCodesGenerate ? options.customBackupCodesGenerate() : generateBackupCodesFn();
+  const backupCodes = options?.customBackupCodesGenerate ? options.customBackupCodesGenerate() : generateBackupCodesFn(options);
   const encCodes = await crypto_index.symmetricEncrypt({
     data: JSON.stringify(backupCodes),
     key
@@ -738,7 +738,7 @@ const twoFactor = (options) => {
           body: zod.z.object({
             password: zod.z.string({
               description: "User password"
-            }).min(8)
+            })
           }),
           use: [account.sessionMiddleware],
           metadata: {

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

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import * as better_call from 'better-call';
-import { U as User, I as InferOptionSchema, d as AuthEndpoint, S as Session, G as GenericEndpointContext, H as HookEndpointContext } from '../../shared/better-auth.BAR_8WbD.cjs';
+import { U as User, I as InferOptionSchema, d as AuthEndpoint, S as Session, G as GenericEndpointContext, H as HookEndpointContext } from '../../shared/better-auth.CPKTEzG-.cjs';
 import { L as LiteralString } from '../../shared/better-auth.Bi8FQwDD.cjs';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import 'kysely';

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

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import * as better_call from 'better-call';
-import { U as User, I as InferOptionSchema, d as AuthEndpoint, S as Session, G as GenericEndpointContext, H as HookEndpointContext } from '../../shared/better-auth.imLEY-xr.mjs';
+import { U as User, I as InferOptionSchema, d as AuthEndpoint, S as Session, G as GenericEndpointContext, H as HookEndpointContext } from '../../shared/better-auth.Ck0xlDsK.mjs';
 import { L as LiteralString } from '../../shared/better-auth.Bi8FQwDD.mjs';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import 'kysely';

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

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import * as better_call from 'better-call';
-import { U as User, I as InferOptionSchema, d as AuthEndpoint, S as Session, G as GenericEndpointContext, H as HookEndpointContext } from '../../shared/better-auth.purQujiV.js';
+import { U as User, I as InferOptionSchema, d as AuthEndpoint, S as Session, G as GenericEndpointContext, H as HookEndpointContext } from '../../shared/better-auth.DiHCWsNg.js';
 import { L as LiteralString } from '../../shared/better-auth.Bi8FQwDD.js';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import 'kysely';

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.npe3WWSD.mjs';
+import { a as createAuthEndpoint, s as sessionMiddleware, c as createAuthMiddleware, B as BASE_ERROR_CODES } from '../../shared/better-auth.CFZLHBFT.mjs';
 import { APIError } from 'better-call';
 import { setSessionCookie, deleteSessionCookie } from '../../cookies/index.mjs';
 import { m as mergeSchema } from '../../shared/better-auth.C24Bzw4w.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.Bd1H94Nk.mjs';
+import { v as verifyTwoFactorMiddleware, T as TRUST_DEVICE_COOKIE_NAME, a as TWO_FACTOR_COOKIE_NAME } from '../../shared/better-auth.CABkkSP8.mjs';
 import { T as TWO_FACTOR_ERROR_CODES } from '../../shared/better-auth.BcoSd9tC.mjs';
 import '@better-auth/utils/hash';
 import '@noble/ciphers/chacha';
@@ -30,21 +30,21 @@ import '@better-fetch/fetch';
 import '../../shared/better-auth.D7syfoJW.mjs';
 import '../../shared/better-auth.CW6D9eSx.mjs';
 import '../../shared/better-auth.DdzSJf-n.mjs';
-import '../../shared/better-auth.CoMXyQ1y.mjs';
+import '../../shared/better-auth.CbXAPXob.mjs';
 import '../../shared/better-auth.BUPPRXfK.mjs';
 import '../../shared/better-auth.DDEbWX-S.mjs';
-import '../../shared/better-auth.NcLhHEks.mjs';
+import '../../shared/better-auth.VTXNLFMT.mjs';
 import 'jose/errors';
 import '../../shared/better-auth.tB5eU6EY.mjs';
 import '@better-auth/utils/binary';
 import '../../shared/better-auth.OT3XFeFk.mjs';
 
 function generateBackupCodesFn(options) {
-  return Array.from({ length: 10 }).fill(null).map(() => generateRandomString(10, "a-z", "0-9", "A-Z")).map((code) => `${code.slice(0, 5)}-${code.slice(5)}`);
+  return Array.from({ length: options?.amount ?? 10 }).fill(null).map(() => generateRandomString(options?.length ?? 10, "a-z", "0-9", "A-Z")).map((code) => `${code.slice(0, 5)}-${code.slice(5)}`);
 }
 async function generateBackupCodes(secret, options) {
   const key = secret;
-  const backupCodes = options?.customBackupCodesGenerate ? options.customBackupCodesGenerate() : generateBackupCodesFn();
+  const backupCodes = options?.customBackupCodesGenerate ? options.customBackupCodesGenerate() : generateBackupCodesFn(options);
   const encCodes = await symmetricEncrypt({
     data: JSON.stringify(backupCodes),
     key
@@ -736,7 +736,7 @@ const twoFactor = (options) => {
           body: z.object({
             password: z.string({
               description: "User password"
-            }).min(8)
+            })
           }),
           use: [sessionMiddleware],
           metadata: {

package/dist/plugins/username/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 const zod = require('zod');
-const account = require('../../shared/better-auth.BzKRBwSF.cjs');
+const account = require('../../shared/better-auth.GVCiTzec.cjs');
 const betterCall = require('better-call');
 const cookies_index = require('../../cookies/index.cjs');
 const schema$1 = require('../../shared/better-auth.CHyZMcYK.cjs');
@@ -26,11 +26,11 @@ require('@noble/hashes/utils');
 require('../../shared/better-auth.CYeOI8C-.cjs');
 require('@better-auth/utils/random');
 require('../../shared/better-auth.ANpbi45u.cjs');
-require('../../shared/better-auth.GgQnT00n.cjs');
+require('../../shared/better-auth.CHHC_PJT.cjs');
 require('../../shared/better-auth.Bg6iw3ig.cjs');
 require('@better-auth/utils/hmac');
 require('../../shared/better-auth.BMYo0QR-.cjs');
-require('../../shared/better-auth.DhfiEsxl.cjs');
+require('../../shared/better-auth.C-R0J0n1.cjs');
 require('jose/errors');
 require('../../shared/better-auth.D3mtHEZg.cjs');
 require('@better-auth/utils/binary');

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

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import * as better_call from 'better-call';
-import { I as InferOptionSchema, H as HookEndpointContext } from '../../shared/better-auth.BAR_8WbD.cjs';
+import { I as InferOptionSchema, H as HookEndpointContext } from '../../shared/better-auth.CPKTEzG-.cjs';
 import '../../shared/better-auth.Bi8FQwDD.cjs';
 import 'kysely';
 import '../../shared/better-auth.GFrhA2ZN.cjs';

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

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import * as better_call from 'better-call';
-import { I as InferOptionSchema, H as HookEndpointContext } from '../../shared/better-auth.imLEY-xr.mjs';
+import { I as InferOptionSchema, H as HookEndpointContext } from '../../shared/better-auth.Ck0xlDsK.mjs';
 import '../../shared/better-auth.Bi8FQwDD.mjs';
 import 'kysely';
 import '../../shared/better-auth.Dzvtygs8.mjs';

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

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import * as better_call from 'better-call';
-import { I as InferOptionSchema, H as HookEndpointContext } from '../../shared/better-auth.purQujiV.js';
+import { I as InferOptionSchema, H as HookEndpointContext } from '../../shared/better-auth.DiHCWsNg.js';
 import '../../shared/better-auth.Bi8FQwDD.js';
 import 'kysely';
 import '../../shared/better-auth.BRpbZ8Wm.js';

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.npe3WWSD.mjs';
+import { c as createAuthMiddleware, a as createAuthEndpoint, b as sendVerificationEmailFn, B as BASE_ERROR_CODES } from '../../shared/better-auth.CFZLHBFT.mjs';
 import { APIError } from 'better-call';
 import { setSessionCookie } from '../../cookies/index.mjs';
 import { m as mergeSchema } from '../../shared/better-auth.C24Bzw4w.mjs';
@@ -24,11 +24,11 @@ import '@noble/hashes/utils';
 import '../../shared/better-auth.B4Qoxdgc.mjs';
 import '@better-auth/utils/random';
 import '../../shared/better-auth.DdzSJf-n.mjs';
-import '../../shared/better-auth.CoMXyQ1y.mjs';
+import '../../shared/better-auth.CbXAPXob.mjs';
 import '../../shared/better-auth.BUPPRXfK.mjs';
 import '@better-auth/utils/hmac';
 import '../../shared/better-auth.DDEbWX-S.mjs';
-import '../../shared/better-auth.NcLhHEks.mjs';
+import '../../shared/better-auth.VTXNLFMT.mjs';
 import 'jose/errors';
 import '../../shared/better-auth.tB5eU6EY.mjs';
 import '@better-auth/utils/binary';

package/dist/shared/{better-auth.B5NYxGA3.mjs → better-auth.67eSHmUo.mjs}

@@ -478,17 +478,13 @@ const createInternalAdapter = (adapter, ctx) => {
         ]
       });
     },
-    deleteAccount: async (providerId, userId) => {
+    deleteAccount: async (accountId) => {
       await adapter.delete({
         model: "account",
         where: [
           {
-            field: "providerId",
-            value: providerId
-          },
-          {
-            field: "userId",
-            value: userId
+            field: "id",
+            value: accountId
           }
         ]
       });

package/dist/shared/{better-auth.CMz4USTt.cjs → better-auth.B6Xcg5N5.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 const betterCall = require('better-call');
-const account = require('./better-auth.BzKRBwSF.cjs');
+const account = require('./better-auth.GVCiTzec.cjs');
 const cookies_index = require('../cookies/index.cjs');
 const zod = require('zod');
 require('./better-auth.CHyZMcYK.cjs');

package/dist/shared/{better-auth.K251u4eV.mjs → better-auth.BH6IWaNB.mjs}

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { APIError } from 'better-call';
-import { c as createAuthMiddleware, g as getSessionFromCtx, a as createAuthEndpoint } from './better-auth.npe3WWSD.mjs';
+import { c as createAuthMiddleware, g as getSessionFromCtx, a as createAuthEndpoint } from './better-auth.CFZLHBFT.mjs';
 import { setSessionCookie, deleteSessionCookie } from '../cookies/index.mjs';
 import { m as mergeSchema } from './better-auth.C24Bzw4w.mjs';
 import './better-auth.8zoxzg-F.mjs';
@@ -49,7 +49,7 @@ const admin = (options) => {
   };
   const adminMiddleware = createAuthMiddleware(async (ctx) => {
     const session = await getSessionFromCtx(ctx);
-    if ((!session?.session || !opts.adminRoles.includes(session.user.role)) && !opts.adminUserIds?.includes(session?.user.id || "")) {
+    if (!session) {
       throw new APIError("UNAUTHORIZED");
     }
     return {
@@ -1056,7 +1056,7 @@ const admin = (options) => {
               message: "invalid permission check. you can only check one resource permission at a time."
             });
           }
-          const session = ctx.context.session;
+          const session = await getSessionFromCtx(ctx);
           if (!session && (ctx.request || ctx.headers) && !ctx.body.userId && !ctx.body.role) {
             throw new APIError("UNAUTHORIZED");
           }

package/dist/shared/{better-auth.DNb3Aogp.cjs → better-auth.BN2jUYPL.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 const fetch$1 = require('@better-fetch/fetch');
-const url = require('./better-auth.DhfiEsxl.cjs');
+const url = require('./better-auth.C-R0J0n1.cjs');
 const nanostores = require('nanostores');
 const query = require('./better-auth.C_Zl7Etp.cjs');
 const parser = require('./better-auth.DhsGZ30Q.cjs');

package/dist/shared/{better-auth.F2VsZ04W.d.ts → better-auth.BVojg4kv.d.ts}

@@ -1,4 +1,4 @@
-import { G as GenericEndpointContext } from './better-auth.purQujiV.js';
+import { G as GenericEndpointContext } from './better-auth.DiHCWsNg.js';
 
 declare function generateState(c: GenericEndpointContext, link?: {
     email: string;

package/dist/shared/{better-auth.BA2kubRc.d.cts → better-auth.BdjFNTuQ.d.cts}

@@ -1,6 +1,6 @@
 import * as zod from 'zod';
 import * as better_call from 'better-call';
-import { G as GenericEndpointContext, I as InferOptionSchema, H as HookEndpointContext, l as AuthContext } from './better-auth.BAR_8WbD.cjs';
+import { G as GenericEndpointContext, I as InferOptionSchema, H as HookEndpointContext, l as AuthContext } from './better-auth.CPKTEzG-.cjs';
 import { Statements } from '../plugins/access/index.cjs';
 
 declare const apiKeySchema: ({ timeWindow, rateLimitMax, }: {

package/dist/shared/{better-auth.D4ignKqt.d.mts → better-auth.BfPbu6oh.d.mts}

@@ -2,7 +2,7 @@ import { AccessControl, Role, Statements } from '../plugins/access/index.mjs';
 import { z } from 'zod';
 import * as better_call from 'better-call';
 import { b as Prettify } from './better-auth.Bi8FQwDD.mjs';
-import { U as User, S as Session, G as GenericEndpointContext } from './better-auth.imLEY-xr.mjs';
+import { U as User, S as Session, G as GenericEndpointContext } from './better-auth.Ck0xlDsK.mjs';
 import { defaultRoles } from '../plugins/organization/access/index.mjs';
 
 declare const organizationSchema: z.ZodObject<{

package/dist/shared/{better-auth.DhfiEsxl.cjs → better-auth.C-R0J0n1.cjs}

@@ -21,7 +21,7 @@ function withPath(url, path = "/api/auth") {
   path = path.startsWith("/") ? path : `/${path}`;
   return `${url.replace(/\/+$/, "")}${path}`;
 }
-function getBaseURL(url, path) {
+function getBaseURL(url, path, request) {
   if (url) {
     return withPath(url, path);
   }
@@ -29,6 +29,20 @@ function getBaseURL(url, path) {
   if (fromEnv) {
     return withPath(fromEnv, path);
   }
+  const fromRequest = request?.headers.get("x-forwarded-host");
+  const fromRequestProto = request?.headers.get("x-forwarded-proto");
+  if (fromRequest && fromRequestProto) {
+    return withPath(`${fromRequestProto}://${fromRequest}`, path);
+  }
+  if (request) {
+    const url2 = getOrigin(request.url);
+    if (!url2) {
+      throw new index.BetterAuthError(
+        "Could not get origin from request. Please provide a valid base URL."
+      );
+    }
+    return withPath(url2, path);
+  }
   if (typeof window !== "undefined" && window.location) {
     return withPath(window.location.origin, path);
   }

package/dist/shared/{better-auth.Bd1H94Nk.mjs → better-auth.CABkkSP8.mjs}

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

package/dist/shared/{better-auth.npe3WWSD.mjs → better-auth.CFZLHBFT.mjs}

@@ -3,7 +3,7 @@ import { deleteSessionCookie, setSessionCookie, setCookieCache } from '../cookie
 import { createMiddleware, createEndpoint, APIError } from 'better-call';
 import { SocialProviderListEnum, socialProviderList } from '../social-providers/index.mjs';
 import '@better-auth/utils/random';
-import { g as generateState, p as parseState } from './better-auth.CoMXyQ1y.mjs';
+import { g as generateState, p as parseState } from './better-auth.CbXAPXob.mjs';
 import { a as logger } from './better-auth.DH3YjMQH.mjs';
 import { g as getDate } from './better-auth.CW6D9eSx.mjs';
 import { g as generateId } from './better-auth.BUPPRXfK.mjs';
@@ -24,7 +24,7 @@ import { createHMAC } from '@better-auth/utils/hmac';
 import '@better-fetch/fetch';
 import 'defu';
 import { s as signJWT } from './better-auth.DDEbWX-S.mjs';
-import { b as getHost, c as getProtocol, g as getOrigin } from './better-auth.NcLhHEks.mjs';
+import { b as getHost, c as getProtocol, g as getOrigin } from './better-auth.VTXNLFMT.mjs';
 import { JWTExpired } from 'jose/errors';
 import { s as safeJSONParse } from './better-auth.tB5eU6EY.mjs';
 import { binary } from '@better-auth/utils/binary';
@@ -176,7 +176,7 @@ const originCheckMiddleware = createAuthMiddleware(async (ctx) => {
   const newUserCallbackURL = body?.newUserCallbackURL;
   const trustedOrigins = Array.isArray(context.options.trustedOrigins) ? context.trustedOrigins : [
     ...context.trustedOrigins,
-    ...context.options.trustedOrigins?.(ctx.request) || []
+    ...await context.options.trustedOrigins?.(ctx.request) || []
   ];
   const usesCookies = ctx.headers?.has("cookie");
   const matchesPattern = (url, pattern) => {
@@ -224,7 +224,7 @@ const originCheck = (getValue) => createAuthMiddleware(async (ctx) => {
     context.options.trustedOrigins
   ) ? context.trustedOrigins : [
     ...context.trustedOrigins,
-    ...context.options.trustedOrigins?.(ctx.request) || []
+    ...await context.options.trustedOrigins?.(ctx.request) || []
   ];
   const matchesPattern = (url, pattern) => {
     if (url.startsWith("/")) {
@@ -1632,9 +1632,7 @@ const callbackOAuth = createAuthEndpoint(
       }
     } catch (e) {
       c.context.logger.error("INVALID_CALLBACK_REQUEST", e);
-      throw c.redirect(
-        `${c.context.baseURL}/error?error=invalid_callback_request`
-      );
+      throw c.redirect(`${defaultErrorURL}?error=invalid_callback_request`);
     }
     const { code, error, state, error_description, device_id } = queryOrBody;
     if (error) {
@@ -1655,7 +1653,7 @@ const callbackOAuth = createAuthEndpoint(
       requestSignUp
     } = await parseState(c);
     function redirectOnError(error2) {
-      let url = errorURL || callbackURL || `${c.context.baseURL}/error`;
+      let url = errorURL || callbackURL || defaultErrorURL;
       if (url.includes("?")) {
         url = `${url}&error=${error2}`;
       } else {
@@ -2575,15 +2573,14 @@ const changeEmail = createAuthEndpoint(
         message: "Change email is disabled"
       });
     }
-    if (ctx.body.newEmail === ctx.context.session.user.email) {
+    const newEmail = ctx.body.newEmail.toLowerCase();
+    if (newEmail === ctx.context.session.user.email) {
       ctx.context.logger.error("Email is the same");
       throw new APIError("BAD_REQUEST", {
         message: "Email is the same"
       });
     }
-    const existingUser = await ctx.context.internalAdapter.findUserByEmail(
-      ctx.body.newEmail
-    );
+    const existingUser = await ctx.context.internalAdapter.findUserByEmail(newEmail);
     if (existingUser) {
       ctx.context.logger.error("Email already exists");
       throw new APIError("BAD_REQUEST", {
@@ -2591,9 +2588,7 @@ const changeEmail = createAuthEndpoint(
       });
     }
     if (ctx.context.session.user.emailVerified !== true) {
-      const existing = await ctx.context.internalAdapter.findUserByEmail(
-        ctx.body.newEmail
-      );
+      const existing = await ctx.context.internalAdapter.findUserByEmail(newEmail);
       if (existing) {
         throw new APIError("UNPROCESSABLE_ENTITY", {
           message: BASE_ERROR_CODES.USER_ALREADY_EXISTS
@@ -2602,15 +2597,22 @@ const changeEmail = createAuthEndpoint(
       await ctx.context.internalAdapter.updateUserByEmail(
         ctx.context.session.user.email,
         {
-          email: ctx.body.newEmail
+          email: newEmail
         },
         ctx
       );
+      await setSessionCookie(ctx, {
+        session: ctx.context.session.session,
+        user: {
+          ...ctx.context.session.user,
+          email: newEmail
+        }
+      });
       if (ctx.context.options.emailVerification?.sendVerificationEmail) {
         const token2 = await createEmailVerificationToken(
           ctx.context.secret,
           ctx.context.session.user.email,
-          ctx.body.newEmail,
+          newEmail,
           ctx.context.options.emailVerification?.expiresIn
         );
         const url2 = `${ctx.context.baseURL}/verify-email?token=${token2}&callbackURL=${ctx.body.callbackURL || "/"}`;
@@ -2618,7 +2620,7 @@ const changeEmail = createAuthEndpoint(
           {
             user: {
               ...ctx.context.session.user,
-              email: ctx.body.newEmail
+              email: newEmail
             },
             url: url2,
             token: token2
@@ -2639,14 +2641,14 @@ const changeEmail = createAuthEndpoint(
     const token = await createEmailVerificationToken(
       ctx.context.secret,
       ctx.context.session.user.email,
-      ctx.body.newEmail,
+      newEmail,
       ctx.context.options.emailVerification?.expiresIn
     );
     const url = `${ctx.context.baseURL}/verify-email?token=${token}&callbackURL=${ctx.body.callbackURL || "/"}`;
     await ctx.context.options.user.changeEmail.sendChangeEmailVerification(
       {
         user: ctx.context.session.user,
-        newEmail: ctx.body.newEmail,
+        newEmail,
         url,
         token
       },
@@ -2980,10 +2982,7 @@ const unlinkAccount = createAuthEndpoint(
         message: BASE_ERROR_CODES.ACCOUNT_NOT_FOUND
       });
     }
-    await ctx.context.internalAdapter.deleteAccount(
-      ctx.body.providerId,
-      ctx.context.session.user.id
-    );
+    await ctx.context.internalAdapter.deleteAccount(accountExist.id);
     return ctx.json({
       status: true
     });