TrailingSlash using rewrite for a fetch call results on infinite loop (#280)

* TrailingSlash using rewrite for a fetch call results on infinite loop
Fixes: #279

Author: AlbertSabate

packages/open-next/src/adapters/routing/matcher.ts

@@ -176,11 +176,14 @@ export function handleRedirects(
     !event.rawPath.endsWith("/") &&
     !event.headers["x-nextjs-data"]
   ) {
+    const headersLocation = event.url.split("?");
     return {
       type: event.type,
       statusCode: 308,
       headers: {
-        Location: event.url + "/",
+        Location: `${headersLocation[0]}/${
+          headersLocation[1] ? `?${headersLocation[1]}` : ""
+        }`,
       },
       body: "",
       isBase64Encoded: false,
@@ -191,11 +194,14 @@ export function handleRedirects(
     event.rawPath.endsWith("/") &&
     event.rawPath !== "/"
   ) {
+    const headersLocation = event.url.split("?");
     return {
       type: event.type,
       statusCode: 308,
       headers: {
-        Location: event.url.replace(/\/$/, ""),
+        Location: `${headersLocation[0].replace(/\/$/, "")}${
+          headersLocation[1] ? `?${headersLocation[1]}` : ""
+        }`,
       },
       body: "",
       isBase64Encoded: false,

packages/tests-e2e/README.md

@@ -37,8 +37,8 @@ export APP_PAGES_ROUTER_URL=$(jq -r '.["e2e-example-AppPagesRouter"].url' .sst/o
 ```
 3. Run the test
 ```bash
-cd ../packages/tests-e2e
-npm run e2e:dev
+cd ../../packages/tests-e2e
+pnpm run e2e:dev
 ```
 
 

packages/tests-e2e/tests/appRouter/trailing.test.ts

@@ -0,0 +1,17 @@
+import { expect, test } from "@playwright/test";
+
+test("trailingSlash redirect", async ({ page }) => {
+  const response = await page.goto("/ssr/");
+
+  expect(response?.request().redirectedFrom()?.url()).toMatch(/\/ssr\/$/);
+  expect(response?.request().url()).toMatch(/\/ssr$/);
+});
+
+test("trailingSlash redirect with search parameters", async ({ page }) => {
+  const response = await page.goto("/ssr/?happy=true");
+
+  expect(response?.request().redirectedFrom()?.url()).toMatch(
+    /\/ssr\/\?happy=true$/,
+  );
+  expect(response?.request().url()).toMatch(/\/ssr\?happy=true$/);
+});

packages/tests-e2e/tests/pagesRouter/trailing.test.ts

@@ -6,3 +6,12 @@ test("trailingSlash redirect", async ({ page }) => {
   expect(response?.request().redirectedFrom()?.url()).toMatch(/\/ssr$/);
   expect(response?.request().url()).toMatch(/\/ssr\/$/);
 });
+
+test("trailingSlash redirect with search parameters", async ({ page }) => {
+  const response = await page.goto("/ssr?happy=true");
+
+  expect(response?.request().redirectedFrom()?.url()).toMatch(
+    /\/ssr\?happy=true$/,
+  );
+  expect(response?.request().url()).toMatch(/\/ssr\/\?happy=true$/);
+});