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

Checks structure instead of instanceof for URL test #431

Merged
merged 1 commit into from
Jul 19, 2024
Merged

Checks structure instead of instanceof for URL test #431

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 24 additions & 5 deletions lib/cookie/cookieJar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,28 @@ export interface CreateCookieJarOptions {
const SAME_SITE_CONTEXT_VAL_ERR =
'Invalid sameSiteContext option for getCookies(); expected one of "strict", "lax", or "none"'

function getCookieContext(url: unknown): URL {
if (url instanceof URL) {
return url
type UrlContext = {
hostname: string
pathname: string
protocol: string
}

function getCookieContext(url: unknown): UrlContext {
if (
url &&
typeof url === 'object' &&
'hostname' in url &&
typeof url.hostname === 'string' &&
'pathname' in url &&
typeof url.pathname === 'string' &&
'protocol' in url &&
typeof url.protocol === 'string'
) {
return {
hostname: url.hostname,
pathname: url.pathname,
protocol: url.protocol,
}
} else if (typeof url === 'string') {
try {
return new URL(decodeURI(url))
Expand Down Expand Up @@ -435,7 +454,7 @@ export class CookieJar {
}
const promiseCallback = createPromiseCallback(callback)
const cb = promiseCallback.callback
let context: URL
let context: UrlContext

try {
if (typeof url === 'string') {
Expand Down Expand Up @@ -819,7 +838,7 @@ export class CookieJar {
}
const promiseCallback = createPromiseCallback(callback)
const cb = promiseCallback.callback
let context: URL
let context: UrlContext

try {
if (typeof url === 'string') {
Expand Down