Merge pull request #24 from gauthamsriman/origin-uptodate

Keep origin up-to-date

Author: mhemesath

src/consumer/frame.js

@@ -198,6 +198,10 @@ class Frame extends EventEmitter {
     // 2. Identify the app the message came from.
     if (this.iframe.contentWindow !== event.source) return;
 
+    // For Chrome, the origin property is in the event.originalEvent object.
+    // Update origin so it can be used to post back to this frame.
+    this.origin = event.origin || event.originalEvent.origin;
+
     logger.log('<< consumer', event.origin, event.data);
 
     // 3. Send a response, if any, back to the app.

test/frame.js

@@ -145,6 +145,17 @@ describe('Frame', () => {
         sinon.assert.called(handle);
       });
 
+      it("updates the app's origin to match the frame's origin", () => {
+        const event = {
+          data: {jsonrpc: '2.0'},
+          source: frame.iframe.contentWindow,
+          origin: 'http://localhost:8080'
+        };
+        frame.handleProviderMessage(event);
+
+        expect(frame.origin).to.equal(event.origin);
+      });
+
       it("calls this.JSONRPC.handle with the data of given event", () => {
         const event = {
           data: {jsonrpc: '2.0'},