@convex-dev/better-auth 0.12.0 → 0.12.2

package/src/plugins/cross-domain/client.test.ts

@@ -191,13 +191,10 @@ describe("crossDomainClient", () => {
   });
 
   describe("onSuccess handler", () => {
-    it("clears cookies when get-session returns null", async () => {
-      storage.set(
-        cookieName,
-        JSON.stringify({
-          "better-auth.session_token": { value: "stale", expires: null },
-        })
-      );
+    it("clears session cookies when get-session returns null", async () => {
+      storage.set(cookieName, JSON.stringify({
+        "better-auth.session_token": { value: "stale", expires: null },
+      }));
 
       const onSuccess = getOnSuccessHook();
       await onSuccess({
@@ -209,6 +206,28 @@ describe("crossDomainClient", () => {
       expect(storage.get(cookieName)).toBe("{}");
     });
 
+    it("preserves two_factor cookie when get-session returns null", async () => {
+      storage.set(cookieName, JSON.stringify({
+        "better-auth.session_token": { value: "stale", expires: null },
+        "better-auth.session_data": { value: "data", expires: null },
+        "better-auth.convex_jwt": { value: "jwt", expires: null },
+        "better-auth.two_factor": { value: "2fa-challenge-token", expires: null },
+      }));
+
+      const onSuccess = getOnSuccessHook();
+      await onSuccess({
+        data: null,
+        request: { url: new URL("https://example.com/api/auth/get-session") },
+        response: { headers: new Headers() },
+      } as any);
+
+      const result = JSON.parse(storage.get(cookieName)!);
+      expect(result["better-auth.two_factor"]).toEqual({ value: "2fa-challenge-token", expires: null });
+      expect(result["better-auth.session_token"]).toBeUndefined();
+      expect(result["better-auth.session_data"]).toBeUndefined();
+      expect(result["better-auth.convex_jwt"]).toBeUndefined();
+    });
+
     it("preserves cookies when get-session returns data", async () => {
       const existingCookies = JSON.stringify({
         "better-auth.session_token": { value: "valid", expires: null },

package/src/plugins/cross-domain/client.ts

@@ -47,7 +47,9 @@ export function getCookie(cookie: string) {
     // noop
   }
   return Object.entries(parsed)
-    .filter(([, value]) => !value.expires || new Date(value.expires) >= new Date())
+    .filter(
+      ([, value]) => !value.expires || new Date(value.expires) >= new Date()
+    )
     .map(([key, value]) => `${key}=${value.value}`)
     .join("; ");
 }
@@ -185,7 +187,31 @@ export const crossDomainClient = (
               const data = context.data;
               storage.setItem(localCacheName, JSON.stringify(data));
               if (data === null) {
-                storage.setItem(cookieName, "{}");
+                // Preserve non-session cookies (e.g. two_factor) when
+                // get-session returns null during 2FA pending state.
+                // Previously this unconditionally set cookieName to "{}",
+                // which wiped the two_factor challenge token needed for
+                // verifyTotp in cross-domain setups.
+                const prev = storage.getItem(cookieName);
+                try {
+                  const parsed = JSON.parse(prev || "{}") as Record<
+                    string,
+                    unknown
+                  >;
+                  const preserved: Record<string, unknown> = {};
+                  for (const [key, val] of Object.entries(parsed)) {
+                    if (
+                      !key.includes("session_token") &&
+                      !key.includes("session_data") &&
+                      !key.includes("convex_jwt")
+                    ) {
+                      preserved[key] = val;
+                    }
+                  }
+                  storage.setItem(cookieName, JSON.stringify(preserved));
+                } catch {
+                  storage.setItem(cookieName, "{}");
+                }
               }
             }
           },

package/src/react-start/index.test.ts

@@ -0,0 +1,91 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { convexBetterAuthReactStart } from "./index.js";
+
+const SITE_URL = "https://test.convex.site";
+const CONVEX_URL = "https://test.convex.cloud";
+
+const setup = () => {
+  const { handler } = convexBetterAuthReactStart({
+    convexUrl: CONVEX_URL,
+    convexSiteUrl: SITE_URL,
+  });
+  const fetchSpy = vi
+    .spyOn(globalThis, "fetch")
+    .mockResolvedValue(new Response());
+  return { handler, fetchSpy };
+};
+
+const initOf = (
+  spy: ReturnType<typeof vi.spyOn>
+): RequestInit & { duplex?: string } =>
+  (spy.mock.calls[0]?.[1] as RequestInit & { duplex?: string }) ?? {};
+
+const headersOf = (spy: ReturnType<typeof vi.spyOn>): Headers =>
+  new Headers(initOf(spy).headers);
+
+describe("convexBetterAuthReactStart handler", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it("strips hop-by-hop headers from the forwarded request", async () => {
+    const { handler, fetchSpy } = setup();
+    const request = new Request(
+      "https://app.example.com/api/auth/sign-in/email",
+      {
+        method: "POST",
+        headers: {
+          "transfer-encoding": "chunked",
+          "content-length": "42",
+          connection: "keep-alive",
+          "content-type": "application/json",
+        },
+        body: JSON.stringify({ email: "test@example.com" }),
+      }
+    );
+    await handler(request);
+    const headers = headersOf(fetchSpy);
+    expect(headers.get("transfer-encoding")).toBeNull();
+    expect(headers.get("content-length")).toBeNull();
+    expect(headers.get("connection")).toBeNull();
+  });
+
+  it("forwards to upstream URL preserving path and query", async () => {
+    const { handler, fetchSpy } = setup();
+    const request = new Request(
+      "https://app.example.com/api/auth/sign-in/email?foo=bar",
+      { method: "POST", body: "{}" }
+    );
+    await handler(request);
+    expect(fetchSpy.mock.calls[0]?.[0]).toBe(
+      `${SITE_URL}/api/auth/sign-in/email?foo=bar`
+    );
+  });
+
+  it("sets host and forwarding headers", async () => {
+    const { handler, fetchSpy } = setup();
+    const request = new Request(
+      "https://app.example.com/api/auth/sign-in/email",
+      { method: "POST", body: "{}" }
+    );
+    await handler(request);
+    const headers = headersOf(fetchSpy);
+    expect(headers.get("host")).toBe(new URL(SITE_URL).host);
+    expect(headers.get("x-forwarded-host")).toBe("app.example.com");
+    expect(headers.get("x-forwarded-proto")).toBe("https");
+    expect(headers.get("x-better-auth-forwarded-host")).toBe("app.example.com");
+    expect(headers.get("x-better-auth-forwarded-proto")).toBe("https");
+  });
+
+  it("streams the request body with duplex: half", async () => {
+    const { handler, fetchSpy } = setup();
+    const request = new Request(
+      "https://app.example.com/api/auth/sign-in/email",
+      { method: "POST", body: JSON.stringify({ email: "test@example.com" }) }
+    );
+    await handler(request);
+    const init = initOf(fetchSpy);
+    expect(init.duplex).toBe("half");
+    expect(init.body).toBeDefined();
+  });
+});

package/src/react-start/index.ts

@@ -63,6 +63,11 @@ const handler = (request: Request, opts: { convexSiteUrl: string }) => {
   const requestUrl = new URL(request.url);
   const nextUrl = `${opts.convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
   const headers = new Headers(request.headers);
+  // Strip hop-by-hop headers inherited from the incoming request; undici
+  // rejects an outbound `transfer-encoding: chunked` header value.
+  headers.delete("transfer-encoding");
+  headers.delete("content-length");
+  headers.delete("connection");
   headers.set("accept-encoding", "application/json");
   headers.set("host", new URL(opts.convexSiteUrl).host);
   headers.set("x-forwarded-host", requestUrl.host);

package/src/utils/index.ts

@@ -137,6 +137,7 @@ export const getToken = async (
   headers: Headers,
   opts?: GetTokenOptions
 ) => {
+  headers.set("host", new URL(siteUrl).host)
   const fetchToken = async () => {
     const basePath = opts?.basePath
       ? (opts.basePath.startsWith("/") ? opts.basePath : `/${opts.basePath}`)

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = "0.12.0";
+export const VERSION = "0.12.2";

package/dist/component/adapterTest.d.ts

@@ -1,3 +0,0 @@
-import type { EmptyObject } from "convex-helpers";
-export declare const runTests: import("convex/server").RegisteredAction<"public", EmptyObject, Promise<void>>;
-//# sourceMappingURL=adapterTest.d.ts.map

package/dist/component/adapterTest.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"adapterTest.d.ts","sourceRoot":"","sources":["../../src/component/adapterTest.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAyGlD,eAAO,MAAM,QAAQ,gFAoKpB,CAAC"}

package/dist/component/adapterTest.js

@@ -1,202 +0,0 @@
-import { createClient } from "../client/index.js";
-import { internal } from "./_generated/api.js";
-import { action } from "./_generated/server.js";
-// Tests need to run inside of a Convex function to use the Convex adapter.
-// Test dependencies are dynamically imported to keep them out of the
-// production bundle. convex-test runs in the vitest process, so vitest
-// globals are available through dynamic imports.
-const NORMAL_DISABLED_TESTS = [
-    // dynamic-schema-plugin-table/dynamic-schema-additional-fields:
-    // Convex validators are static in this harness, so runtime schema mutation
-    // tests are validated in dedicated profiles instead.
-    "create - should apply default values to fields",
-    "create - should return null for nullable foreign keys",
-    "create - should support arrays",
-    "create - should support json",
-    // convex-id-generation:
-    // Convex controls generated IDs at write time.
-    "create - should use generateId if provided",
-    // offset-unsupported:
-    // Convex adapter rejects offset pagination.
-    "findMany - should be able to perform a complex limited join",
-    "findMany - should find many models with limit and offset",
-    "findMany - should find many models with offset",
-    "findMany - should find many models with sortBy and limit and offset",
-    "findMany - should find many models with sortBy and limit and offset and where",
-    "findMany - should find many models with sortBy and offset",
-    "findMany - should find many with both one-to-one and one-to-many joins",
-    "findMany - should find many with join and offset",
-    "findMany - should find many with join, where, limit, and offset",
-    "findMany - should find many with one-to-one join",
-    "findMany - should handle mixed joins correctly when some are missing",
-    "findMany - should return empty array when base records don't exist with joins",
-    "findMany - should return null for one-to-one join when joined records don't exist",
-    "findMany - should select fields with one-to-one join",
-    // profile-specific coverage:
-    // These are intentionally exercised in dedicated profile suites.
-    "findOne - backwards join with modified field name (session base, users-table join)",
-    "findOne - multiple joins should return result even when some joined tables have no matching rows",
-    "findOne - should find a model with modified field name",
-    "findOne - should find a model with modified model name",
-    "findOne - should join a model with modified field name",
-    "findOne - should not apply defaultValue if value not found",
-    "findOne - should return an object for one-to-one joins",
-    "findOne - should return null for failed base model lookup that has joins",
-    "findOne - should return null for one-to-one join when joined record doesn't exist",
-    "findOne - should select fields with one-to-one join",
-    "findOne - should work with both one-to-one and one-to-many joins",
-];
-const toDisableMap = (testNames) => Object.fromEntries(testNames.map((testName) => [testName, true]));
-const toEnableOnlyMap = (testNames) => ({
-    ALL: true,
-    ...Object.fromEntries(testNames.map((testName) => [testName, false])),
-});
-const UUID_SUITE_TESTS = ["init - tests"];
-const getOverrideBetterAuthOptions = (opts) => ({
-    ...opts,
-    advanced: {
-        ...opts.advanced,
-        database: {
-            ...opts.advanced?.database,
-            generateId: "uuid",
-        },
-    },
-});
-const internalWithTestProfiles = internal;
-const baseProfileApi = {
-    adapter: internalWithTestProfiles.adapter,
-    adapterTest: internalWithTestProfiles.adapterTest,
-};
-const profileApi = (name) => {
-    return { adapter: internalWithTestProfiles.testProfiles[name] };
-};
-const additionalFieldsProfileApi = profileApi("adapterAdditionalFields");
-const pluginTableProfileApi = profileApi("adapterPluginTable");
-const renameFieldProfileApi = profileApi("adapterRenameField");
-const renameUserCustomProfileApi = profileApi("adapterRenameUserCustom");
-const renameUserTableProfileApi = profileApi("adapterRenameUserTable");
-const organizationJoinsProfileApi = profileApi("adapterOrganizationJoins");
-export const runTests = action(async (ctx, _args) => {
-    const testUtilsImport = "@better-auth/test-utils/adapter";
-    const { testAdapter, transactionsTestSuite, uuidTestSuite } = await import(testUtilsImport);
-    const adapterFactoryImport = "../test/adapter-factory/index.js";
-    const { coreNormalTestSuite, coreAuthFlowTestSuite, additionalFieldsNormalTestSuite, additionalFieldsAuthFlowTestSuite, pluginTableNormalTestSuite, renameFieldAndJoinTestSuite, renameModelUserCustomTestSuite, renameModelUserTableTestSuite, multiJoinsMissingRowsTestSuite, convexCustomTestSuite, } = await import(adapterFactoryImport);
-    const baseProfileClient = createClient(baseProfileApi, {
-        verbose: false,
-    });
-    const additionalFieldsProfileClient = createClient(additionalFieldsProfileApi, {
-        verbose: false,
-    });
-    const pluginTableProfileClient = createClient(pluginTableProfileApi, {
-        verbose: false,
-    });
-    const renameFieldProfileClient = createClient(renameFieldProfileApi, {
-        verbose: false,
-    });
-    const renameUserCustomProfileClient = createClient(renameUserCustomProfileApi, {
-        verbose: false,
-    });
-    const renameUserTableProfileClient = createClient(renameUserTableProfileApi, {
-        verbose: false,
-    });
-    const organizationJoinsProfileClient = createClient(organizationJoinsProfileApi, {
-        verbose: false,
-    });
-    const { execute: executeBaseProfile } = await testAdapter({
-        adapter: () => {
-            return baseProfileClient.adapter(ctx);
-        },
-        runMigrations: () => {
-            // Convex schema is static — no migrations needed.
-        },
-        overrideBetterAuthOptions: getOverrideBetterAuthOptions,
-        tests: [
-            coreNormalTestSuite({
-                disableTests: toDisableMap(NORMAL_DISABLED_TESTS),
-            }),
-            uuidTestSuite({
-                disableTests: toEnableOnlyMap(UUID_SUITE_TESTS),
-            }),
-            transactionsTestSuite({ disableTests: { ALL: true } }),
-            coreAuthFlowTestSuite(),
-            convexCustomTestSuite(),
-        ],
-    });
-    const { execute: executeAdditionalFieldsProfile } = await testAdapter({
-        adapter: () => {
-            return additionalFieldsProfileClient.adapter(ctx);
-        },
-        runMigrations: () => {
-            // Convex schema is static — no migrations needed.
-        },
-        overrideBetterAuthOptions: getOverrideBetterAuthOptions,
-        prefixTests: "profile:additional-fields",
-        tests: [
-            additionalFieldsNormalTestSuite(),
-            additionalFieldsAuthFlowTestSuite(),
-        ],
-    });
-    const { execute: executePluginTableProfile } = await testAdapter({
-        adapter: () => {
-            return pluginTableProfileClient.adapter(ctx);
-        },
-        runMigrations: () => {
-            // Convex schema is static — no migrations needed.
-        },
-        overrideBetterAuthOptions: getOverrideBetterAuthOptions,
-        prefixTests: "profile:plugin-table",
-        tests: [pluginTableNormalTestSuite()],
-    });
-    const { execute: executeRenameFieldProfile } = await testAdapter({
-        adapter: () => {
-            return renameFieldProfileClient.adapter(ctx);
-        },
-        runMigrations: () => {
-            // Convex schema is static — no migrations needed.
-        },
-        overrideBetterAuthOptions: getOverrideBetterAuthOptions,
-        prefixTests: "profile:rename-field-join",
-        tests: [renameFieldAndJoinTestSuite()],
-    });
-    const { execute: executeRenameUserCustomProfile } = await testAdapter({
-        adapter: () => {
-            return renameUserCustomProfileClient.adapter(ctx);
-        },
-        runMigrations: () => {
-            // Convex schema is static — no migrations needed.
-        },
-        overrideBetterAuthOptions: getOverrideBetterAuthOptions,
-        prefixTests: "profile:rename-user-custom",
-        tests: [renameModelUserCustomTestSuite()],
-    });
-    const { execute: executeRenameUserTableProfile } = await testAdapter({
-        adapter: () => {
-            return renameUserTableProfileClient.adapter(ctx);
-        },
-        runMigrations: () => {
-            // Convex schema is static — no migrations needed.
-        },
-        overrideBetterAuthOptions: getOverrideBetterAuthOptions,
-        prefixTests: "profile:rename-user-table",
-        tests: [renameModelUserTableTestSuite()],
-    });
-    const { execute: executeOrganizationJoinsProfile } = await testAdapter({
-        adapter: () => {
-            return organizationJoinsProfileClient.adapter(ctx);
-        },
-        runMigrations: () => {
-            // Convex schema is static — no migrations needed.
-        },
-        overrideBetterAuthOptions: getOverrideBetterAuthOptions,
-        prefixTests: "profile:organization-joins",
-        tests: [multiJoinsMissingRowsTestSuite()],
-    });
-    await executeBaseProfile();
-    await executeAdditionalFieldsProfile();
-    await executePluginTableProfile();
-    await executeRenameFieldProfile();
-    await executeRenameUserCustomProfile();
-    await executeRenameUserTableProfile();
-    await executeOrganizationJoinsProfile();
-});
-//# sourceMappingURL=adapterTest.js.map

package/dist/component/adapterTest.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adapterTest.js","sourceRoot":"","sources":["../../src/component/adapterTest.ts"],"names":[],"mappings":"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"}