happy-dom 20.8.8 → 20.8.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cookie/CookieContainer.js +1 -1
- package/lib/cookie/CookieContainer.js.map +1 -1
- package/lib/fetch/utilities/FetchRequestHeaderUtility.js +1 -1
- package/lib/fetch/utilities/FetchRequestHeaderUtility.js.map +1 -1
- package/lib/version.js +1 -1
- package/package.json +1 -1
- package/src/cookie/CookieContainer.ts +1 -1
- package/src/fetch/utilities/FetchRequestHeaderUtility.ts +1 -1
|
@@ -48,7 +48,7 @@ export default class CookieContainer {
|
|
|
48
48
|
for (const cookie of this.#cookies) {
|
|
49
49
|
if (!CookieExpireUtility.hasExpired(cookie) &&
|
|
50
50
|
(!httpOnly || !cookie.httpOnly) &&
|
|
51
|
-
(!url || CookieURLUtility.cookieMatchesURL(cookie, url
|
|
51
|
+
(!url || CookieURLUtility.cookieMatchesURL(cookie, url))) {
|
|
52
52
|
cookies.push(cookie);
|
|
53
53
|
}
|
|
54
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CookieContainer.js","sourceRoot":"","sources":["../../src/cookie/CookieContainer.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAI/C,OAAO,mBAAmB,MAAM,oCAAoC,CAAC;AACrE,OAAO,gBAAgB,MAAM,iCAAiC,CAAC;AAE/D;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IACnC,QAAQ,GAAc,EAAE,CAAC;IAEzB;;;;OAIG;IACI,UAAU,CAAC,OAA0B;QAC3C,MAAM,QAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,CAAC,MAAe,EAAU,EAAE,CAC1C,GAAG,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,IAAI,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC;QAEpF,gEAAgE;QAChE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1D,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;YAE3D,IAAI,SAAS,IAAI,SAAS,CAAC,GAAG,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;gBACvD,0DAA0D;gBAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;gBAE9C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACzB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBAChC,CAAC;gBAED,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBAChD,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACtD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC/B,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IAED;;;;;;OAMG;IACI,UAAU,CAAC,MAAkB,IAAI,EAAE,QAAQ,GAAG,KAAK;QACzD,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpC,IACC,CAAC,mBAAmB,CAAC,UAAU,CAAC,MAAM,CAAC;gBACvC,CAAC,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC/B,CAAC,CAAC,GAAG,IAAI,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"CookieContainer.js","sourceRoot":"","sources":["../../src/cookie/CookieContainer.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAI/C,OAAO,mBAAmB,MAAM,oCAAoC,CAAC;AACrE,OAAO,gBAAgB,MAAM,iCAAiC,CAAC;AAE/D;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IACnC,QAAQ,GAAc,EAAE,CAAC;IAEzB;;;;OAIG;IACI,UAAU,CAAC,OAA0B;QAC3C,MAAM,QAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,CAAC,MAAe,EAAU,EAAE,CAC1C,GAAG,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,IAAI,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC;QAEpF,gEAAgE;QAChE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1D,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;YAE3D,IAAI,SAAS,IAAI,SAAS,CAAC,GAAG,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;gBACvD,0DAA0D;gBAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;gBAE9C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACzB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBAChC,CAAC;gBAED,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBAChD,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACtD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC/B,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IAED;;;;;;OAMG;IACI,UAAU,CAAC,MAAkB,IAAI,EAAE,QAAQ,GAAG,KAAK;QACzD,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpC,IACC,CAAC,mBAAmB,CAAC,UAAU,CAAC,MAAM,CAAC;gBACvC,CAAC,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC/B,CAAC,CAAC,GAAG,IAAI,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EACvD,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC;QACF,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;IAED;;OAEG;IACI,YAAY;QAClB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACpB,CAAC;CACD"}
|
|
@@ -79,7 +79,7 @@ export default class FetchRequestHeaderUtility {
|
|
|
79
79
|
}
|
|
80
80
|
if (options.request.credentials === 'include' ||
|
|
81
81
|
(options.request.credentials === 'same-origin' && !isCORS)) {
|
|
82
|
-
const cookies = options.browserFrame.page.context.cookieContainer.getCookies(
|
|
82
|
+
const cookies = options.browserFrame.page.context.cookieContainer.getCookies(options.request[PropertySymbol.url], false);
|
|
83
83
|
if (cookies.length > 0) {
|
|
84
84
|
headers.set('Cookie', CookieStringUtility.cookiesToString(cookies));
|
|
85
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchRequestHeaderUtility.js","sourceRoot":"","sources":["../../../src/fetch/utilities/FetchRequestHeaderUtility.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FetchRequestHeaderUtility.js","sourceRoot":"","sources":["../../../src/fetch/utilities/FetchRequestHeaderUtility.ts"],"names":[],"mappings":"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"}
|
package/lib/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export default { version: '20.8.
|
|
1
|
+
export default { version: '20.8.9' };
|
package/package.json
CHANGED
|
@@ -63,7 +63,7 @@ export default class CookieContainer implements ICookieContainer {
|
|
|
63
63
|
if (
|
|
64
64
|
!CookieExpireUtility.hasExpired(cookie) &&
|
|
65
65
|
(!httpOnly || !cookie.httpOnly) &&
|
|
66
|
-
(!url || CookieURLUtility.cookieMatchesURL(cookie, url
|
|
66
|
+
(!url || CookieURLUtility.cookieMatchesURL(cookie, url))
|
|
67
67
|
) {
|
|
68
68
|
cookies.push(cookie);
|
|
69
69
|
}
|
|
@@ -102,7 +102,7 @@ export default class FetchRequestHeaderUtility {
|
|
|
102
102
|
(options.request.credentials === 'same-origin' && !isCORS)
|
|
103
103
|
) {
|
|
104
104
|
const cookies = options.browserFrame.page.context.cookieContainer.getCookies(
|
|
105
|
-
|
|
105
|
+
options.request[PropertySymbol.url],
|
|
106
106
|
false
|
|
107
107
|
);
|
|
108
108
|
if (cookies.length > 0) {
|