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

Fix cookie descriptor handler #1019

Merged
merged 4 commits into from
Sep 3, 2024
Merged

Fix cookie descriptor handler #1019

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61e8f86
Fix the cookie getter passthrough call
muodov Aug 29, 2024
b7a46fb
Fix coookie setter passthrough call
muodov Aug 29, 2024
d19c03f
Cleanup
muodov Aug 29, 2024
c36e5d7
Merge branch 'main' into max/cookie-descriptor-fix
jonathanKingston Sep 3, 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
10 changes: 4 additions & 6 deletions src/features/cookie.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ export default class CookieFeature extends ContentFeature {
} else if (isTrackingCookie() || isNonTrackingCookie()) {
debugHelper('ignore', '3p frame', getCookieContext)
}
// @ts-expect-error - error TS18048: 'cookieSetter' is possibly 'undefined'.
return cookieGetter.call(document)
// @ts-expect-error - error TS18048: 'cookieGetter' is possibly 'undefined'.
return cookieGetter.call(this)
}

/**
Expand Down Expand Up @@ -186,7 +186,7 @@ export default class CookieFeature extends ContentFeature {
// if the value is valid. We will override this set later if the policy dictates that
// the expiry should be changed.
// @ts-expect-error - error TS18048: 'cookieSetter' is possibly 'undefined'.
cookieSetter.call(document, argValue)
cookieSetter.call(this, argValue)

try {
// wait for config before doing same-site tests
Expand Down Expand Up @@ -225,9 +225,7 @@ export default class CookieFeature extends ContentFeature {
}
}

this.defineProperty(globalThis.Document.prototype, 'cookie', {
enumerable: true,
configurable: true,
this.wrapProperty(globalThis.Document.prototype, 'cookie', {
set: setCookiePolicy,
get: getCookiePolicy
})
Expand Down
Loading