Remove document.origin and add window.origin

Both document and window also gain an internal _origin property,
representing the document's origin and environment settings object's
origin, respectively. Other parts of jsdom are converted to use either
of those internal _origin depending on what the spec says to use.

lib/api.js

@@ -94,7 +94,7 @@ class JSDOM {
       }
 
       document._URL = url;
-      document.origin = whatwgURL.serializeURLOrigin(document._URL);
+      document._origin = whatwgURL.serializeURLOrigin(document._URL);
     }
   }
 

lib/jsdom/browser/Window.js

@@ -141,6 +141,9 @@ function Window(options) {
     documentImpl._defaultView = window._globalProxy = vm.runInContext("this", window);
   }
 
+  const documentOrigin = idlUtils.implForWrapper(this._document)._origin;
+  this._origin = documentOrigin;
+
   // https://html.spec.whatwg.org/#session-history
   this._sessionHistory = new SessionHistory({
     document: idlUtils.implForWrapper(this._document),
@@ -168,19 +171,19 @@ function Window(options) {
   // Some properties (such as localStorage and sessionStorage) share data
   // between windows in the same origin. This object is intended
   // to contain such data.
-  if (options.commonForOrigin && options.commonForOrigin[this._document.origin]) {
+  if (options.commonForOrigin && options.commonForOrigin[documentOrigin]) {
     this._commonForOrigin = options.commonForOrigin;
   } else {
     this._commonForOrigin = {
-      [this._document.origin]: {
+      [documentOrigin]: {
         localStorageArea: new Map(),
         sessionStorageArea: new Map(),
         windowsInSameOrigin: [this]
       }
     };
   }
 
-  this._currentOriginData = this._commonForOrigin[this._document.origin];
+  this._currentOriginData = this._commonForOrigin[documentOrigin];
 
   ///// WEB STORAGE
 
@@ -283,8 +286,20 @@ function Window(options) {
     get screen() {
       return screen;
     },
+    get origin() {
+      return window._origin;
+    },
+    // The origin IDL attribute is defined with [Replaceable].
+    set origin(value) {
+      Object.defineProperty(this, "origin", {
+        value,
+        writable: true,
+        enumerable: true,
+        configurable: true
+      });
+    },
     get localStorage() {
-      if (this._document.origin === "null") {
+      if (idlUtils.implForWrapper(this._document)._origin === "null") {
         throw DOMException.create(window, [
           "localStorage is not available for opaque origins",
           "SecurityError"
@@ -294,7 +309,7 @@ function Window(options) {
       return this._localStorage;
     },
     get sessionStorage() {
-      if (this._document.origin === "null") {
+      if (idlUtils.implForWrapper(this._document)._origin === "null") {
         throw DOMException.create(window, [
           "sessionStorage is not available for opaque origins",
           "SecurityError"

lib/jsdom/living/node.js

@@ -20,7 +20,7 @@ module.exports.clone = function (node, document, cloneChildren) {
       copy._encoding = node._encoding;
       copy.contentType = node.contentType;
       copy._URL = node._URL;
-      copy.origin = node.origin;
+      copy._origin = node._origin;
       copy._parsingMode = node._parsingMode;
       break;
 

lib/jsdom/living/nodes/DOMImplementation-impl.js

@@ -52,7 +52,7 @@ class DOMImplementationImpl {
       document.appendChild(element);
     }
 
-    document.origin = this._ownerDocument.origin;
+    document._origin = this._ownerDocument._origin;
 
     return document;
   }

lib/jsdom/living/nodes/Document-impl.js

@@ -158,7 +158,7 @@ class DocumentImpl extends NodeImpl {
     }
 
     this._URL = parsed;
-    this.origin = whatwgURL.serializeURLOrigin(parsed);
+    this._origin = whatwgURL.serializeURLOrigin(parsed);
 
     this._location = Location.createImpl(this._globalObject, [], { relevantDocument: this });
     this._history = History.createImpl(this._globalObject, [], {

lib/jsdom/living/nodes/Document.webidl

@@ -6,7 +6,6 @@ interface Document : Node {
   [SameObject] readonly attribute DOMImplementation implementation;
   readonly attribute USVString URL;
   readonly attribute USVString documentURI;
-  readonly attribute USVString origin;
   readonly attribute DOMString compatMode;
   readonly attribute DOMString characterSet;
   readonly attribute DOMString charset; // historical alias of .characterSet

lib/jsdom/living/nodes/HTMLFrameElement-impl.js

@@ -147,7 +147,7 @@ function loadFrame(frame, attaching) {
   contentWindow._frameElement = frame;
   contentWindow._virtualConsole = parent._virtualConsole;
 
-  if (parentDoc.origin === contentDoc.origin) {
+  if (parentDoc._origin === contentDoc._origin) {
     contentWindow._currentOriginData.windowsInSameOrigin.push(contentWindow);
   }
 

lib/jsdom/living/post-message.js

@@ -1,6 +1,7 @@
 "use strict";
 const DOMException = require("domexception/webidl2js-wrapper");
 const MessageEvent = require("./generated/MessageEvent");
+const idlUtils = require("./generated/utils");
 const { isValidTargetOrigin } = require("../utils");
 const { fireAnEvent } = require("./helpers/events");
 
@@ -23,7 +24,7 @@ module.exports = function (globalObject) {
 
     // TODO: targetOrigin === '/' - requires reference to source window
     // See https://github.com/jsdom/jsdom/pull/1140#issuecomment-111587499
-    if (targetOrigin !== "*" && targetOrigin !== this.location.origin) {
+    if (targetOrigin !== "*" && targetOrigin !== idlUtils.implForWrapper(globalObject._document)._origin) {
       return;
     }
 

lib/jsdom/living/websockets/WebSocket-impl.js

@@ -130,7 +130,7 @@ class WebSocketImpl extends EventTargetImpl {
         headers: {
           "user-agent": globalObject.navigator.userAgent,
           cookie: this._ownerDocument._cookieJar.getCookieStringSync(nodeParsedURL, { http: true }),
-          origin: this._ownerDocument.origin
+          origin: globalObject._origin
         },
         rejectUnauthorized: this._ownerDocument._strictSSL
       });

lib/jsdom/living/xhr/XMLHttpRequest-impl.js

@@ -118,7 +118,7 @@ class XMLHttpRequestImpl extends XMLHttpRequestEventTargetImpl {
       proxy: window._resourceLoader._proxy,
       cookieJar: _ownerDocument._cookieJar,
       encoding: _ownerDocument._encoding,
-      origin: _ownerDocument.origin,
+      origin: window._origin,
       userAgent: window.navigator.userAgent
     };