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] handle set-cookie in setHeaders #6033

Merged
merged 4 commits into from
Aug 18, 2022
Merged
Show file tree
Hide file tree
Changes from 2 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/lemon-kids-double.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

handle `set-cookie` in `setHeaders`
24 changes: 20 additions & 4 deletions packages/kit/src/runtime/server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,28 @@ export async function respond(request, options, state) {
const lower = key.toLowerCase();

if (lower in headers) {
throw new Error(`"${key}" header is already set`);
if (lower === 'set-cookie') {
if (!Array.isArray(headers[lower])) {
headers[lower] = [/** @type{string} */ (headers[lower])];
}
const cookies = /** @type{string[]} */ (headers[lower]);
const new_cookies = /** @type{string[]} */ (
Array.isArray(new_headers[key]) ? new_headers[key] : [new_headers[key]]
);
for (const new_cookie of new_cookies) {
if (cookies.includes(new_cookie)) {
throw new Error(`"${key}" header already has cookie with same value`);
}
cookies.push(new_cookie);
}
} else {
throw new Error(`"${key}" header is already set`);
}
} else {
// TODO apply these headers to the response <- is this TODO outdated?
Rich-Harris marked this conversation as resolved.
Show resolved Hide resolved
headers[lower] = new_headers[key];
}

// TODO apply these headers to the response
headers[lower] = new_headers[key];

if (state.prerendering && lower === 'cache-control') {
state.prerendering.cache = /** @type {string} */ (new_headers[key]);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export function load({ setHeaders }) {
setHeaders({
'set-cookie': 'cookie1=value1'
});
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<slot />
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export function load({ setHeaders }) {
setHeaders({
'set-cookie': 'cookie2=value2'
});
}
8 changes: 8 additions & 0 deletions packages/kit/test/apps/basics/test/server.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,14 @@ test.describe('Static files', () => {
});
});

test.describe('setHeaders', () => {
test('allows multiple set-cookie headers with different values', async ({ page }) => {
const response = await page.goto('/headers/set-cookie/sub');
const cookies = (await response?.allHeaders())['set-cookie'];
expect(cookies.includes('cookie1=value1') && cookies.includes('cookie2=value2')).toBe(true);
});
});

test.describe('Miscellaneous', () => {
test('does not serve version.json with an immutable cache header', async ({ request }) => {
// this isn't actually a great test, because caching behaviour is down to adapters.
Expand Down