Fix server action edge redirect with middleware rewrite (#67148)

huozhi · huozhi · commit 21a9d591412e · 2024-07-09T16:12:40.000+02:00
### What Add isEdgeRendering check condition for rewrite logic in edge adpator Fixes #66837 Closes NEXT-3545 ### Why From headers `x-middleware-rewrite`, it's still relative url `/rewrite`, reconstructing the url will lead to crash as it doesn't contain host.
diff --git a/packages/next/src/server/web/adapter.ts b/packages/next/src/server/web/adapter.ts
@@ -263,7 +263,7 @@ export async function adapter(
    * a data URL if the request was a data request.
    */
   const rewrite = response?.headers.get('x-middleware-rewrite')
-  if (response && rewrite) {
+  if (response && rewrite && !isEdgeRendering) {
     const rewriteUrl = new NextURL(rewrite, {
       forceLocale: true,
       headers: params.request.headers,
diff --git a/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/actions.ts b/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/actions.ts
@@ -0,0 +1,11 @@
+'use server'
+
+import { redirect } from 'next/navigation'
+
+export async function relativeRedirect() {
+  return redirect('./subpage')
+}
+
+export async function absoluteRedirect() {
+  return redirect('/subpage')
+}
diff --git a/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/layout.tsx b/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/layout.tsx
@@ -0,0 +1,11 @@
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode
+}>) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/redirect/page.tsx b/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/redirect/page.tsx
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <div id="redirected">Redirected</div>
+}
diff --git a/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/server-action/_action.ts b/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/server-action/_action.ts
@@ -0,0 +1,7 @@
+'use server'
+
+import { redirect } from 'next/navigation'
+
+export const redirectAction = async () => {
+  redirect('/redirect')
+}
diff --git a/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/server-action/edge/page.tsx b/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/server-action/edge/page.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { redirectAction } from '../_action'
+
+export default function Page() {
+  return (
+    <form action={redirectAction}>
+      <button type="submit">Submit</button>
+    </form>
+  )
+}
+
+export const runtime = 'edge'
diff --git a/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/server-action/node/page.tsx b/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/server-action/node/page.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { redirectAction } from '../_action'
+
+export default function Page() {
+  return (
+    <form action={redirectAction}>
+      <button type="submit">Submit</button>
+    </form>
+  )
+}
+
+export const runtime = 'nodejs'
diff --git a/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/middleware.ts b/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/middleware.ts
@@ -0,0 +1,5 @@
+import { NextRequest, NextResponse } from 'next/server'
+
+export default function middleware(request: NextRequest) {
+  return NextResponse.rewrite(request.url)
+}
diff --git a/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/server-actions-redirect-middleware-rewrite.test.ts b/test/e2e/app-dir/server-actions-redirect-middleware-rewrite/server-actions-redirect-middleware-rewrite.test.ts
@@ -0,0 +1,33 @@
+import { nextTestSetup } from 'e2e-utils'
+import { retry } from 'next-test-utils'
+
+describe('app-dir - server-actions-redirect-middleware-rewrite.test', () => {
+  const { next } = nextTestSetup({
+    files: __dirname,
+  })
+
+  it('should redirect correctly in nodejs runtime with middleware rewrite', async () => {
+    const browser = await next.browser('/server-action/node')
+    await browser.waitForElementByCss('button').click()
+
+    await retry(async () => {
+      expect(await browser.waitForElementByCss('#redirected').text()).toBe(
+        'Redirected'
+      )
+    })
+    expect(await browser.url()).toBe(`${next.url}/redirect`)
+  })
+
+  it('should redirect correctly in edge runtime with middleware rewrite', async () => {
+    const browser = await next.browser('/server-action/edge')
+    await browser.waitForElementByCss('button').click()
+
+    await retry(async () => {
+      expect(await browser.waitForElementByCss('#redirected').text()).toBe(
+        'Redirected'
+      )
+
+      expect(await browser.url()).toBe(`${next.url}/redirect`)
+    })
+  })
+})

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export default function Page() {`
	`2`	`+ return <div id="redirected">Redirected</div>`
	`3`	`+}`