Skip to content

Commit 026730d

Browse files
committed
review fix
1 parent 4a53331 commit 026730d

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.changeset/khaki-dragons-build.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
"@opennextjs/aws": patch
33
---
44

5-
Fix middleware search params with multiple value
5+
Fix middleware search params with multiple values

packages/open-next/src/core/routing/middleware.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export async function handleMiddleware(
143143
// NOTE: the header was added to `req` from above
144144
const rewriteUrl = responseHeaders.get("x-middleware-rewrite");
145145
let isExternalRewrite = false;
146-
let middlewareQueryString = internalEvent.query;
146+
let middlewareQuery = internalEvent.query;
147147
let newUrl = internalEvent.url;
148148
if (rewriteUrl) {
149149
newUrl = rewriteUrl;
@@ -152,15 +152,13 @@ export async function handleMiddleware(
152152
isExternalRewrite = true;
153153
} else {
154154
const rewriteUrlObject = new URL(rewriteUrl);
155-
// If we have a rewrite, search params from the rewrite URL should be used and override the original search params
155+
// Search params from the rewritten URL override the original search params
156156

157-
middlewareQueryString = getQueryFromSearchParams(
158-
rewriteUrlObject.searchParams,
159-
);
157+
middlewareQuery = getQueryFromSearchParams(rewriteUrlObject.searchParams);
160158

161159
// We still need to add internal search params to the query string for pages router on older versions of Next.js
162160
if ("__nextDataReq" in internalEvent.query) {
163-
middlewareQueryString.__nextDataReq = internalEvent.query.__nextDataReq;
161+
middlewareQuery.__nextDataReq = internalEvent.query.__nextDataReq;
164162
}
165163
}
166164
}
@@ -188,7 +186,7 @@ export async function handleMiddleware(
188186
headers: { ...internalEvent.headers, ...reqHeaders },
189187
body: internalEvent.body,
190188
method: internalEvent.method,
191-
query: middlewareQueryString,
189+
query: middlewareQuery,
192190
cookies: internalEvent.cookies,
193191
remoteAddress: internalEvent.remoteAddress,
194192
isExternalRewrite,

0 commit comments

Comments
 (0)