better-auth 1.1.18 → 1.1.19-beta.2

package/dist/adapters/mongodb.cjs

@@ -15,7 +15,11 @@ var mongodb = require('mongodb');
 
 var createTransform = (options) => {
   const schema = chunkDVHD6IW3_cjs.getAuthTables(options);
+  const customIdGen = options.advanced?.generateId;
   function serializeID(field, value, model) {
+    if (customIdGen) {
+      return value;
+    }
     if (field === "id" || field === "_id" || schema[model].fields[field].references?.field === "id") {
       if (typeof value !== "string") {
         if (value instanceof mongodb.ObjectId) {
@@ -47,6 +51,9 @@ var createTransform = (options) => {
     return value;
   }
   function deserializeID(field, value, model) {
+    if (customIdGen) {
+      return value;
+    }
     if (field === "id" || schema[model].fields[field].references?.field === "id") {
       if (value instanceof mongodb.ObjectId) {
         return value.toHexString();
@@ -65,6 +72,9 @@ var createTransform = (options) => {
   }
   function getField(field, model) {
     if (field === "id") {
+      if (customIdGen) {
+        return "id";
+      }
       return "_id";
     }
     const f = schema[model].fields[field];
@@ -72,7 +82,9 @@ var createTransform = (options) => {
   }
   return {
     transformInput(data, model, action) {
-      const transformedData = action === "update" ? {} : {
+      const transformedData = action === "update" ? {} : customIdGen ? {
+        id: customIdGen({ model })
+      } : {
         _id: new mongodb.ObjectId()
       };
       const fields = schema[model].fields;
@@ -179,17 +191,18 @@ var createTransform = (options) => {
 };
 var mongodbAdapter = (db) => (options) => {
   const transform = createTransform(options);
+  const hasCustomId = options.advanced?.generateId;
   return {
     id: "mongodb-adapter",
     async create(data) {
       const { model, data: values, select } = data;
       const transformedData = transform.transformInput(values, model, "create");
-      if (transformedData.id) {
+      if (transformedData.id && !hasCustomId) {
         delete transformedData.id;
       }
       const res = await db.collection(transform.getModelName(model)).insertOne(transformedData);
       const id = res.insertedId;
-      const insertedData = { ...transformedData, id: id.toString() };
+      const insertedData = { id: id.toString(), ...transformedData };
       const t = transform.transformOutput(insertedData, model, select);
       return t;
     },

package/dist/adapters/mongodb.js

@@ -13,7 +13,11 @@ import { ObjectId } from 'mongodb';
 
 var createTransform = (options) => {
   const schema = getAuthTables(options);
+  const customIdGen = options.advanced?.generateId;
   function serializeID(field, value, model) {
+    if (customIdGen) {
+      return value;
+    }
     if (field === "id" || field === "_id" || schema[model].fields[field].references?.field === "id") {
       if (typeof value !== "string") {
         if (value instanceof ObjectId) {
@@ -45,6 +49,9 @@ var createTransform = (options) => {
     return value;
   }
   function deserializeID(field, value, model) {
+    if (customIdGen) {
+      return value;
+    }
     if (field === "id" || schema[model].fields[field].references?.field === "id") {
       if (value instanceof ObjectId) {
         return value.toHexString();
@@ -63,6 +70,9 @@ var createTransform = (options) => {
   }
   function getField(field, model) {
     if (field === "id") {
+      if (customIdGen) {
+        return "id";
+      }
       return "_id";
     }
     const f = schema[model].fields[field];
@@ -70,7 +80,9 @@ var createTransform = (options) => {
   }
   return {
     transformInput(data, model, action) {
-      const transformedData = action === "update" ? {} : {
+      const transformedData = action === "update" ? {} : customIdGen ? {
+        id: customIdGen({ model })
+      } : {
         _id: new ObjectId()
       };
       const fields = schema[model].fields;
@@ -177,17 +189,18 @@ var createTransform = (options) => {
 };
 var mongodbAdapter = (db) => (options) => {
   const transform = createTransform(options);
+  const hasCustomId = options.advanced?.generateId;
   return {
     id: "mongodb-adapter",
     async create(data) {
       const { model, data: values, select } = data;
       const transformedData = transform.transformInput(values, model, "create");
-      if (transformedData.id) {
+      if (transformedData.id && !hasCustomId) {
         delete transformedData.id;
       }
       const res = await db.collection(transform.getModelName(model)).insertOne(transformedData);
       const id = res.insertedId;
-      const insertedData = { ...transformedData, id: id.toString() };
+      const insertedData = { id: id.toString(), ...transformedData };
       const t = transform.transformOutput(insertedData, model, select);
       return t;
     },

package/dist/{chunk-WVSCDHH5.cjs → chunk-BTKNMP5Q.cjs}

@@ -332,7 +332,7 @@ var getMetadata = (ctx, options) => {
     issuer,
     authorization_endpoint: `${baseURL}/oauth2/authorize`,
     token_endpoint: `${baseURL}/oauth2/token`,
-    userInfo_endpoint: `${baseURL}/oauth2/userinfo`,
+    userinfo_endpoint: `${baseURL}/oauth2/userinfo`,
     jwks_uri: `${baseURL}/jwks`,
     registration_endpoint: `${baseURL}/oauth2/register`,
     scopes_supported: ["openid", "profile", "email", "offline_access"],

package/dist/{chunk-7H62SU6D.js → chunk-IM6ZPUVI.js}

@@ -1,7 +1,7 @@
 import { createAuthEndpoint, APIError } from './chunk-KALC2G3Y.js';
 import { setSessionCookie } from './chunk-QQGZ3XGI.js';
 import { z } from 'zod';
-import { betterFetch } from '@better-fetch/fetch';
+import { createRemoteJWKSet, jwtVerify } from 'jose';
 
 // src/utils/boolean.ts
 function toBoolean(value) {
@@ -53,59 +53,80 @@ var oneTap = (options) => ({
       },
       async (ctx) => {
         const { idToken } = ctx.body;
-        const { data, error } = await betterFetch("https://oauth2.googleapis.com/tokeninfo?id_token=" + idToken);
-        if (error) {
-          return ctx.json({
-            error: "Invalid token"
+        let payload;
+        try {
+          const JWKS = createRemoteJWKSet(
+            new URL("https://www.googleapis.com/oauth2/v3/certs")
+          );
+          const { payload: verifiedPayload } = await jwtVerify(
+            idToken,
+            JWKS,
+            {
+              issuer: ["https://accounts.google.com", "accounts.google.com"],
+              audience: options?.clientId || ctx.context.options.socialProviders?.google?.clientId
+            }
+          );
+          payload = verifiedPayload;
+        } catch (error) {
+          throw new APIError("BAD_REQUEST", {
+            message: "invalid id token"
           });
         }
-        const user = await ctx.context.internalAdapter.findUserByEmail(
-          data.email
-        );
+        const { email, email_verified, name, picture, sub } = payload;
+        if (!email) {
+          return ctx.json({ error: "Email not available in token" });
+        }
+        const user = await ctx.context.internalAdapter.findUserByEmail(email);
         if (!user) {
           if (options?.disableSignup) {
             throw new APIError("BAD_GATEWAY", {
               message: "User not found"
             });
           }
-          const user2 = await ctx.context.internalAdapter.createOAuthUser(
+          const newUser = await ctx.context.internalAdapter.createOAuthUser(
             {
-              email: data.email,
-              emailVerified: toBoolean(data.email_verified),
-              name: data.name,
-              image: data.picture
+              email,
+              emailVerified: typeof email_verified === "boolean" ? email_verified : toBoolean(email_verified),
+              name,
+              image: picture
             },
             {
               providerId: "google",
-              accountId: data.sub
+              accountId: sub
             }
           );
-          if (!user2) {
+          if (!newUser) {
             throw new APIError("INTERNAL_SERVER_ERROR", {
               message: "Could not create user"
             });
           }
           const session2 = await ctx.context.internalAdapter.createSession(
-            user2?.user.id,
+            newUser.user.id,
             ctx.request
           );
           await setSessionCookie(ctx, {
-            user: user2.user,
+            user: newUser.user,
             session: session2
           });
           return ctx.json({
             token: session2.token,
             user: {
-              id: user2.user.id,
-              email: user2.user.email,
-              emailVerified: user2.user.emailVerified,
-              name: user2.user.name,
-              image: user2.user.image,
-              createdAt: user2.user.createdAt,
-              updatedAt: user2.user.updatedAt
+              id: newUser.user.id,
+              email: newUser.user.email,
+              emailVerified: newUser.user.emailVerified,
+              name: newUser.user.name,
+              image: newUser.user.image,
+              createdAt: newUser.user.createdAt,
+              updatedAt: newUser.user.updatedAt
             }
           });
         }
+        const account = await ctx.context.internalAdapter.findAccount(sub);
+        if (!account) {
+          throw new APIError("UNAUTHORIZED", {
+            message: "Google sub doesn't match"
+          });
+        }
         const session = await ctx.context.internalAdapter.createSession(
           user.user.id,
           ctx.request

package/dist/{chunk-5N4RX2ID.cjs → chunk-MJZAAOE7.cjs}

@@ -179,6 +179,9 @@ function getResponse(responses) {
     ...responses
   };
 }
+function toOpenApiPath(path) {
+  return path.split("/").map((part) => part.startsWith(":") ? `{${part.slice(1)}}` : part).join("/");
+}
 async function generator(ctx, options) {
   const baseEndpoints = chunkCQNPMJJ3_cjs.getEndpoints(ctx, {
     ...options,
@@ -209,8 +212,9 @@ async function generator(ctx, options) {
   Object.entries(baseEndpoints.api).forEach(([_, value]) => {
     const options2 = value.options;
     if (options2.metadata?.SERVER_ONLY) return;
+    const path = toOpenApiPath(value.path);
     if (options2.method === "GET") {
-      paths[value.path] = {
+      paths[path] = {
         get: {
           tags: ["Default", ...options2.metadata?.openapi?.tags || []],
           description: options2.metadata?.openapi?.description,
@@ -227,7 +231,7 @@ async function generator(ctx, options) {
     }
     if (options2.method === "POST") {
       const body = getRequestBody(options2);
-      paths[value.path] = {
+      paths[path] = {
         post: {
           tags: ["Default", ...options2.metadata?.openapi?.tags || []],
           description: options2.metadata?.openapi?.description,
@@ -273,8 +277,9 @@ async function generator(ctx, options) {
     Object.entries(api).forEach(([key, value]) => {
       const options2 = value.options;
       if (options2.metadata?.SERVER_ONLY) return;
+      const path = toOpenApiPath(value.path);
       if (options2.method === "GET") {
-        paths[value.path] = {
+        paths[path] = {
           get: {
             tags: options2.metadata?.openapi?.tags || [
               plugin.id.charAt(0).toUpperCase() + plugin.id.slice(1)
@@ -292,7 +297,7 @@ async function generator(ctx, options) {
         };
       }
       if (options2.method === "POST") {
-        paths[value.path] = {
+        paths[path] = {
           post: {
             tags: options2.metadata?.openapi?.tags || [
               plugin.id.charAt(0).toUpperCase() + plugin.id.slice(1)

package/dist/{chunk-HVYF3QT2.cjs → chunk-QE4APVC5.cjs}

@@ -3,7 +3,7 @@
 var chunkCQNPMJJ3_cjs = require('./chunk-CQNPMJJ3.cjs');
 var chunkV6HE2MP7_cjs = require('./chunk-V6HE2MP7.cjs');
 var zod = require('zod');
-var fetch = require('@better-fetch/fetch');
+var jose = require('jose');
 
 // src/utils/boolean.ts
 function toBoolean(value) {
@@ -55,59 +55,80 @@ var oneTap = (options) => ({
       },
       async (ctx) => {
         const { idToken } = ctx.body;
-        const { data, error } = await fetch.betterFetch("https://oauth2.googleapis.com/tokeninfo?id_token=" + idToken);
-        if (error) {
-          return ctx.json({
-            error: "Invalid token"
+        let payload;
+        try {
+          const JWKS = jose.createRemoteJWKSet(
+            new URL("https://www.googleapis.com/oauth2/v3/certs")
+          );
+          const { payload: verifiedPayload } = await jose.jwtVerify(
+            idToken,
+            JWKS,
+            {
+              issuer: ["https://accounts.google.com", "accounts.google.com"],
+              audience: options?.clientId || ctx.context.options.socialProviders?.google?.clientId
+            }
+          );
+          payload = verifiedPayload;
+        } catch (error) {
+          throw new chunkCQNPMJJ3_cjs.APIError("BAD_REQUEST", {
+            message: "invalid id token"
           });
         }
-        const user = await ctx.context.internalAdapter.findUserByEmail(
-          data.email
-        );
+        const { email, email_verified, name, picture, sub } = payload;
+        if (!email) {
+          return ctx.json({ error: "Email not available in token" });
+        }
+        const user = await ctx.context.internalAdapter.findUserByEmail(email);
         if (!user) {
           if (options?.disableSignup) {
             throw new chunkCQNPMJJ3_cjs.APIError("BAD_GATEWAY", {
               message: "User not found"
             });
           }
-          const user2 = await ctx.context.internalAdapter.createOAuthUser(
+          const newUser = await ctx.context.internalAdapter.createOAuthUser(
             {
-              email: data.email,
-              emailVerified: toBoolean(data.email_verified),
-              name: data.name,
-              image: data.picture
+              email,
+              emailVerified: typeof email_verified === "boolean" ? email_verified : toBoolean(email_verified),
+              name,
+              image: picture
             },
             {
               providerId: "google",
-              accountId: data.sub
+              accountId: sub
             }
           );
-          if (!user2) {
+          if (!newUser) {
             throw new chunkCQNPMJJ3_cjs.APIError("INTERNAL_SERVER_ERROR", {
               message: "Could not create user"
             });
           }
           const session2 = await ctx.context.internalAdapter.createSession(
-            user2?.user.id,
+            newUser.user.id,
             ctx.request
           );
           await chunkV6HE2MP7_cjs.setSessionCookie(ctx, {
-            user: user2.user,
+            user: newUser.user,
             session: session2
           });
           return ctx.json({
             token: session2.token,
             user: {
-              id: user2.user.id,
-              email: user2.user.email,
-              emailVerified: user2.user.emailVerified,
-              name: user2.user.name,
-              image: user2.user.image,
-              createdAt: user2.user.createdAt,
-              updatedAt: user2.user.updatedAt
+              id: newUser.user.id,
+              email: newUser.user.email,
+              emailVerified: newUser.user.emailVerified,
+              name: newUser.user.name,
+              image: newUser.user.image,
+              createdAt: newUser.user.createdAt,
+              updatedAt: newUser.user.updatedAt
             }
           });
         }
+        const account = await ctx.context.internalAdapter.findAccount(sub);
+        if (!account) {
+          throw new chunkCQNPMJJ3_cjs.APIError("UNAUTHORIZED", {
+            message: "Google sub doesn't match"
+          });
+        }
         const session = await ctx.context.internalAdapter.createSession(
           user.user.id,
           ctx.request

package/dist/{chunk-K7BZ36L5.js → chunk-VMQM7XMT.js}

@@ -177,6 +177,9 @@ function getResponse(responses) {
     ...responses
   };
 }
+function toOpenApiPath(path) {
+  return path.split("/").map((part) => part.startsWith(":") ? `{${part.slice(1)}}` : part).join("/");
+}
 async function generator(ctx, options) {
   const baseEndpoints = getEndpoints(ctx, {
     ...options,
@@ -207,8 +210,9 @@ async function generator(ctx, options) {
   Object.entries(baseEndpoints.api).forEach(([_, value]) => {
     const options2 = value.options;
     if (options2.metadata?.SERVER_ONLY) return;
+    const path = toOpenApiPath(value.path);
     if (options2.method === "GET") {
-      paths[value.path] = {
+      paths[path] = {
         get: {
           tags: ["Default", ...options2.metadata?.openapi?.tags || []],
           description: options2.metadata?.openapi?.description,
@@ -225,7 +229,7 @@ async function generator(ctx, options) {
     }
     if (options2.method === "POST") {
       const body = getRequestBody(options2);
-      paths[value.path] = {
+      paths[path] = {
         post: {
           tags: ["Default", ...options2.metadata?.openapi?.tags || []],
           description: options2.metadata?.openapi?.description,
@@ -271,8 +275,9 @@ async function generator(ctx, options) {
     Object.entries(api).forEach(([key, value]) => {
       const options2 = value.options;
       if (options2.metadata?.SERVER_ONLY) return;
+      const path = toOpenApiPath(value.path);
       if (options2.method === "GET") {
-        paths[value.path] = {
+        paths[path] = {
           get: {
             tags: options2.metadata?.openapi?.tags || [
               plugin.id.charAt(0).toUpperCase() + plugin.id.slice(1)
@@ -290,7 +295,7 @@ async function generator(ctx, options) {
         };
       }
       if (options2.method === "POST") {
-        paths[value.path] = {
+        paths[path] = {
           post: {
             tags: options2.metadata?.openapi?.tags || [
               plugin.id.charAt(0).toUpperCase() + plugin.id.slice(1)

package/dist/{chunk-IWKRGAYE.js → chunk-XE4KK72J.js}

@@ -330,7 +330,7 @@ var getMetadata = (ctx, options) => {
     issuer,
     authorization_endpoint: `${baseURL}/oauth2/authorize`,
     token_endpoint: `${baseURL}/oauth2/token`,
-    userInfo_endpoint: `${baseURL}/oauth2/userinfo`,
+    userinfo_endpoint: `${baseURL}/oauth2/userinfo`,
     jwks_uri: `${baseURL}/jwks`,
     registration_endpoint: `${baseURL}/oauth2/register`,
     scopes_supported: ["openid", "profile", "email", "offline_access"],

package/dist/client/plugins.cjs

@@ -8,6 +8,7 @@ var chunkXAK7GFTD_cjs = require('../chunk-XAK7GFTD.cjs');
 require('../chunk-U4I57HJ4.cjs');
 require('../chunk-S5UORXJH.cjs');
 require('../chunk-CCKQSGIR.cjs');
+var chunkG2LZ73E2_cjs = require('../chunk-G2LZ73E2.cjs');
 require('../chunk-VXYIYABQ.cjs');
 var chunkPEZRSDZS_cjs = require('../chunk-PEZRSDZS.cjs');
 var nanostores = require('nanostores');
@@ -235,26 +236,58 @@ var oneTapClient = (options) => {
           const { autoSelect, cancelOnTapOutside, context } = opts ?? {};
           const contextValue = context ?? options.context ?? "signin";
           await loadGoogleScript();
-          await new Promise((resolve) => {
+          await new Promise((resolve, reject) => {
+            let isResolved = false;
+            const baseDelay = options.promptOptions?.baseDelay ?? 1e3;
+            const maxAttempts = options.promptOptions?.maxAttempts ?? 5;
             window.google?.accounts.id.initialize({
               client_id: options.clientId,
               callback: async (response) => {
-                await $fetch("/one-tap/callback", {
-                  method: "POST",
-                  body: { idToken: response.credential },
-                  ...opts?.fetchOptions,
-                  ...fetchOptions
-                });
-                if (!opts?.fetchOptions && !fetchOptions || opts?.callbackURL) {
-                  window.location.href = opts?.callbackURL ?? "/";
+                isResolved = true;
+                try {
+                  await $fetch("/one-tap/callback", {
+                    method: "POST",
+                    body: { idToken: response.credential },
+                    ...opts?.fetchOptions,
+                    ...fetchOptions
+                  });
+                  if (!opts?.fetchOptions && !fetchOptions || opts?.callbackURL) {
+                    window.location.href = opts?.callbackURL ?? "/";
+                  }
+                  resolve();
+                } catch (error) {
+                  console.error("Error during One Tap callback:", error);
+                  reject(error);
                 }
-                resolve();
               },
               auto_select: autoSelect,
               cancel_on_tap_outside: cancelOnTapOutside,
-              context: contextValue
+              context: contextValue,
+              nonce: chunkG2LZ73E2_cjs.generateRandomString(16),
+              ...options.additionalOptions
             });
-            window.google?.accounts.id.prompt();
+            const handlePrompt = (attempt) => {
+              if (isResolved) return;
+              window.google?.accounts.id.prompt((notification) => {
+                if (isResolved) return;
+                if (notification.isDismissedMoment && notification.isDismissedMoment()) {
+                  if (attempt < maxAttempts) {
+                    const delay = Math.pow(2, attempt) * baseDelay;
+                    setTimeout(() => handlePrompt(attempt + 1), delay);
+                  } else {
+                    opts?.onPromptNotification?.(notification);
+                  }
+                } else if (notification.isSkippedMoment && notification.isSkippedMoment()) {
+                  if (attempt < maxAttempts) {
+                    const delay = Math.pow(2, attempt) * baseDelay;
+                    setTimeout(() => handlePrompt(attempt + 1), delay);
+                  } else {
+                    opts?.onPromptNotification?.(notification);
+                  }
+                }
+              });
+            };
+            handlePrompt(0);
           });
         } catch (error) {
           console.error("Error during Google One Tap flow:", error);

package/dist/client/plugins.d.cts

@@ -324,7 +324,7 @@ declare global {
             accounts: {
                 id: {
                     initialize: (config: any) => void;
-                    prompt: () => void;
+                    prompt: (callback?: (notification: any) => void) => void;
                 };
             };
         };
@@ -345,13 +345,51 @@ interface GoogleOneTapOptions {
      */
     cancelOnTapOutside?: boolean;
     /**
-     * Context of the Google One Tap flow
+     * The mode to use for the Google One Tap flow
+     *
+     * popup: Use a popup window
+     * redirect: Redirect the user to the Google One Tap flow
+     *
+     * @default "popup"
      */
-    context?: "signin" | "signup" | "use";
+    uxMode?: "popup" | "redirect";
+    /**
+     * The context to use for the Google One Tap flow
+     *
+     * @default "signin"
+     */
+    context?: string;
+    /**
+     * Additional configuration options to pass to the Google One Tap API.
+     */
+    additionalOptions?: Record<string, any>;
+    /**
+     * Configuration options for the prompt and exponential backoff behavior.
+     */
+    promptOptions?: {
+        /**
+         * Base delay (in milliseconds) for exponential backoff.
+         * @default 1000
+         */
+        baseDelay?: number;
+        /**
+         * Maximum number of prompt attempts before calling onPromptNotification.
+         * @default 5
+         */
+        maxAttempts?: number;
+    };
 }
-interface GoogleOneTapActionOptions extends Omit<GoogleOneTapOptions, "clientId"> {
+interface GoogleOneTapActionOptions extends Omit<GoogleOneTapOptions, "clientId" | "promptOptions"> {
     fetchOptions?: BetterFetchOption;
+    /**
+     * Callback URL.
+     */
     callbackURL?: string;
+    /**
+     * Optional callback that receives the prompt notification if (or when) the prompt is dismissed or skipped.
+     * This lets you render an alternative UI (e.g. a Google Sign-In button) to restart the process.
+     */
+    onPromptNotification?: (notification: any) => void;
 }
 declare const oneTapClient: (options: GoogleOneTapOptions) => {
     id: "one-tap";

package/dist/client/plugins.d.ts

@@ -324,7 +324,7 @@ declare global {
             accounts: {
                 id: {
                     initialize: (config: any) => void;
-                    prompt: () => void;
+                    prompt: (callback?: (notification: any) => void) => void;
                 };
             };
         };
@@ -345,13 +345,51 @@ interface GoogleOneTapOptions {
      */
     cancelOnTapOutside?: boolean;
     /**
-     * Context of the Google One Tap flow
+     * The mode to use for the Google One Tap flow
+     *
+     * popup: Use a popup window
+     * redirect: Redirect the user to the Google One Tap flow
+     *
+     * @default "popup"
      */
-    context?: "signin" | "signup" | "use";
+    uxMode?: "popup" | "redirect";
+    /**
+     * The context to use for the Google One Tap flow
+     *
+     * @default "signin"
+     */
+    context?: string;
+    /**
+     * Additional configuration options to pass to the Google One Tap API.
+     */
+    additionalOptions?: Record<string, any>;
+    /**
+     * Configuration options for the prompt and exponential backoff behavior.
+     */
+    promptOptions?: {
+        /**
+         * Base delay (in milliseconds) for exponential backoff.
+         * @default 1000
+         */
+        baseDelay?: number;
+        /**
+         * Maximum number of prompt attempts before calling onPromptNotification.
+         * @default 5
+         */
+        maxAttempts?: number;
+    };
 }
-interface GoogleOneTapActionOptions extends Omit<GoogleOneTapOptions, "clientId"> {
+interface GoogleOneTapActionOptions extends Omit<GoogleOneTapOptions, "clientId" | "promptOptions"> {
     fetchOptions?: BetterFetchOption;
+    /**
+     * Callback URL.
+     */
     callbackURL?: string;
+    /**
+     * Optional callback that receives the prompt notification if (or when) the prompt is dismissed or skipped.
+     * This lets you render an alternative UI (e.g. a Google Sign-In button) to restart the process.
+     */
+    onPromptNotification?: (notification: any) => void;
 }
 declare const oneTapClient: (options: GoogleOneTapOptions) => {
     id: "one-tap";

package/dist/client/plugins.js

@@ -6,6 +6,7 @@ import { useAuthQuery } from '../chunk-PY47VMWF.js';
 import '../chunk-HVHN3Y2L.js';
 import '../chunk-XFCIANZX.js';
 import '../chunk-3XTQSPPA.js';
+import { generateRandomString } from '../chunk-DBPOZRMS.js';
 import '../chunk-TQQSPPNA.js';
 import { BetterAuthError } from '../chunk-UNWCXKMP.js';
 import { atom } from 'nanostores';
@@ -233,26 +234,58 @@ var oneTapClient = (options) => {
           const { autoSelect, cancelOnTapOutside, context } = opts ?? {};
           const contextValue = context ?? options.context ?? "signin";
           await loadGoogleScript();
-          await new Promise((resolve) => {
+          await new Promise((resolve, reject) => {
+            let isResolved = false;
+            const baseDelay = options.promptOptions?.baseDelay ?? 1e3;
+            const maxAttempts = options.promptOptions?.maxAttempts ?? 5;
             window.google?.accounts.id.initialize({
               client_id: options.clientId,
               callback: async (response) => {
-                await $fetch("/one-tap/callback", {
-                  method: "POST",
-                  body: { idToken: response.credential },
-                  ...opts?.fetchOptions,
-                  ...fetchOptions
-                });
-                if (!opts?.fetchOptions && !fetchOptions || opts?.callbackURL) {
-                  window.location.href = opts?.callbackURL ?? "/";
+                isResolved = true;
+                try {
+                  await $fetch("/one-tap/callback", {
+                    method: "POST",
+                    body: { idToken: response.credential },
+                    ...opts?.fetchOptions,
+                    ...fetchOptions
+                  });
+                  if (!opts?.fetchOptions && !fetchOptions || opts?.callbackURL) {
+                    window.location.href = opts?.callbackURL ?? "/";
+                  }
+                  resolve();
+                } catch (error) {
+                  console.error("Error during One Tap callback:", error);
+                  reject(error);
                 }
-                resolve();
               },
               auto_select: autoSelect,
               cancel_on_tap_outside: cancelOnTapOutside,
-              context: contextValue
+              context: contextValue,
+              nonce: generateRandomString(16),
+              ...options.additionalOptions
             });
-            window.google?.accounts.id.prompt();
+            const handlePrompt = (attempt) => {
+              if (isResolved) return;
+              window.google?.accounts.id.prompt((notification) => {
+                if (isResolved) return;
+                if (notification.isDismissedMoment && notification.isDismissedMoment()) {
+                  if (attempt < maxAttempts) {
+                    const delay = Math.pow(2, attempt) * baseDelay;
+                    setTimeout(() => handlePrompt(attempt + 1), delay);
+                  } else {
+                    opts?.onPromptNotification?.(notification);
+                  }
+                } else if (notification.isSkippedMoment && notification.isSkippedMoment()) {
+                  if (attempt < maxAttempts) {
+                    const delay = Math.pow(2, attempt) * baseDelay;
+                    setTimeout(() => handlePrompt(attempt + 1), delay);
+                  } else {
+                    opts?.onPromptNotification?.(notification);
+                  }
+                }
+              });
+            };
+            handlePrompt(0);
           });
         } catch (error) {
           console.error("Error during Google One Tap flow:", error);

package/dist/index.cjs

@@ -198,7 +198,7 @@ var betterAuth = (options) => {
       }
       ctx.trustedOrigins = [
         ...options.trustedOrigins ? Array.isArray(options.trustedOrigins) ? options.trustedOrigins : options.trustedOrigins(request) : [],
-        ctx.baseURL,
+        ctx.options.baseURL,
         url.origin
       ];
       const { handler } = chunkCQNPMJJ3_cjs.router(ctx, options);

package/dist/index.js

@@ -198,7 +198,7 @@ var betterAuth = (options) => {
       }
       ctx.trustedOrigins = [
         ...options.trustedOrigins ? Array.isArray(options.trustedOrigins) ? options.trustedOrigins : options.trustedOrigins(request) : [],
-        ctx.baseURL,
+        ctx.options.baseURL,
         url.origin
       ];
       const { handler } = router(ctx, options);

package/dist/plugins/oidc-provider.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkWVSCDHH5_cjs = require('../chunk-WVSCDHH5.cjs');
+var chunkBTKNMP5Q_cjs = require('../chunk-BTKNMP5Q.cjs');
 require('../chunk-CQNPMJJ3.cjs');
 require('../chunk-NU4SXYJ5.cjs');
 require('../chunk-V6RGXSG4.cjs');
@@ -20,5 +20,5 @@ require('../chunk-PEZRSDZS.cjs');
 
 Object.defineProperty(exports, "oidcProvider", {
   enumerable: true,
-  get: function () { return chunkWVSCDHH5_cjs.oidcProvider; }
+  get: function () { return chunkBTKNMP5Q_cjs.oidcProvider; }
 });

package/dist/plugins/oidc-provider.d.cts

@@ -396,7 +396,7 @@ interface OIDCMetadata {
      *
      * @default `/oauth2/userinfo`
      */
-    userInfo_endpoint: string;
+    userinfo_endpoint: string;
     /**
      * The URL of the jwks_uri endpoint.
      *

package/dist/plugins/oidc-provider.d.ts

@@ -396,7 +396,7 @@ interface OIDCMetadata {
      *
      * @default `/oauth2/userinfo`
      */
-    userInfo_endpoint: string;
+    userinfo_endpoint: string;
     /**
      * The URL of the jwks_uri endpoint.
      *

package/dist/plugins/oidc-provider.js

@@ -1,4 +1,4 @@
-export { oidcProvider } from '../chunk-IWKRGAYE.js';
+export { oidcProvider } from '../chunk-XE4KK72J.js';
 import '../chunk-KALC2G3Y.js';
 import '../chunk-VXDYNCOX.js';
 import '../chunk-GTQM7JU7.js';

package/dist/plugins/one-tap.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkHVYF3QT2_cjs = require('../chunk-HVYF3QT2.cjs');
+var chunkQE4APVC5_cjs = require('../chunk-QE4APVC5.cjs');
 require('../chunk-CQNPMJJ3.cjs');
 require('../chunk-NU4SXYJ5.cjs');
 require('../chunk-V6RGXSG4.cjs');
@@ -20,5 +20,5 @@ require('../chunk-PEZRSDZS.cjs');
 
 Object.defineProperty(exports, "oneTap", {
   enumerable: true,
-  get: function () { return chunkHVYF3QT2_cjs.oneTap; }
+  get: function () { return chunkQE4APVC5_cjs.oneTap; }
 });

package/dist/plugins/one-tap.d.cts

@@ -8,6 +8,13 @@ interface OneTapOptions {
      * @default false
      */
     disableSignup?: boolean;
+    /**
+     * Google Client ID
+     *
+     * If a client ID is provided in the social provider configuration,
+     * it will be used.
+     */
+    clientId?: string;
 }
 declare const oneTap: (options?: OneTapOptions) => {
     id: "one-tap";

package/dist/plugins/one-tap.d.ts

@@ -8,6 +8,13 @@ interface OneTapOptions {
      * @default false
      */
     disableSignup?: boolean;
+    /**
+     * Google Client ID
+     *
+     * If a client ID is provided in the social provider configuration,
+     * it will be used.
+     */
+    clientId?: string;
 }
 declare const oneTap: (options?: OneTapOptions) => {
     id: "one-tap";

package/dist/plugins/one-tap.js

@@ -1,4 +1,4 @@
-export { oneTap } from '../chunk-7H62SU6D.js';
+export { oneTap } from '../chunk-IM6ZPUVI.js';
 import '../chunk-KALC2G3Y.js';
 import '../chunk-VXDYNCOX.js';
 import '../chunk-GTQM7JU7.js';

package/dist/plugins/open-api.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunk5N4RX2ID_cjs = require('../chunk-5N4RX2ID.cjs');
+var chunkMJZAAOE7_cjs = require('../chunk-MJZAAOE7.cjs');
 require('../chunk-CQNPMJJ3.cjs');
 require('../chunk-NU4SXYJ5.cjs');
 require('../chunk-V6RGXSG4.cjs');
@@ -22,5 +22,5 @@ require('../chunk-PEZRSDZS.cjs');
 
 Object.defineProperty(exports, "openAPI", {
   enumerable: true,
-  get: function () { return chunk5N4RX2ID_cjs.openAPI; }
+  get: function () { return chunkMJZAAOE7_cjs.openAPI; }
 });

package/dist/plugins/open-api.js

@@ -1,4 +1,4 @@
-export { openAPI } from '../chunk-K7BZ36L5.js';
+export { openAPI } from '../chunk-VMQM7XMT.js';
 import '../chunk-KALC2G3Y.js';
 import '../chunk-VXDYNCOX.js';
 import '../chunk-GTQM7JU7.js';

package/dist/plugins.cjs

@@ -7,10 +7,10 @@ require('./chunk-ZBKCS3KP.cjs');
 var chunkSDEOOYUI_cjs = require('./chunk-SDEOOYUI.cjs');
 var chunkVR4QGIHG_cjs = require('./chunk-VR4QGIHG.cjs');
 var chunkXAF4TPVN_cjs = require('./chunk-XAF4TPVN.cjs');
-var chunkHVYF3QT2_cjs = require('./chunk-HVYF3QT2.cjs');
-var chunk5N4RX2ID_cjs = require('./chunk-5N4RX2ID.cjs');
+var chunkQE4APVC5_cjs = require('./chunk-QE4APVC5.cjs');
+var chunkMJZAAOE7_cjs = require('./chunk-MJZAAOE7.cjs');
 var chunk5JET74FS_cjs = require('./chunk-5JET74FS.cjs');
-var chunkWVSCDHH5_cjs = require('./chunk-WVSCDHH5.cjs');
+var chunkBTKNMP5Q_cjs = require('./chunk-BTKNMP5Q.cjs');
 var chunkW2IU5LNT_cjs = require('./chunk-W2IU5LNT.cjs');
 var chunkUWA64YHN_cjs = require('./chunk-UWA64YHN.cjs');
 var chunkEIDQBPY6_cjs = require('./chunk-EIDQBPY6.cjs');
@@ -201,11 +201,11 @@ Object.defineProperty(exports, "multiSession", {
 });
 Object.defineProperty(exports, "oneTap", {
   enumerable: true,
-  get: function () { return chunkHVYF3QT2_cjs.oneTap; }
+  get: function () { return chunkQE4APVC5_cjs.oneTap; }
 });
 Object.defineProperty(exports, "openAPI", {
   enumerable: true,
-  get: function () { return chunk5N4RX2ID_cjs.openAPI; }
+  get: function () { return chunkMJZAAOE7_cjs.openAPI; }
 });
 Object.defineProperty(exports, "organization", {
   enumerable: true,
@@ -213,7 +213,7 @@ Object.defineProperty(exports, "organization", {
 });
 Object.defineProperty(exports, "oidcProvider", {
   enumerable: true,
-  get: function () { return chunkWVSCDHH5_cjs.oidcProvider; }
+  get: function () { return chunkBTKNMP5Q_cjs.oidcProvider; }
 });
 Object.defineProperty(exports, "admin", {
   enumerable: true,

package/dist/plugins.js

@@ -5,10 +5,10 @@ import './chunk-WMXBA6LX.js';
 export { jwt } from './chunk-5D5P7O3K.js';
 export { magicLink } from './chunk-QG36GJF4.js';
 export { multiSession } from './chunk-S7V7XM55.js';
-export { oneTap } from './chunk-7H62SU6D.js';
-export { openAPI } from './chunk-K7BZ36L5.js';
+export { oneTap } from './chunk-IM6ZPUVI.js';
+export { openAPI } from './chunk-VMQM7XMT.js';
 export { organization } from './chunk-KFSLYLGZ.js';
-export { oidcProvider } from './chunk-IWKRGAYE.js';
+export { oidcProvider } from './chunk-XE4KK72J.js';
 export { admin } from './chunk-RPETDYVK.js';
 export { anonymous } from './chunk-OEZ6U6NM.js';
 export { bearer } from './chunk-DOEW523N.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth",
-  "version": "1.1.18",
+  "version": "1.1.19-beta.2",
   "description": "The most comprehensive authentication library for TypeScript.",
   "type": "module",
   "repository": {