archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
### 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.
This commit is contained in:
Jiachi Liu 2024-06-24 15:17:44 +02:00 committed by GitHub
parent 6604c187ec
commit 7f72971039
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 97 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/next/src/server/web/adapter.ts
View file

@ -300,7 +300,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,

11
test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/actions.ts Normal file
View file

@ -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')
}

11
test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/layout.tsx Normal file
View file

@ -0,0 +1,11 @@
export default function RootLayout({
children,
}: Readonly<{
children: React.ReactNode
}>) {
return (
<html>
<body>{children}</body>
</html>
)
}

3
test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/redirect/page.tsx Normal file
View file

@ -0,0 +1,3 @@
export default function Page() {
return <div id="redirected">Redirected</div>
}

7
test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/server-action/_action.ts Normal file
View file

@ -0,0 +1,7 @@
'use server'
import { redirect } from 'next/navigation'
export const redirectAction = async () => {
redirect('/redirect')
}

13
test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/server-action/edge/page.tsx Normal file
View file

@ -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'

13
test/e2e/app-dir/server-actions-redirect-middleware-rewrite/app/server-action/node/page.tsx Normal file
View file

@ -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'

5
test/e2e/app-dir/server-actions-redirect-middleware-rewrite/middleware.ts Normal file
View file

@ -0,0 +1,5 @@
import { NextRequest, NextResponse } from 'next/server'
export default function middleware(request: NextRequest) {
return NextResponse.rewrite(request.url)
}

33
test/e2e/app-dir/server-actions-redirect-middleware-rewrite/server-actions-redirect-middleware-rewrite.test.ts Normal file
View file

@ -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`)
})
})
})