Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(rewrite): copy body from the request #11182

Merged
merged 4 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/swift-phones-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes an issue where `Astro.rewrite` wasn't carrying over the body of a `Request` in on-demand pages.
34 changes: 32 additions & 2 deletions packages/astro/src/core/render-context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ export class RenderContext {
if (reroutePayload instanceof Request) {
this.request = reroutePayload;
} else {
this.request = new Request(
this.request = this.#copyRequest(
new URL(routeData.pathname ?? routeData.route, this.url.origin),
this.request
);
Expand Down Expand Up @@ -416,7 +416,7 @@ export class RenderContext {
if (reroutePayload instanceof Request) {
this.request = reroutePayload;
} else {
this.request = new Request(
this.request = this.#copyRequest(
new URL(routeData.pathname ?? routeData.route, this.url.origin),
this.request
);
Expand Down Expand Up @@ -533,4 +533,34 @@ export class RenderContext {
if (!i18n) return;
return (this.#preferredLocaleList ??= computePreferredLocaleList(request, i18n.locales));
}

/**
* Utility function that creates a new `Request` with a new URL from an old `Request`.
*
* @param newUrl The new `URL`
* @param oldRequest The old `Request`
*/
#copyRequest(newUrl: URL, oldRequest: Request): Request {
return new Request(newUrl, {
method: oldRequest.method,
headers: oldRequest.headers,
body: oldRequest.body,
referrer: oldRequest.referrer,
referrerPolicy: oldRequest.referrerPolicy,
mode: oldRequest.mode,
credentials: oldRequest.credentials,
cache: oldRequest.cache,
redirect: oldRequest.redirect,
integrity: oldRequest.integrity,
signal: oldRequest.signal,
keepalive: oldRequest.keepalive,
// https://fetch.spec.whatwg.org/#dom-request-duplex
// @ts-expect-error It isn't part of the types, but undici accepts it and it allows to carry over the body to a new request
duplex: "half"
})
}

}



Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
let email = ''
return Astro.rewrite('/post/post-b')
---

<h1>Post A</h1>

<h2>{email}</h2>
15 changes: 15 additions & 0 deletions packages/astro/test/fixtures/reroute/src/pages/post/post-b.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
let email = ''
if (Astro.request.method === 'POST') {
try {
const data = await Astro.request.json();
email = data.email?.toString().trim();
} catch (e) {
console.log(e)
}
}
---

<h1>Post B</h1>

<h2>{email}</h2>
21 changes: 20 additions & 1 deletion packages/astro/test/rewrite.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ describe('Dev reroute', () => {

assert.equal($('h1').text(), '404: Not found');
});

});

describe('Build reroute', () => {
Expand Down Expand Up @@ -112,7 +113,7 @@ describe('Build reroute', () => {

it('should render the 404 built-in page', async () => {
try {
const html = await fixture.readFile('/spread/oops/index.html');
await fixture.readFile('/spread/oops/index.html');
assert.fail('Not found');
} catch {
assert.ok;
Expand Down Expand Up @@ -187,6 +188,24 @@ describe('SSR reroute', () => {
const html = await response.text();
assert.equal(html, 'Not found');
});

it('should pass the POST data from one page to another', async () => {
const request = new Request('http://example.com/post/post-a', {
method: "POST",
body: JSON.stringify({
email: "[email protected]",
}),
headers: {
"content-type": "application/json"
}
});
const response = await app.render(request);
const html = await response.text();
const $ = cheerioLoad(html);

assert.equal($('h1').text(), 'Post B');
assert.match($('h2').text(), /[email protected]/);
});
});

describe('Middleware', () => {
Expand Down
Loading