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.

Sign up for GitHub

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

Jump to bottom

fix: Use default cookie decoder instead of bare native #13037

Merged
merged 6 commits into from
Nov 21, 2024
Merged

fix: Use default cookie decoder instead of bare native #13037

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87955d8
fix: Use default cookie decoder instead of bare native
kkarikos Nov 21, 2024
b3e2ace
add changeset
kkarikos Nov 21, 2024
c88916b
Update .changeset/plenty-oranges-count.md
kkarikos Nov 21, 2024
3c83ff7
Update packages/kit/src/runtime/server/cookie.js
benmccann Nov 21, 2024
6fc4a6e
Update packages/kit/src/runtime/server/cookie.js
benmccann Nov 21, 2024
9403593
Update .changeset/plenty-oranges-count.md
benmccann Nov 21, 2024
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/plenty-oranges-count.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: do not override default cookie decoder
benmccann marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 3 additions & 4 deletions packages/kit/src/runtime/server/cookie.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ export function get_cookies(request, url, trailing_slash) {
return c.value;
}

const decoder = opts?.decode || decodeURIComponent;
const req_cookies = parse(header, { decode: decoder });
const req_cookies = parse(header, { decode: opts?.decode });
const cookie = req_cookies[name]; // the decoded string or undefined

// in development, if the cookie was set during this session with `cookies.set`,
Expand All @@ -95,8 +94,8 @@ export function get_cookies(request, url, trailing_slash) {
* @param {import('cookie').CookieParseOptions} opts
*/
getAll(opts) {
const decoder = opts?.decode || decodeURIComponent;
const cookies = parse(header, { decode: decoder });
// `parse` uses default decoder if `opts.decode` is undefined
benmccann marked this conversation as resolved.
Show resolved Hide resolved
const cookies = parse(header, { decode: opts?.decode });

for (const c of Object.values(new_cookies)) {
if (
Expand Down
Loading