review

Author: sommeeeer

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

@@ -97,18 +97,7 @@ export async function handleMiddleware(
     url,
     body: convertBodyToReadableStream(internalEvent.method, internalEvent.body),
   } as unknown as Request);
-
   const statusCode = result.status;
-  // We want to normalize the Location header if its a redirect response. Headers.has() doesn't care about the case of the header name.
-  if (REDIRECTS.has(statusCode) && result.headers.has("Location")) {
-    result.headers.set(
-      "Location",
-      normalizeLocationHeader(
-        result.headers.get("Location") as string,
-        internalEvent.url,
-      ),
-    );
-  }
 
   /* Apply override headers from middleware
     NextResponse.next({
@@ -146,6 +135,11 @@ export async function handleMiddleware(
         resHeaders[key] = resHeaders[key]
           ? [...resHeaders[key], value]
           : [value];
+      } else if (
+        REDIRECTS.has(statusCode) &&
+        key.toLowerCase() === "location"
+      ) {
+        resHeaders[key] = normalizeLocationHeader(value, internalEvent.url);
       } else {
         resHeaders[key] = value;
       }

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

@@ -452,26 +452,22 @@ export function normalizeLocationHeader(
   location: string,
   baseUrl: string,
 ): string {
-  try {
-    const locationUrl = new URL(location);
-    const origin = new URL(baseUrl).origin;
-
-    // Encode the search parameters to ensure they are valid according to RFC
-    const encodedSearch = locationUrl.searchParams.toString()
-      ? `?${locationUrl.searchParams.toString()}`
-      : "";
-    const href =
-      locationUrl.origin +
-      locationUrl.pathname +
-      encodedSearch +
-      locationUrl.hash;
-    // The URL is relative if the origin is the same as the base URL's origin
-    if (locationUrl.origin === origin) {
-      return href.slice(origin.length);
-    }
-    return href;
-  } catch {
+  if (!URL.canParse(location)) {
     // If the location is not a valid URL, return it as-is
     return location;
   }
+
+  const locationUrl = new URL(location);
+  const origin = new URL(baseUrl).origin;
+
+  // Encode the search parameters to ensure they are valid according to RFC
+  const searchParams = locationUrl.searchParams.toString();
+  const encodedSearch = searchParams ? `?${searchParams}` : "";
+  const href = `${locationUrl.origin}${locationUrl.pathname}${encodedSearch}${locationUrl.hash}`;
+
+  // The URL is relative if the origin is the same as the base URL's origin
+  if (locationUrl.origin === origin) {
+    return href.slice(origin.length);
+  }
+  return href;
 }