@convex-dev/better-auth 0.7.0-alpha.4 → 0.7.0-alpha.6

package/dist/commonjs/react-start/index.d.ts

@@ -1,10 +1,14 @@
 import { betterAuth } from "better-auth";
 import { GenericActionCtx } from "convex/server";
 export declare const getCookieName: (createAuth: (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>) => Promise<string>;
-export declare const fetchSession: <T extends (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>>(createAuth: T, request?: Request) => Promise<{
+export declare const fetchSession: <T extends (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>>(request: Request, opts?: {
+    convexSiteUrl: string;
+    verbose?: boolean;
+}) => Promise<{
     session: ReturnType<T>["$Infer"]["Session"] | null;
 }>;
-export declare const reactStartHandler: (request: Request, opts: {
+export declare const reactStartHandler: (request: Request, opts?: {
     convexSiteUrl: string;
+    verbose?: boolean;
 }) => Promise<Response>;
 //# sourceMappingURL=index.d.ts.map

package/dist/commonjs/react-start/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAejD,eAAO,MAAM,aAAa,GACxB,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,oBAS1E,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,CAAC,SAAS,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,EAEvE,YAAY,CAAC,EACb,UAAU,OAAO;;EAmBlB,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,OAAO,EAChB,MAAM;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,sBAMhC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,eAAO,MAAM,aAAa,GACxB,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,oBAM1E,CAAC;AAiBF,eAAO,MAAM,YAAY,GACvB,CAAC,SAAS,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,EAEvE,SAAS,OAAO,EAChB,OAAO;IACL,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;;EAmBF,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,OAAO,EAChB,OAAO;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,sBAUpD,CAAC"}

package/dist/commonjs/react-start/index.js

@@ -1,28 +1,28 @@
 import { createCookieGetter } from "better-auth/cookies";
 import { betterFetch } from "@better-fetch/fetch";
 import { JWT_COOKIE_NAME } from "../plugins/convex";
-const requireBaseURL = (createAuth) => {
-    const baseUrl = createAuth({}).options.baseURL;
-    if (!baseUrl) {
-        throw new Error("No baseURL found in Better Auth config. baseUrl should be set to your Convex Site URL.");
-    }
-    return baseUrl;
-};
 export const getCookieName = async (createAuth) => {
-    // Require baseURL here because it's protocol determines cookie secure mode,
-    // and must be set to ensure cookies work between TanStack and Convex.
-    requireBaseURL(createAuth);
     const auth = createAuth({});
     const createCookie = createCookieGetter(auth.options);
     const cookie = createCookie(JWT_COOKIE_NAME);
     return cookie.name;
 };
-export const fetchSession = async (createAuth, request) => {
+const requireConvexSiteUrl = (opts) => {
+    const baseURL = opts?.convexSiteUrl ?? import.meta.env.VITE_CONVEX_SITE_URL;
+    if (!baseURL) {
+        throw new Error("VITE_CONVEX_SITE_URL is not set");
+    }
+    if (opts?.verbose) {
+        console.log(`${opts.calledFrom} convexSiteUrl`, baseURL);
+    }
+    return baseURL;
+};
+export const fetchSession = async (request, opts) => {
     if (!request) {
         throw new Error("No request found");
     }
     const { data: session } = await betterFetch("/api/auth/get-session", {
-        baseURL: requireBaseURL(createAuth),
+        baseURL: requireConvexSiteUrl({ ...opts, calledFrom: "fetchSession" }),
         headers: {
             cookie: request.headers.get("cookie") ?? "",
         },
@@ -33,7 +33,11 @@ export const fetchSession = async (createAuth, request) => {
 };
 export const reactStartHandler = (request, opts) => {
     const requestUrl = new URL(request.url);
-    const nextUrl = `${opts.convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
+    const convexSiteUrl = requireConvexSiteUrl({
+        ...opts,
+        calledFrom: "reactStartHandler",
+    });
+    const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
     request.headers.set("accept-encoding", "application/json");
     return fetch(nextUrl, new Request(request, { redirect: "manual" }));
 };

package/dist/commonjs/react-start/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,cAAc,GAAG,CACrB,UAAyE,EACzE,EAAE;IACF,MAAM,OAAO,GAAG,UAAU,CAAC,EAAS,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;IACtD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,wFAAwF,CACzF,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,UAAyE,EACzE,EAAE;IACF,4EAA4E;IAC5E,sEAAsE;IACtE,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3B,MAAM,IAAI,GAAG,UAAU,CAAC,EAAS,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAG/B,UAAa,EACb,OAAiB,EACjB,EAAE;IAGF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,WAAW,CACzC,uBAAuB,EACvB;QACE,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC;QACnC,OAAO,EAAE;YACP,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE;SAC5C;KACF,CACF,CAAC;IACF,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,OAAgB,EAChB,IAA+B,EAC/B,EAAE;IACF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;IAClF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;IAC3D,OAAO,KAAK,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,UAAyE,EACzE,EAAE;IACF,MAAM,IAAI,GAAG,UAAU,CAAC,EAAS,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,IAI7B,EAAE,EAAE;IACH,MAAM,OAAO,GAAG,IAAI,EAAE,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC;IAC5E,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,IAAI,EAAE,OAAO,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAG/B,OAAgB,EAChB,IAGC,EACD,EAAE;IAGF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,WAAW,CACzC,uBAAuB,EACvB;QACE,OAAO,EAAE,oBAAoB,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;QACtE,OAAO,EAAE;YACP,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE;SAC5C;KACF,CACF,CAAC;IACF,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,OAAgB,EAChB,IAAmD,EACnD,EAAE;IACF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,aAAa,GAAG,oBAAoB,CAAC;QACzC,GAAG,IAAI;QACP,UAAU,EAAE,mBAAmB;KAChC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,GAAG,aAAa,GAAG,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;IAC7E,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;IAC3D,OAAO,KAAK,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}

package/dist/esm/react-start/index.d.ts

@@ -1,10 +1,14 @@
 import { betterAuth } from "better-auth";
 import { GenericActionCtx } from "convex/server";
 export declare const getCookieName: (createAuth: (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>) => Promise<string>;
-export declare const fetchSession: <T extends (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>>(createAuth: T, request?: Request) => Promise<{
+export declare const fetchSession: <T extends (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>>(request: Request, opts?: {
+    convexSiteUrl: string;
+    verbose?: boolean;
+}) => Promise<{
     session: ReturnType<T>["$Infer"]["Session"] | null;
 }>;
-export declare const reactStartHandler: (request: Request, opts: {
+export declare const reactStartHandler: (request: Request, opts?: {
     convexSiteUrl: string;
+    verbose?: boolean;
 }) => Promise<Response>;
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/react-start/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAejD,eAAO,MAAM,aAAa,GACxB,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,oBAS1E,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,CAAC,SAAS,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,EAEvE,YAAY,CAAC,EACb,UAAU,OAAO;;EAmBlB,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,OAAO,EAChB,MAAM;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,sBAMhC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,eAAO,MAAM,aAAa,GACxB,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,oBAM1E,CAAC;AAiBF,eAAO,MAAM,YAAY,GACvB,CAAC,SAAS,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,EAEvE,SAAS,OAAO,EAChB,OAAO;IACL,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;;EAmBF,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,OAAO,EAChB,OAAO;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,sBAUpD,CAAC"}

package/dist/esm/react-start/index.js

@@ -1,28 +1,28 @@
 import { createCookieGetter } from "better-auth/cookies";
 import { betterFetch } from "@better-fetch/fetch";
 import { JWT_COOKIE_NAME } from "../plugins/convex/index.js";
-const requireBaseURL = (createAuth) => {
-    const baseUrl = createAuth({}).options.baseURL;
-    if (!baseUrl) {
-        throw new Error("No baseURL found in Better Auth config. baseUrl should be set to your Convex Site URL.");
-    }
-    return baseUrl;
-};
 export const getCookieName = async (createAuth) => {
-    // Require baseURL here because it's protocol determines cookie secure mode,
-    // and must be set to ensure cookies work between TanStack and Convex.
-    requireBaseURL(createAuth);
     const auth = createAuth({});
     const createCookie = createCookieGetter(auth.options);
     const cookie = createCookie(JWT_COOKIE_NAME);
     return cookie.name;
 };
-export const fetchSession = async (createAuth, request) => {
+const requireConvexSiteUrl = (opts) => {
+    const baseURL = opts?.convexSiteUrl ?? import.meta.env.VITE_CONVEX_SITE_URL;
+    if (!baseURL) {
+        throw new Error("VITE_CONVEX_SITE_URL is not set");
+    }
+    if (opts?.verbose) {
+        console.log(`${opts.calledFrom} convexSiteUrl`, baseURL);
+    }
+    return baseURL;
+};
+export const fetchSession = async (request, opts) => {
     if (!request) {
         throw new Error("No request found");
     }
     const { data: session } = await betterFetch("/api/auth/get-session", {
-        baseURL: requireBaseURL(createAuth),
+        baseURL: requireConvexSiteUrl({ ...opts, calledFrom: "fetchSession" }),
         headers: {
             cookie: request.headers.get("cookie") ?? "",
         },
@@ -33,7 +33,11 @@ export const fetchSession = async (createAuth, request) => {
 };
 export const reactStartHandler = (request, opts) => {
     const requestUrl = new URL(request.url);
-    const nextUrl = `${opts.convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
+    const convexSiteUrl = requireConvexSiteUrl({
+        ...opts,
+        calledFrom: "reactStartHandler",
+    });
+    const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
     request.headers.set("accept-encoding", "application/json");
     return fetch(nextUrl, new Request(request, { redirect: "manual" }));
 };

package/dist/esm/react-start/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,cAAc,GAAG,CACrB,UAAyE,EACzE,EAAE;IACF,MAAM,OAAO,GAAG,UAAU,CAAC,EAAS,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;IACtD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,wFAAwF,CACzF,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,UAAyE,EACzE,EAAE;IACF,4EAA4E;IAC5E,sEAAsE;IACtE,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3B,MAAM,IAAI,GAAG,UAAU,CAAC,EAAS,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAG/B,UAAa,EACb,OAAiB,EACjB,EAAE;IAGF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,WAAW,CACzC,uBAAuB,EACvB;QACE,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC;QACnC,OAAO,EAAE;YACP,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE;SAC5C;KACF,CACF,CAAC;IACF,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,OAAgB,EAChB,IAA+B,EAC/B,EAAE;IACF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;IAClF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;IAC3D,OAAO,KAAK,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,UAAyE,EACzE,EAAE;IACF,MAAM,IAAI,GAAG,UAAU,CAAC,EAAS,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,IAI7B,EAAE,EAAE;IACH,MAAM,OAAO,GAAG,IAAI,EAAE,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC;IAC5E,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,IAAI,EAAE,OAAO,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAG/B,OAAgB,EAChB,IAGC,EACD,EAAE;IAGF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,WAAW,CACzC,uBAAuB,EACvB;QACE,OAAO,EAAE,oBAAoB,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;QACtE,OAAO,EAAE;YACP,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE;SAC5C;KACF,CACF,CAAC;IACF,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,OAAgB,EAChB,IAAmD,EACnD,EAAE;IACF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,aAAa,GAAG,oBAAoB,CAAC;QACzC,GAAG,IAAI;QACP,UAAU,EAAE,mBAAmB;KAChC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,GAAG,aAAa,GAAG,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;IAC7E,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;IAC3D,OAAO,KAAK,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}

package/package.json

@@ -6,7 +6,7 @@
   "bugs": {
     "url": "https://github.com/get-convex/better-auth/issues"
   },
-  "version": "0.7.0-alpha.4",
+  "version": "0.7.0-alpha.6",
   "license": "Apache-2.0",
   "keywords": [
     "convex",

package/src/react-start/index.ts

@@ -4,35 +4,38 @@ import { betterFetch } from "@better-fetch/fetch";
 import { GenericActionCtx } from "convex/server";
 import { JWT_COOKIE_NAME } from "../plugins/convex";
 
-const requireBaseURL = (
-  createAuth: (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>
-) => {
-  const baseUrl = createAuth({} as any).options.baseURL;
-  if (!baseUrl) {
-    throw new Error(
-      "No baseURL found in Better Auth config. baseUrl should be set to your Convex Site URL."
-    );
-  }
-  return baseUrl;
-};
-
 export const getCookieName = async (
   createAuth: (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>
 ) => {
-  // Require baseURL here because it's protocol determines cookie secure mode,
-  // and must be set to ensure cookies work between TanStack and Convex.
-  requireBaseURL(createAuth);
   const auth = createAuth({} as any);
   const createCookie = createCookieGetter(auth.options);
   const cookie = createCookie(JWT_COOKIE_NAME);
   return cookie.name;
 };
 
+const requireConvexSiteUrl = (opts?: {
+  calledFrom: string;
+  convexSiteUrl?: string;
+  verbose?: boolean;
+}) => {
+  const baseURL = opts?.convexSiteUrl ?? import.meta.env.VITE_CONVEX_SITE_URL;
+  if (!baseURL) {
+    throw new Error("VITE_CONVEX_SITE_URL is not set");
+  }
+  if (opts?.verbose) {
+    console.log(`${opts.calledFrom} convexSiteUrl`, baseURL);
+  }
+  return baseURL;
+};
+
 export const fetchSession = async <
   T extends (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>,
 >(
-  createAuth: T,
-  request?: Request
+  request: Request,
+  opts?: {
+    convexSiteUrl: string;
+    verbose?: boolean;
+  }
 ) => {
   type Session = ReturnType<T>["$Infer"]["Session"];
 
@@ -42,7 +45,7 @@ export const fetchSession = async <
   const { data: session } = await betterFetch<Session>(
     "/api/auth/get-session",
     {
-      baseURL: requireBaseURL(createAuth),
+      baseURL: requireConvexSiteUrl({ ...opts, calledFrom: "fetchSession" }),
       headers: {
         cookie: request.headers.get("cookie") ?? "",
       },
@@ -55,10 +58,14 @@ export const fetchSession = async <
 
 export const reactStartHandler = (
   request: Request,
-  opts: { convexSiteUrl: string }
+  opts?: { convexSiteUrl: string; verbose?: boolean }
 ) => {
   const requestUrl = new URL(request.url);
-  const nextUrl = `${opts.convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
+  const convexSiteUrl = requireConvexSiteUrl({
+    ...opts,
+    calledFrom: "reactStartHandler",
+  });
+  const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
   request.headers.set("accept-encoding", "application/json");
   return fetch(nextUrl, new Request(request, { redirect: "manual" }));
 };

package/src/react-start/vite-env.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="vite/client" />
+/// <reference types="vite/types/importMeta.d.ts" />