Skip to content

Commit

Permalink
Checks structure instead of instanceof for URL test (#431)
Browse files Browse the repository at this point in the history
  • Loading branch information
colincasey authored Jul 19, 2024
1 parent 5675a2f commit 7c10d0e
Showing 1 changed file with 24 additions and 5 deletions.
29 changes: 24 additions & 5 deletions lib/cookie/cookieJar.ts
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

0 comments on commit 7c10d0e

Please sign in to comment.