happy-dom 9.1.8 → 9.1.10

package/src/fetch/Fetch.ts

@@ -16,6 +16,7 @@ import { Socket } from 'net';
 import Stream from 'stream';
 import DataURIParser from './data-uri/DataURIParser';
 import FetchCORSUtility from './utilities/FetchCORSUtility';
+import CookieJar from '../cookie/CookieJar';
 
 const SUPPORTED_SCHEMAS = ['data:', 'http:', 'https:'];
 const REDIRECT_STATUS_CODES = [301, 302, 303, 307, 308];
@@ -557,7 +558,10 @@ export default class Fetch {
 			this.request.credentials === 'include' ||
 			(this.request.credentials === 'same-origin' && !isCORS)
 		) {
-			const cookie = document.defaultView.document.cookie;
+			const cookie = document.defaultView.document._cookie.getCookieString(
+				this.ownerDocument.defaultView.location,
+				false
+			);
 			if (cookie) {
 				headers.set('Cookie', cookie);
 			}
@@ -614,13 +618,7 @@ export default class Fetch {
 				// Handles setting cookie headers to the document.
 				// "set-cookie" and "set-cookie2" are not allowed in response headers according to spec.
 				if (lowerKey === 'set-cookie' || lowerKey === 'set-cookie2') {
-					const isCORS = FetchCORSUtility.isCORS(this.ownerDocument.location, this.request._url);
-					if (
-						this.request.credentials === 'include' ||
-						(this.request.credentials === 'same-origin' && !isCORS)
-					) {
-						this.ownerDocument.cookie = header;
-					}
+					(<CookieJar>this.ownerDocument['_cookie']).addCookieString(this.request._url, header);
 				} else {
 					headers.append(key, header);
 				}

package/src/nodes/document/Document.ts

@@ -290,7 +290,7 @@ export default class Document extends Node implements IDocument {
 	 * @returns Cookie.
 	 */
 	public get cookie(): string {
-		return this._cookie.getCookiesString(this.defaultView.location, true);
+		return this._cookie.getCookieString(this.defaultView.location, true);
 	}
 
 	/**
@@ -299,7 +299,7 @@ export default class Document extends Node implements IDocument {
 	 * @param cookie Cookie string.
 	 */
 	public set cookie(cookie: string) {
-		this._cookie.setCookiesString(cookie);
+		this._cookie.addCookieString(this.defaultView.location, cookie);
 	}
 
 	/**

package/src/xml-http-request/XMLHttpRequest.ts

@@ -558,7 +558,7 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget {
 			accept: '*/*',
 			referer: location.href,
 			'user-agent': navigator.userAgent,
-			cookie: document.cookie
+			cookie: document._cookie.getCookieString(location, false)
 		};
 	}
 
@@ -973,13 +973,17 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget {
 	 * @param headers String array.
 	 */
 	private _setCookies(headers: string[] | HTTP.IncomingHttpHeaders): void {
+		const originURL = new URL(this._settings.url, this._ownerDocument.defaultView.location);
 		for (const header of ['set-cookie', 'set-cookie2']) {
 			if (Array.isArray(headers[header])) {
 				for (const cookie of headers[header]) {
-					this._ownerDocument.defaultView.document._cookie.setCookiesString(cookie);
+					this._ownerDocument.defaultView.document._cookie.addCookieString(originURL, cookie);
 				}
 			} else if (headers[header]) {
-				this._ownerDocument.defaultView.document._cookie.setCookiesString(headers[header]);
+				this._ownerDocument.defaultView.document._cookie.addCookieString(
+					originURL,
+					headers[header]
+				);
 			}
 		}
 	}

package/tsconfig.json

@@ -5,6 +5,7 @@
 		"tsBuildInfoFile": "tmp/.tsbuildinfo",
 		"target": "es2020",
 		"declaration": true,
+		"declarationMap": true,
 		"module": "CommonJS",
 		"moduleResolution": "node",
 		"esModuleInterop": true,