cozy-external-bridge 0.16.3 → 0.16.4

package/dist/container/helpers.js

@@ -28,9 +28,11 @@ var extractUrl = function extractUrl(url) {
 
 exports.extractUrl = extractUrl;
 
-var handleParentOriginRequest = function handleParentOriginRequest(event, origin) {
+var handleParentOriginRequest = function handleParentOriginRequest(event, url) {
   // We do not care about message from other origin that our iframe
-  if (event.origin !== origin) {
+  var urlOrigin = new URL(url).origin;
+
+  if (event.origin !== urlOrigin) {
     return;
   }
 

package/dist/container/helpers.spec.ts

@@ -1,4 +1,4 @@
-import { extractUrl } from './helpers'
+import { extractUrl, handleParentOriginRequest } from './helpers'
 
 describe('extractUrl', () => {
   it('should extract pathname, hash, and search from a URL starting with http', () => {
@@ -13,3 +13,67 @@ describe('extractUrl', () => {
     expect(extractUrl(url)).toBe(expected)
   })
 })
+
+describe('handleParentOriginRequest', () => {
+  it('should return undefined when event.origin is different from url origin', () => {
+    const mockPostMessage = jest.fn()
+    const url = 'http://expected-origin.com'
+    const eventOrigin = 'http://different-origin.com'
+    const mockEvent = {
+      origin: eventOrigin,
+      data: 'requestParentOrigin',
+      source: {
+        postMessage: mockPostMessage
+      }
+    } as unknown as MessageEvent
+
+    const result = handleParentOriginRequest(mockEvent, url)
+
+    expect(result).toBeUndefined()
+    expect(mockPostMessage).not.toHaveBeenCalled()
+  })
+
+  it('should successfully execute postMessage when origins match', () => {
+    const mockPostMessage = jest.fn()
+    const url = 'http://expected-origin.com'
+    const eventOrigin = 'http://expected-origin.com'
+    const mockEvent = {
+      origin: eventOrigin,
+      data: 'requestParentOrigin',
+      source: {
+        postMessage: mockPostMessage
+      }
+    } as unknown as MessageEvent
+
+    const result = handleParentOriginRequest(mockEvent, url)
+
+    expect(result).toBeUndefined()
+    expect(mockPostMessage).toHaveBeenCalledWith(
+      'answerParentOrigin',
+      eventOrigin
+    )
+    expect(mockPostMessage).toHaveBeenCalledTimes(1)
+  })
+
+  it('should successfully execute postMessage when origins match even if path is different', () => {
+    const mockPostMessage = jest.fn()
+    const url = 'http://expected-origin.com/new'
+    const eventOrigin = 'http://expected-origin.com'
+    const mockEvent = {
+      origin: eventOrigin,
+      data: 'requestParentOrigin',
+      source: {
+        postMessage: mockPostMessage
+      }
+    } as unknown as MessageEvent
+
+    const result = handleParentOriginRequest(mockEvent, url)
+
+    expect(result).toBeUndefined()
+    expect(mockPostMessage).toHaveBeenCalledWith(
+      'answerParentOrigin',
+      eventOrigin
+    )
+    expect(mockPostMessage).toHaveBeenCalledTimes(1)
+  })
+})

package/dist/container/index.js

@@ -11,14 +11,14 @@ var _useListenBridgeRequests = require("./useListenBridgeRequests");
 
 var _useListenParentOriginRequest = require("./useListenParentOriginRequest");
 
-var useExternalBridge = function useExternalBridge(origin) {
-  var _useBuildUrlToLoad = (0, _useBuildUrlToLoad2.useBuildUrlToLoad)(origin),
+var useExternalBridge = function useExternalBridge(url) {
+  var _useBuildUrlToLoad = (0, _useBuildUrlToLoad2.useBuildUrlToLoad)(url),
       urlToLoad = _useBuildUrlToLoad.urlToLoad;
 
-  var _useListenParentOrigi = (0, _useListenParentOriginRequest.useListenParentOriginRequest)(origin),
+  var _useListenParentOrigi = (0, _useListenParentOriginRequest.useListenParentOriginRequest)(url),
       isParentOriginRequestListenerReady = _useListenParentOrigi.isReady;
 
-  var _useListenBridgeReque = (0, _useListenBridgeRequests.useListenBridgeRequests)(origin),
+  var _useListenBridgeReque = (0, _useListenBridgeRequests.useListenBridgeRequests)(url),
       isBridgeListenerReady = _useListenBridgeReque.isReady;
 
   var isReady = isParentOriginRequestListenerReady && isBridgeListenerReady;

package/dist/container/useBuildUrlToLoad.js

@@ -21,7 +21,7 @@ var log = (0, _cozyMinilog.default)('🌉 [Container bridge]');
 
 // When we load the container app, we want to forward
 // the relevant part of the URL to the iframe
-var useBuildUrlToLoad = function useBuildUrlToLoad(origin) {
+var useBuildUrlToLoad = function useBuildUrlToLoad(url) {
   var location = (0, _reactRouterDom.useLocation)();
 
   var _useState = (0, _react.useState)(undefined),
@@ -31,15 +31,15 @@ var useBuildUrlToLoad = function useBuildUrlToLoad(origin) {
 
   (0, _react.useEffect)(function () {
     if (location.pathname.startsWith(_constants.BRIDGE_ROUTE_PREFIX)) {
-      var destUrl = new URL(origin);
+      var destUrl = new URL(url);
       destUrl.pathname = location.pathname.replace(_constants.BRIDGE_ROUTE_PREFIX, '');
       destUrl.hash = location.hash;
       destUrl.search = location.search;
       log.debug('Setting iframe to', destUrl.toString(), 'after modification');
       setUrlToLoad(destUrl.toString());
     } else {
-      log.debug('Setting iframe to', origin);
-      setUrlToLoad(origin);
+      log.debug('Setting iframe to', url);
+      setUrlToLoad(url);
     }
   }, []);
   return {

package/dist/container/useListenParentOriginRequest.js

@@ -20,7 +20,7 @@ var _helpers = require("./helpers");
 var log = (0, _cozyMinilog.default)('🌉 [Container bridge]');
 
 // Allow the iframe to request the origin of the parent window
-var useListenParentOriginRequest = function useListenParentOriginRequest(origin) {
+var useListenParentOriginRequest = function useListenParentOriginRequest(url) {
   var client = (0, _cozyClient.useClient)();
 
   var _useState = (0, _react.useState)(false),
@@ -32,7 +32,7 @@ var useListenParentOriginRequest = function useListenParentOriginRequest(origin)
     if (!client) return;
 
     var parentOriginRequestHandler = function parentOriginRequestHandler(event) {
-      return (0, _helpers.handleParentOriginRequest)(event, origin);
+      return (0, _helpers.handleParentOriginRequest)(event, url);
     };
 
     window.addEventListener('message', parentOriginRequestHandler);
@@ -41,7 +41,7 @@ var useListenParentOriginRequest = function useListenParentOriginRequest(origin)
     return function () {
       window.removeEventListener('message', parentOriginRequestHandler);
     };
-  }, [client, origin]);
+  }, [client, url]);
   return {
     isReady: isReady
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cozy-external-bridge",
   "description": "Library allows communication between a container app and an app embedded in an iframe",
-  "version": "0.16.3",
+  "version": "0.16.4",
   "author": {
     "name": "Cozy Cloud",
     "url": "https://github.com/cozy"
@@ -68,5 +68,5 @@
     "lint": "cd ../.. && yarn eslint --ext js,jsx,ts packages/cozy-external-bridge"
   },
   "types": "dist/index.d.ts",
-  "gitHead": "c90db9a0e2f1d287a28f1d10328c12603a0f63c0"
+  "gitHead": "cc6e194ab03804f97a9c50a39162e99e8924495d"
 }