better-auth 1.2.0-beta.5 → 1.2.0-beta.6

package/dist/{chunk-6FRITF4C.cjs → chunk-LIGJVOZ4.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkWKXM7XUV_cjs = require('./chunk-WKXM7XUV.cjs');
+var chunkN7UWN6ND_cjs = require('./chunk-N7UWN6ND.cjs');
 var chunkV6HE2MP7_cjs = require('./chunk-V6HE2MP7.cjs');
 var zod = require('zod');
 var fetch = require('@better-fetch/fetch');
@@ -14,7 +14,7 @@ function toBoolean(value) {
 var oneTap = (options) => ({
   id: "one-tap",
   endpoints: {
-    oneTapCallback: chunkWKXM7XUV_cjs.createAuthEndpoint(
+    oneTapCallback: chunkN7UWN6ND_cjs.createAuthEndpoint(
       "/one-tap/callback",
       {
         method: "POST",
@@ -66,7 +66,7 @@ var oneTap = (options) => ({
         );
         if (!user) {
           if (options?.disableSignup) {
-            throw new chunkWKXM7XUV_cjs.APIError("BAD_GATEWAY", {
+            throw new chunkN7UWN6ND_cjs.APIError("BAD_GATEWAY", {
               message: "User not found"
             });
           }
@@ -83,7 +83,7 @@ var oneTap = (options) => ({
             }
           );
           if (!user2) {
-            throw new chunkWKXM7XUV_cjs.APIError("INTERNAL_SERVER_ERROR", {
+            throw new chunkN7UWN6ND_cjs.APIError("INTERNAL_SERVER_ERROR", {
               message: "Could not create user"
             });
           }

package/dist/{chunk-WKBV4PRW.cjs → chunk-MKNDCNWD.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkWKXM7XUV_cjs = require('./chunk-WKXM7XUV.cjs');
+var chunkN7UWN6ND_cjs = require('./chunk-N7UWN6ND.cjs');
 var chunkV6HE2MP7_cjs = require('./chunk-V6HE2MP7.cjs');
 var betterCall = require('better-call');
 var hmac = require('@better-auth/utils/hmac');
@@ -16,7 +16,7 @@ var bearer = (options) => {
               context.request?.headers.get("authorization") || context.headers?.get("authorization")
             );
           },
-          handler: chunkWKXM7XUV_cjs.createAuthMiddleware(async (c) => {
+          handler: chunkN7UWN6ND_cjs.createAuthMiddleware(async (c) => {
             const token = c.request?.headers.get("authorization")?.replace("Bearer ", "") || c.headers?.get("Authorization")?.replace("Bearer ", "");
             if (!token) {
               return;
@@ -67,7 +67,7 @@ var bearer = (options) => {
           matcher(context) {
             return true;
           },
-          handler: chunkWKXM7XUV_cjs.createAuthMiddleware(async (ctx) => {
+          handler: chunkN7UWN6ND_cjs.createAuthMiddleware(async (ctx) => {
             const setCookie = ctx.context.responseHeaders?.get("set-cookie");
             if (!setCookie) {
               return;

package/dist/{chunk-WKXM7XUV.cjs → chunk-N7UWN6ND.cjs}

@@ -161,7 +161,7 @@ function wildcardMatch(pattern, options) {
 
 // src/api/middlewares/origin-check.ts
 var originCheckMiddleware = createAuthMiddleware(async (ctx) => {
-  if (ctx.request?.method !== "POST") {
+  if (ctx.request?.method !== "POST" || !ctx.request) {
     return;
   }
   const { body, query, context } = ctx;
@@ -170,7 +170,10 @@ var originCheckMiddleware = createAuthMiddleware(async (ctx) => {
   const redirectURL = body?.redirectTo;
   const errorCallbackURL = body?.errorCallbackURL;
   const newUserCallbackURL = body?.newUserCallbackURL;
-  const trustedOrigins = context.trustedOrigins;
+  const trustedOrigins = Array.isArray(context.options.trustedOrigins) ? context.trustedOrigins : [
+    ...context.trustedOrigins,
+    ...context.options.trustedOrigins?.(ctx.request) || []
+  ];
   const usesCookies = ctx.headers?.has("cookie");
   const matchesPattern = (url, pattern) => {
     if (url.startsWith("/")) {
@@ -208,9 +211,17 @@ var originCheckMiddleware = createAuthMiddleware(async (ctx) => {
   newUserCallbackURL && validateURL(newUserCallbackURL, "newUserCallbackURL");
 });
 var originCheck = (getValue) => createAuthMiddleware(async (ctx) => {
+  if (!ctx.request) {
+    return;
+  }
   const { context } = ctx;
   const callbackURL = getValue(ctx);
-  const trustedOrigins = context.trustedOrigins;
+  const trustedOrigins = Array.isArray(
+    context.options.trustedOrigins
+  ) ? context.trustedOrigins : [
+    ...context.trustedOrigins,
+    ...context.options.trustedOrigins?.(ctx.request) || []
+  ];
   const matchesPattern = (url, pattern) => {
     if (url.startsWith("/")) {
       return false;
@@ -1096,6 +1107,7 @@ async function handleOAuthUserInfo(c, {
         );
       }
     } catch (e) {
+      chunkH74YRRNV_cjs.logger.error(e);
       if (e instanceof betterCall.APIError) {
         return {
           error: e.message,
@@ -3112,7 +3124,7 @@ function getRetryAfter(lastRequest, window) {
   return Math.ceil((lastRequest + windowInMs - now) / 1e3);
 }
 function createDBStorage(ctx, modelName) {
-  const model = "rateLimit";
+  const model = ctx.options.rateLimit?.modelName || "rateLimit";
   const db = ctx.adapter;
   return {
     get: async (key) => {

package/dist/{chunk-TV24P5IW.cjs → chunk-OALLKKNX.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var chunkJUPDDQC4_cjs = require('./chunk-JUPDDQC4.cjs');
-var chunkWKXM7XUV_cjs = require('./chunk-WKXM7XUV.cjs');
+var chunkN7UWN6ND_cjs = require('./chunk-N7UWN6ND.cjs');
 var chunkV6HE2MP7_cjs = require('./chunk-V6HE2MP7.cjs');
 var chunkB5UCLTPZ_cjs = require('./chunk-B5UCLTPZ.cjs');
 var chunk2HPSCSV7_cjs = require('./chunk-2HPSCSV7.cjs');
@@ -20,14 +20,14 @@ var admin = (options) => {
     YOU_CANNOT_BAN_YOURSELF: "You cannot ban yourself",
     ONLY_ADMINS_CAN_ACCESS_THIS_ENDPOINT: "Only admins can access this endpoint"
   };
-  const adminMiddleware = chunkWKXM7XUV_cjs.createAuthMiddleware(async (ctx) => {
-    const session = await chunkWKXM7XUV_cjs.getSessionFromCtx(ctx);
+  const adminMiddleware = chunkN7UWN6ND_cjs.createAuthMiddleware(async (ctx) => {
+    const session = await chunkN7UWN6ND_cjs.getSessionFromCtx(ctx);
     if (!session?.session) {
-      throw new chunkWKXM7XUV_cjs.APIError("UNAUTHORIZED");
+      throw new chunkN7UWN6ND_cjs.APIError("UNAUTHORIZED");
     }
     const user = session.user;
     if (!user.role || (Array.isArray(opts.adminRole) ? !opts.adminRole.includes(user.role) : user.role !== opts.adminRole)) {
-      throw new chunkWKXM7XUV_cjs.APIError("FORBIDDEN", {
+      throw new chunkN7UWN6ND_cjs.APIError("FORBIDDEN", {
         message: "Only admins can access this endpoint"
       });
     }
@@ -52,8 +52,7 @@ var admin = (options) => {
                   }
                   return {
                     data: {
-                      role: options?.defaultRole ?? "user",
-                      ...user
+                      role: options?.defaultRole ?? "user"
                     }
                   };
                 }
@@ -89,7 +88,7 @@ var admin = (options) => {
           matcher(context) {
             return context.path === "/list-sessions";
           },
-          handler: chunkWKXM7XUV_cjs.createAuthMiddleware(async (ctx) => {
+          handler: chunkN7UWN6ND_cjs.createAuthMiddleware(async (ctx) => {
             const response = await chunkJUPDDQC4_cjs.getEndpointResponse(ctx);
             if (!response) {
               return;
@@ -103,7 +102,7 @@ var admin = (options) => {
       ]
     },
     endpoints: {
-      setRole: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      setRole: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/admin/set-role",
         {
           method: "POST",
@@ -153,7 +152,7 @@ var admin = (options) => {
           });
         }
       ),
-      createUser: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      createUser: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/admin/create-user",
         {
           method: "POST",
@@ -210,7 +209,7 @@ var admin = (options) => {
             ctx.body.email
           );
           if (existUser) {
-            throw new chunkWKXM7XUV_cjs.APIError("BAD_REQUEST", {
+            throw new chunkN7UWN6ND_cjs.APIError("BAD_REQUEST", {
               message: ERROR_CODES.USER_ALREADY_EXISTS
             });
           }
@@ -221,7 +220,7 @@ var admin = (options) => {
             ...ctx.body.data
           });
           if (!user) {
-            throw new chunkWKXM7XUV_cjs.APIError("INTERNAL_SERVER_ERROR", {
+            throw new chunkN7UWN6ND_cjs.APIError("INTERNAL_SERVER_ERROR", {
               message: ERROR_CODES.FAILED_TO_CREATE_USER
             });
           }
@@ -239,7 +238,7 @@ var admin = (options) => {
           });
         }
       ),
-      listUsers: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      listUsers: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/admin/list-users",
         {
           method: "GET",
@@ -354,7 +353,7 @@ var admin = (options) => {
           }
         }
       ),
-      listUserSessions: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      listUserSessions: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/admin/list-user-sessions",
         {
           method: "POST",
@@ -401,7 +400,7 @@ var admin = (options) => {
           };
         }
       ),
-      unbanUser: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      unbanUser: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/admin/unban-user",
         {
           method: "POST",
@@ -448,7 +447,7 @@ var admin = (options) => {
           });
         }
       ),
-      banUser: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      banUser: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/admin/ban-user",
         {
           method: "POST",
@@ -497,7 +496,7 @@ var admin = (options) => {
         },
         async (ctx) => {
           if (ctx.body.userId === ctx.context.session.user.id) {
-            throw new chunkWKXM7XUV_cjs.APIError("BAD_REQUEST", {
+            throw new chunkN7UWN6ND_cjs.APIError("BAD_REQUEST", {
               message: ERROR_CODES.YOU_CANNOT_BAN_YOURSELF
             });
           }
@@ -515,7 +514,7 @@ var admin = (options) => {
           });
         }
       ),
-      impersonateUser: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      impersonateUser: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/admin/impersonate-user",
         {
           method: "POST",
@@ -558,7 +557,7 @@ var admin = (options) => {
             ctx.body.userId
           );
           if (!targetUser) {
-            throw new chunkWKXM7XUV_cjs.APIError("NOT_FOUND", {
+            throw new chunkN7UWN6ND_cjs.APIError("NOT_FOUND", {
               message: "User not found"
             });
           }
@@ -573,7 +572,7 @@ var admin = (options) => {
             }
           );
           if (!session) {
-            throw new chunkWKXM7XUV_cjs.APIError("INTERNAL_SERVER_ERROR", {
+            throw new chunkN7UWN6ND_cjs.APIError("INTERNAL_SERVER_ERROR", {
               message: ERROR_CODES.FAILED_TO_CREATE_USER
             });
           }
@@ -599,18 +598,18 @@ var admin = (options) => {
           });
         }
       ),
-      stopImpersonating: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      stopImpersonating: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/admin/stop-impersonating",
         {
           method: "POST"
         },
         async (ctx) => {
-          const session = await chunkWKXM7XUV_cjs.getSessionFromCtx(ctx);
+          const session = await chunkN7UWN6ND_cjs.getSessionFromCtx(ctx);
           if (!session) {
-            throw new chunkWKXM7XUV_cjs.APIError("UNAUTHORIZED");
+            throw new chunkN7UWN6ND_cjs.APIError("UNAUTHORIZED");
           }
           if (!session.session.impersonatedBy) {
-            throw new chunkWKXM7XUV_cjs.APIError("BAD_REQUEST", {
+            throw new chunkN7UWN6ND_cjs.APIError("BAD_REQUEST", {
               message: "You are not impersonating anyone"
             });
           }
@@ -618,7 +617,7 @@ var admin = (options) => {
             session.session.impersonatedBy
           );
           if (!user) {
-            throw new chunkWKXM7XUV_cjs.APIError("INTERNAL_SERVER_ERROR", {
+            throw new chunkN7UWN6ND_cjs.APIError("INTERNAL_SERVER_ERROR", {
               message: "Failed to find user"
             });
           }
@@ -627,13 +626,13 @@ var admin = (options) => {
             ctx.context.secret
           );
           if (!adminCookie) {
-            throw new chunkWKXM7XUV_cjs.APIError("INTERNAL_SERVER_ERROR", {
+            throw new chunkN7UWN6ND_cjs.APIError("INTERNAL_SERVER_ERROR", {
               message: "Failed to find admin session"
             });
           }
           const adminSession = await ctx.context.internalAdapter.findSession(adminCookie);
           if (!adminSession || adminSession.session.userId !== user.id) {
-            throw new chunkWKXM7XUV_cjs.APIError("INTERNAL_SERVER_ERROR", {
+            throw new chunkN7UWN6ND_cjs.APIError("INTERNAL_SERVER_ERROR", {
               message: "Failed to find admin session"
             });
           }
@@ -641,7 +640,7 @@ var admin = (options) => {
           return ctx.json(adminSession);
         }
       ),
-      revokeUserSession: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      revokeUserSession: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/admin/revoke-user-session",
         {
           method: "POST",
@@ -685,7 +684,7 @@ var admin = (options) => {
           });
         }
       ),
-      revokeUserSessions: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      revokeUserSessions: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/admin/revoke-user-sessions",
         {
           method: "POST",
@@ -727,7 +726,7 @@ var admin = (options) => {
           });
         }
       ),
-      removeUser: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      removeUser: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/admin/remove-user",
         {
           method: "POST",
@@ -768,6 +767,29 @@ var admin = (options) => {
             success: true
           });
         }
+      ),
+      setUserPassword: chunkN7UWN6ND_cjs.createAuthEndpoint(
+        "/admin/set-user-password",
+        {
+          method: "POST",
+          body: zod.z.object({
+            newPassword: zod.z.string(),
+            userId: zod.z.string()
+          }),
+          use: [adminMiddleware]
+        },
+        async (ctx) => {
+          const hashedPassword = await ctx.context.password.hash(
+            ctx.body.newPassword
+          );
+          await ctx.context.internalAdapter.updatePassword(
+            ctx.body.userId,
+            hashedPassword
+          );
+          return ctx.json({
+            status: true
+          });
+        }
       )
     },
     $ERROR_CODES: ERROR_CODES,

package/dist/{chunk-3BXU3Z5H.js → chunk-QKCLO6S5.js}

@@ -1,4 +1,4 @@
-import { createAuthEndpoint, originCheck, createAuthMiddleware } from './chunk-R62AOMGV.js';
+import { createAuthEndpoint, originCheck, createAuthMiddleware } from './chunk-SCXZXQTZ.js';
 import { getOrigin } from './chunk-XFCIANZX.js';
 import { symmetricDecrypt, symmetricEncrypt } from './chunk-DBPOZRMS.js';
 import { env } from './chunk-TQQSPPNA.js';

package/dist/{chunk-E3CHTKRP.js → chunk-QLKU77BF.js}

@@ -1,5 +1,5 @@
 import { getEndpointResponse } from './chunk-JEYF2ARX.js';
-import { createAuthEndpoint, APIError, createAuthMiddleware } from './chunk-R62AOMGV.js';
+import { createAuthEndpoint, APIError, createAuthMiddleware } from './chunk-SCXZXQTZ.js';
 import { setSessionCookie } from './chunk-QQGZ3XGI.js';
 import { generateRandomString } from './chunk-DBPOZRMS.js';
 import { getDate } from './chunk-FURNA6HY.js';

package/dist/{chunk-CYI7H6T2.js → chunk-RMPI2YZ3.js}

@@ -1,4 +1,4 @@
-import { createAuthMiddleware, createAuthEndpoint, sessionMiddleware, APIError, getSessionFromCtx } from './chunk-R62AOMGV.js';
+import { createAuthMiddleware, createAuthEndpoint, sessionMiddleware, APIError, getSessionFromCtx } from './chunk-SCXZXQTZ.js';
 import { parseSetCookieHeader } from './chunk-QQGZ3XGI.js';
 import { generateRandomString } from './chunk-DBPOZRMS.js';
 import { SignJWT } from 'jose';

package/dist/{chunk-R62AOMGV.js → chunk-SCXZXQTZ.js}

@@ -156,7 +156,7 @@ function wildcardMatch(pattern, options) {
 
 // src/api/middlewares/origin-check.ts
 var originCheckMiddleware = createAuthMiddleware(async (ctx) => {
-  if (ctx.request?.method !== "POST") {
+  if (ctx.request?.method !== "POST" || !ctx.request) {
     return;
   }
   const { body, query, context } = ctx;
@@ -165,7 +165,10 @@ var originCheckMiddleware = createAuthMiddleware(async (ctx) => {
   const redirectURL = body?.redirectTo;
   const errorCallbackURL = body?.errorCallbackURL;
   const newUserCallbackURL = body?.newUserCallbackURL;
-  const trustedOrigins = context.trustedOrigins;
+  const trustedOrigins = Array.isArray(context.options.trustedOrigins) ? context.trustedOrigins : [
+    ...context.trustedOrigins,
+    ...context.options.trustedOrigins?.(ctx.request) || []
+  ];
   const usesCookies = ctx.headers?.has("cookie");
   const matchesPattern = (url, pattern) => {
     if (url.startsWith("/")) {
@@ -203,9 +206,17 @@ var originCheckMiddleware = createAuthMiddleware(async (ctx) => {
   newUserCallbackURL && validateURL(newUserCallbackURL, "newUserCallbackURL");
 });
 var originCheck = (getValue) => createAuthMiddleware(async (ctx) => {
+  if (!ctx.request) {
+    return;
+  }
   const { context } = ctx;
   const callbackURL = getValue(ctx);
-  const trustedOrigins = context.trustedOrigins;
+  const trustedOrigins = Array.isArray(
+    context.options.trustedOrigins
+  ) ? context.trustedOrigins : [
+    ...context.trustedOrigins,
+    ...context.options.trustedOrigins?.(ctx.request) || []
+  ];
   const matchesPattern = (url, pattern) => {
     if (url.startsWith("/")) {
       return false;
@@ -1091,6 +1102,7 @@ async function handleOAuthUserInfo(c, {
         );
       }
     } catch (e) {
+      logger.error(e);
       if (e instanceof APIError) {
         return {
           error: e.message,
@@ -3107,7 +3119,7 @@ function getRetryAfter(lastRequest, window) {
   return Math.ceil((lastRequest + windowInMs - now) / 1e3);
 }
 function createDBStorage(ctx, modelName) {
-  const model = "rateLimit";
+  const model = ctx.options.rateLimit?.modelName || "rateLimit";
   const db = ctx.adapter;
   return {
     get: async (key) => {

package/dist/{chunk-G365UCY7.js → chunk-ST2CQ4A2.js}

@@ -1,4 +1,4 @@
-import { createAuthEndpoint, BASE_ERROR_CODES, originCheck } from './chunk-R62AOMGV.js';
+import { createAuthEndpoint, BASE_ERROR_CODES, originCheck } from './chunk-SCXZXQTZ.js';
 import { setSessionCookie } from './chunk-QQGZ3XGI.js';
 import { generateRandomString } from './chunk-DBPOZRMS.js';
 import { z } from 'zod';
@@ -57,7 +57,7 @@ var magicLink = (options) => {
               });
             }
           }
-          const verificationToken = generateRandomString(32, "a-z", "A-Z");
+          const verificationToken = options?.generateToken ? await options.generateToken(email) : generateRandomString(32, "a-z", "A-Z");
           await ctx.context.internalAdapter.createVerificationValue({
             identifier: verificationToken,
             value: JSON.stringify({ email, name: ctx.body.name }),

package/dist/{chunk-5RIBF22K.cjs → chunk-U44XLDNH.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkWKXM7XUV_cjs = require('./chunk-WKXM7XUV.cjs');
+var chunkN7UWN6ND_cjs = require('./chunk-N7UWN6ND.cjs');
 var chunkV6HE2MP7_cjs = require('./chunk-V6HE2MP7.cjs');
 var chunkB5UCLTPZ_cjs = require('./chunk-B5UCLTPZ.cjs');
 var chunkG2LZ73E2_cjs = require('./chunk-G2LZ73E2.cjs');
@@ -32,7 +32,7 @@ var phoneNumber = (options) => {
   return {
     id: "phone-number",
     endpoints: {
-      signInPhoneNumber: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      signInPhoneNumber: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/sign-in/phone-number",
         {
           method: "POST",
@@ -140,7 +140,7 @@ var phoneNumber = (options) => {
           if (!session) {
             ctx.context.logger.error("Failed to create session");
             throw new betterCall.APIError("UNAUTHORIZED", {
-              message: chunkWKXM7XUV_cjs.BASE_ERROR_CODES.FAILED_TO_CREATE_SESSION
+              message: chunkN7UWN6ND_cjs.BASE_ERROR_CODES.FAILED_TO_CREATE_SESSION
             });
           }
           await chunkV6HE2MP7_cjs.setSessionCookie(
@@ -167,7 +167,7 @@ var phoneNumber = (options) => {
           });
         }
       ),
-      sendPhoneNumberOTP: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      sendPhoneNumberOTP: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/phone-number/send-otp",
         {
           method: "POST",
@@ -240,7 +240,7 @@ var phoneNumber = (options) => {
           );
         }
       ),
-      verifyPhoneNumber: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      verifyPhoneNumber: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/phone-number/verify",
         {
           method: "POST",
@@ -324,10 +324,10 @@ var phoneNumber = (options) => {
           }
           await ctx.context.internalAdapter.deleteVerificationValue(otp.id);
           if (ctx.body.updatePhoneNumber) {
-            const session = await chunkWKXM7XUV_cjs.getSessionFromCtx(ctx);
+            const session = await chunkN7UWN6ND_cjs.getSessionFromCtx(ctx);
             if (!session) {
               throw new betterCall.APIError("UNAUTHORIZED", {
-                message: chunkWKXM7XUV_cjs.BASE_ERROR_CODES.USER_NOT_FOUND
+                message: chunkN7UWN6ND_cjs.BASE_ERROR_CODES.USER_NOT_FOUND
               });
             }
             let user2 = await ctx.context.internalAdapter.updateUser(
@@ -362,13 +362,6 @@ var phoneNumber = (options) => {
               }
             ]
           });
-          await options?.callbackOnVerification?.(
-            {
-              phoneNumber: ctx.body.phoneNumber,
-              user
-            },
-            ctx.request
-          );
           if (!user) {
             if (options?.signUpOnVerification) {
               user = await ctx.context.internalAdapter.createUser({
@@ -383,20 +376,28 @@ var phoneNumber = (options) => {
               });
               if (!user) {
                 throw new betterCall.APIError("INTERNAL_SERVER_ERROR", {
-                  message: chunkWKXM7XUV_cjs.BASE_ERROR_CODES.FAILED_TO_CREATE_USER
+                  message: chunkN7UWN6ND_cjs.BASE_ERROR_CODES.FAILED_TO_CREATE_USER
                 });
               }
-            } else {
-              return ctx.json(null);
             }
           } else {
             user = await ctx.context.internalAdapter.updateUser(user.id, {
               [opts.phoneNumberVerified]: true
             });
           }
+          if (!user) {
+            return ctx.json(null);
+          }
+          await options?.callbackOnVerification?.(
+            {
+              phoneNumber: ctx.body.phoneNumber,
+              user
+            },
+            ctx.request
+          );
           if (!user) {
             throw new betterCall.APIError("INTERNAL_SERVER_ERROR", {
-              message: chunkWKXM7XUV_cjs.BASE_ERROR_CODES.FAILED_TO_UPDATE_USER
+              message: chunkN7UWN6ND_cjs.BASE_ERROR_CODES.FAILED_TO_UPDATE_USER
             });
           }
           if (!ctx.body.disableSession) {
@@ -406,7 +407,7 @@ var phoneNumber = (options) => {
             );
             if (!session) {
               throw new betterCall.APIError("INTERNAL_SERVER_ERROR", {
-                message: chunkWKXM7XUV_cjs.BASE_ERROR_CODES.FAILED_TO_CREATE_SESSION
+                message: chunkN7UWN6ND_cjs.BASE_ERROR_CODES.FAILED_TO_CREATE_SESSION
               });
             }
             await chunkV6HE2MP7_cjs.setSessionCookie(ctx, {
@@ -446,7 +447,7 @@ var phoneNumber = (options) => {
           });
         }
       ),
-      forgetPasswordPhoneNumber: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      forgetPasswordPhoneNumber: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/phone-number/forget-password",
         {
           method: "POST",
@@ -487,7 +488,7 @@ var phoneNumber = (options) => {
           });
         }
       ),
-      resetPasswordPhoneNumber: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      resetPasswordPhoneNumber: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/phone-number/reset-password",
         {
           method: "POST",