Merge pull request #2936 from Lempkey/fix/express5-auth-wildcard-syntax

fix: use Express 5 wildcard syntax for better-auth handler route
This commit is contained in:
Dotta 2026-04-07 16:55:55 -05:00 committed by GitHub
commit 93c7493054
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 57 additions and 1 deletions

View file

@ -0,0 +1,56 @@
import express from "express";
import request from "supertest";
import { describe, expect, it, vi } from "vitest";
/**
* Regression test for https://github.com/paperclipai/paperclip/issues/2898
*
* Express 5 (path-to-regexp v8+) dropped support for the `*paramName`
* wildcard syntax used in Express 4. Routes declared with the old syntax
* silently fail to match, causing every `/api/auth/*` request to fall
* through and return 404.
*
* The correct Express 5 syntax for a named catch-all is `{*paramName}`.
* These tests verify that the better-auth handler is invoked for both
* shallow and deep auth sub-paths.
*/
describe("Express 5 /api/auth wildcard route", () => {
function buildApp() {
const app = express();
const handler = vi.fn((_req: express.Request, res: express.Response) => {
res.status(200).json({ ok: true });
});
app.all("/api/auth/{*authPath}", handler);
return { app, handler };
}
it("matches a shallow auth sub-path (sign-in/email)", async () => {
const { app } = buildApp();
const res = await request(app).post("/api/auth/sign-in/email");
expect(res.status).toBe(200);
});
it("matches a deep auth sub-path (callback/credentials/sign-in)", async () => {
const { app } = buildApp();
const res = await request(app).get(
"/api/auth/callback/credentials/sign-in"
);
expect(res.status).toBe(200);
});
it("does not match unrelated paths outside /api/auth", async () => {
// Confirm the route is not over-broad — requests to other API paths
// must fall through to 404 and not reach the better-auth handler.
const { app, handler } = buildApp();
const res = await request(app).get("/api/other/endpoint");
expect(res.status).toBe(404);
expect(handler).not.toHaveBeenCalled();
});
it("invokes the handler for every matched sub-path", async () => {
const { app, handler } = buildApp();
await request(app).post("/api/auth/sign-out");
await request(app).get("/api/auth/session");
expect(handler).toHaveBeenCalledTimes(2);
});
});

View file

@ -133,7 +133,7 @@ export async function createApp(
});
});
if (opts.betterAuthHandler) {
app.all("/api/auth/*authPath", opts.betterAuthHandler);
app.all("/api/auth/{*authPath}", opts.betterAuthHandler);
}
app.use(llmRoutes(db));