From ef511994de4cb94da616531b346e03138d8985a5 Mon Sep 17 00:00:00 2001 From: Caspian Date: Thu, 24 Aug 2023 14:31:00 +0800 Subject: [PATCH] fix: Added search params setting in the middleware. --- src/middleware.ts | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/middleware.ts b/src/middleware.ts index 99f3240c..f6b83238 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -11,6 +11,12 @@ const HTTPWhitelistPaths = ["/api/healthcheck"] export default async function middleware(req: NextRequest) { const { pathname } = req.nextUrl + // https://github.com/vercel/next.js/issues/46618#issuecomment-1450416633 + const requestHeaders = new Headers(req.headers) + requestHeaders.set("x-xlog-pathname", pathname) + requestHeaders.set("x-xlog-search", req.nextUrl.search) + requestHeaders.set("x-xlog-ip", getClientIp(req) || "") + if ( IS_PROD && req.headers.get("x-forwarded-proto") !== "https" && @@ -64,7 +70,11 @@ export default async function middleware(req: NextRequest) { pathname === "/monitoring" || pathname === "favicon.ico" ) { - return NextResponse.next() + return NextResponse.next({ + request: { + headers: requestHeaders, + }, + }) } let tenant: { @@ -92,12 +102,7 @@ export default async function middleware(req: NextRequest) { ) } - // https://github.com/vercel/next.js/issues/46618#issuecomment-1450416633 - const requestHeaders = new Headers(req.headers) - requestHeaders.set("x-xlog-pathname", pathname) - requestHeaders.set("x-xlog-search", req.nextUrl.search) requestHeaders.set("x-xlog-handle", tenant.subdomain || "") - requestHeaders.set("x-xlog-ip", getClientIp(req) || "") if (tenant?.subdomain) { return NextResponse.rewrite(