-
-
Notifications
You must be signed in to change notification settings - Fork 2.9k
fix: cache raw cookie value and decode when getting #13485
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| 'astro': patch | ||
| --- | ||
|
|
||
| Fixes a bug that caused cookies to ignore custom decode function if has() had been called before |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,6 +35,8 @@ const DELETED_EXPIRATION = new Date(0); | |
| const DELETED_VALUE = 'deleted'; | ||
| const responseSentSymbol = Symbol.for('astro.responseSent'); | ||
|
|
||
| const identity = (value: string) => value; | ||
|
|
||
| class AstroCookie implements AstroCookieInterface { | ||
| constructor(public value: string) {} | ||
| json() { | ||
|
|
@@ -117,11 +119,13 @@ class AstroCookies implements AstroCookiesInterface { | |
| } | ||
| } | ||
|
|
||
| const values = this.#ensureParsed(options); | ||
| const decode = options?.decode ?? decodeURIComponent | ||
|
|
||
| const values = this.#ensureParsed(); | ||
| if (key in values) { | ||
| const value = values[key]; | ||
| if (value) { | ||
| return new AstroCookie(value); | ||
| return new AstroCookie(decode(value)); | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -130,15 +134,16 @@ class AstroCookies implements AstroCookiesInterface { | |
| * Astro.cookies.has(key) returns a boolean indicating whether this cookie is either | ||
| * part of the initial request or set via Astro.cookies.set(key) | ||
| * @param key The cookie to check for. | ||
| * @param _options This parameter is no longer used. | ||
| * @returns | ||
| */ | ||
| has(key: string, options: AstroCookieGetOptions | undefined = undefined): boolean { | ||
| has(key: string, _options?: AstroCookieGetOptions): boolean { | ||
| if (this.#outgoing?.has(key)) { | ||
| let [, , isSetValue] = this.#outgoing.get(key)!; | ||
| return isSetValue; | ||
| } | ||
| const values = this.#ensureParsed(options); | ||
| return !!values[key]; | ||
| const values = this.#ensureParsed(); | ||
| return values[key] !== undefined; | ||
|
Comment on lines
-141
to
+146
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Previously it would return |
||
| } | ||
|
|
||
| /** | ||
|
|
@@ -227,11 +232,9 @@ class AstroCookies implements AstroCookiesInterface { | |
| return cookies.headers(); | ||
| } | ||
|
|
||
| #ensureParsed( | ||
| options: AstroCookieGetOptions | undefined = undefined, | ||
| ): Record<string, string | undefined> { | ||
| #ensureParsed(): Record<string, string | undefined> { | ||
| if (!this.#requestValues) { | ||
| this.#parse(options); | ||
| this.#parse(); | ||
| } | ||
| if (!this.#requestValues) { | ||
| this.#requestValues = {}; | ||
|
|
@@ -246,13 +249,14 @@ class AstroCookies implements AstroCookiesInterface { | |
| return this.#outgoing; | ||
| } | ||
|
|
||
| #parse(options: AstroCookieGetOptions | undefined = undefined) { | ||
| #parse() { | ||
| const raw = this.#request.headers.get('cookie'); | ||
| if (!raw) { | ||
| return; | ||
| } | ||
|
|
||
| this.#requestValues = parse(raw, options); | ||
| // Pass identity function for decoding so it doesn't use the default. | ||
| // We'll do the actual decoding when we read the value. | ||
| this.#requestValues = parse(raw, { decode: identity }); | ||
| } | ||
| } | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.