cozy-harvest-lib 32.4.4 → 32.5.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [32.5.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@32.4.5...cozy-harvest-lib@32.5.0) (2025-09-01)
+
+### Features
+
+- Remove usage of useless isMobileApp method ([e26ce64](https://github.com/cozy/cozy-libs/commit/e26ce64c2a6231aaab09ba04e28e31a1262bd0fd))
+
+## [32.4.5](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@32.4.4...cozy-harvest-lib@32.4.5) (2025-08-21)
+
+**Note:** Version bump only for package cozy-harvest-lib
+
 ## [32.4.4](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@32.4.3...cozy-harvest-lib@32.4.4) (2025-08-19)
 
 **Note:** Version bump only for package cozy-harvest-lib

package/dist/components/OAuthService.js

@@ -10,45 +10,6 @@ var OAUTH_POPUP_WIDTH = 800;
 export var OAUTH_SERVICE_CLOSED = 'CLOSED';
 export var OAUTH_SERVICE_ERROR = 'ERROR';
 export var OAUTH_SERVICE_OK = 'OK';
-/**
- * Monitor URL changes for mobile apps and in app browsers
- * @param  {import('cozy-client/types/types').KonnectorsDoctype} konnector
- *
- * The provider redirect us to something like : oauthcallback.mycozy.cloud/?account=A&state=b
- * So we listen to the URL change with these informations, and we try to handle it.
- * It works well on iOS or when we are logged on the same device on the web, but it will
- * fail on Android if we're ne logged in the browser. Why ?
- * Our oauthcallback.mycozy.cloud/?account=A&state=b checks if we're logged, if not the server
- * sends an http redirect.
- * On Android, the 'loadstart' event is not dispatched by the browser when it get a redirect.
- * The inAppBrowser follows the URL and arrive on :
- * https://my.mycozy.cloud/auth?redirect=https://home.cozy.cloud/?account=a&state=b
- * So if we don't have account & state searchParams we have to check if we've a redirect searchParams
- * init it and search if we have inside this url an account and state params
- */
-
-function handleUrlChange(konnector) {
-  return function (resolve) {
-    return function (event) {
-      var url = event.url;
-      var oAuthData = extractOAuthDataFromUrl(url);
-
-      if (oAuthData) {
-        return handleOAuthData(oAuthData, konnector, resolve);
-      }
-
-      var redirect = url.searchParams.get('redirect');
-
-      if (redirect) {
-        var redirectOAuthData = extractOAuthDataFromUrl(new URL(redirect));
-
-        if (redirectOAuthData) {
-          return handleOAuthData(redirectOAuthData, konnector, resolve);
-        }
-      }
-    };
-  };
-}
 /**
  * Handles OAuth data. OAuth data may be provided by different way:
  * * realtime message from web apps (see handleMessage)
@@ -60,7 +21,6 @@ function handleUrlChange(konnector) {
  * @returns <void>
  */
 
-
 function handleOAuthData(data, konnector, resolve) {
   if (!checkOAuthData(konnector, data)) return;
 
@@ -87,34 +47,6 @@ function handleOAuthData(data, konnector, resolve) {
  * @property  {String} [finalLocation] - final query string added to the redirected url
  */
 
-/**
- * Extract OAuthData from url search params if any
- *
- * @param {URL} url
- * @returns {OAuthData|null} OAuthData
- */
-
-
-function extractOAuthDataFromUrl(url) {
-  var account = url.searchParams.get('account');
-  var state = url.searchParams.get('state');
-  var error = url.searchParams.get('error');
-
-  if (account && state) {
-    var oAuthData = {
-      key: account,
-      oAuthStateKey: state
-    };
-
-    if (error) {
-      oAuthData.error = error;
-    }
-
-    return oAuthData;
-  }
-
-  return null;
-}
 /**
  * @typedef OAuthServiceResult
  * @property {"OK"|"CLOSED"|"ERROR"} result
@@ -443,7 +375,6 @@ export function openOAuthWindow(_ref5) {
       title: title || '',
       width: OAUTH_POPUP_WIDTH,
       height: OAUTH_POPUP_HEIGHT,
-      handleUrlChange: handleUrlChange(konnector),
       registerRealtime: registerRealtime({
         konnector: konnector,
         client: client

package/dist/components/OAuthService.spec.js

@@ -9,7 +9,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import util from 'util';
 import { openOAuthWindow, OAUTH_SERVICE_OK } from 'components/OAuthService';
 import MicroEE from 'microee';
-import { isMobileApp, isFlagshipApp } from 'cozy-device-helper';
+import { isFlagshipApp } from 'cozy-device-helper';
 import { OAUTH_REALTIME_CHANNEL, terminateOAuth } from '../helpers/oauth';
 import PopupMock from '../helpers/windowWrapperMocks';
 jest.mock('../helpers/oauth', function () {
@@ -69,7 +69,6 @@ var client = {
 };
 jest.mock('cozy-device-helper', function () {
   return {
-    isMobileApp: jest.fn(),
     isFlagshipApp: jest.fn()
   };
 });
@@ -156,94 +155,15 @@ describe('OAuthService', function () {
         }, _callee);
       })));
     });
-    describe('with intentsApi', function () {
-      beforeEach(function () {
-        isMobileApp.mockReturnValue(true);
-      });
-      it('should render', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var closePromise, intentsApi, promise, result;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                closePromise = new Promise(function () {});
-                intentsApi = {
-                  fetchSessionCode: jest.fn().mockResolvedValue('somesessioncode'),
-                  showInAppBrowser: jest.fn().mockImplementation(function () {
-                    return closePromise;
-                  }),
-                  closeInAppBrowser: jest.fn().mockResolvedValue()
-                };
-                promise = openOAuthWindow({
-                  client: client,
-                  konnector: {
-                    slug: 'ameli'
-                  },
-                  redirectSlug: 'home',
-                  extraParams: {
-                    extraParam1: 'extraParamValue'
-                  },
-                  title: 'popup title',
-                  account: {
-                    _id: 'someaccountid'
-                  },
-                  intentsApi: intentsApi
-                });
-                expect(isPending(promise)).toBe(true);
-                expect(terminateOAuth).not.toHaveBeenCalled();
-                _context2.next = 7;
-                return sleep(100);
-
-              case 7:
-                // lets time to show inAppBrowser before realtime event occurs
-                mockCozyRealtime.emitRealtimeEvent('notified', 'io.cozy.accounts', OAUTH_REALTIME_CHANNEL, {
-                  _id: 'oauth-popup',
-                  data: {
-                    error: null,
-                    finalLocation: 'connection_id=194&state=someuuid',
-                    key: null,
-                    oAuthStateKey: 'someuuid'
-                  }
-                });
-                _context2.next = 10;
-                return promise;
-
-              case 10:
-                result = _context2.sent;
-                expect(result).toStrictEqual({
-                  result: OAUTH_SERVICE_OK,
-                  key: null,
-                  data: {
-                    error: null,
-                    finalLocation: 'connection_id=194&state=someuuid',
-                    key: null,
-                    oAuthStateKey: 'someuuid'
-                  }
-                });
-                expect(terminateOAuth).toHaveBeenCalled();
-                expect(intentsApi.fetchSessionCode).toHaveBeenCalledTimes(1);
-                expect(intentsApi.showInAppBrowser).toHaveBeenCalled(); // TODO test url mock nonce
-
-                expect(intentsApi.closeInAppBrowser).toHaveBeenCalled();
-
-              case 16:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2);
-      })));
-    });
     describe('on web', function () {
       beforeEach(function () {
-        isMobileApp.mockReturnValue(false);
         isFlagshipApp.mockReturnValue(false);
       });
-      it('should render', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      it('should render', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var promise, result;
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
                 promise = openOAuthWindow({
                   client: client,
@@ -270,11 +190,11 @@ describe('OAuthService', function () {
                     oAuthStateKey: 'someuuid'
                   }
                 });
-                _context3.next = 6;
+                _context2.next = 6;
                 return promise;
 
               case 6:
-                result = _context3.sent;
+                result = _context2.sent;
                 expect(result).toStrictEqual({
                   result: OAUTH_SERVICE_OK,
                   key: null,
@@ -289,10 +209,10 @@ describe('OAuthService', function () {
 
               case 9:
               case "end":
-                return _context3.stop();
+                return _context2.stop();
             }
           }
-        }, _callee3);
+        }, _callee2);
       })));
     });
   });
@@ -300,10 +220,4 @@ describe('OAuthService', function () {
 
 var isPending = function isPending(promise) {
   return util.inspect(promise).includes('pending');
-};
-
-function sleep(ms) {
-  return new Promise(function (resolve) {
-    return setTimeout(resolve, ms);
-  });
-}
+};

package/dist/components/Popup.js

@@ -11,7 +11,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
-import { isMobileApp } from 'cozy-device-helper';
 /**
  * Customized function to get dimensions and position for a centered
  * popup window
@@ -73,24 +72,6 @@ export var Popup = /*#__PURE__*/function (_PureComponent) {
     value: function componentWillUnmount() {
       this.killPopup();
     }
-  }, {
-    key: "addListeners",
-    value: function addListeners(popup) {
-      // rest of instructions only on mobile app
-      if (!isMobileApp()) return;
-      popup.addEventListener('loadstart', this.handleUrlChange);
-      popup.addEventListener('exit', this.handleClose);
-    }
-  }, {
-    key: "removeListeners",
-    value: function removeListeners(popup) {
-      // rest of instructions only if popup is still opened
-      if (popup.closed) return; // rest of instructions only on mobile app
-
-      if (!isMobileApp()) return;
-      popup.removeEventListener('loadstart', this.handleUrlChange);
-      popup.removeEventListener('exit', this.handleClose);
-    }
   }, {
     key: "handleClose",
     value: function handleClose(popup) {
@@ -131,7 +112,6 @@ export var Popup = /*#__PURE__*/function (_PureComponent) {
         popup.focus();
       }
 
-      this.addListeners(popup);
       this.startMonitoringClosing(popup);
       this.setState({
         popup: popup
@@ -141,7 +121,6 @@ export var Popup = /*#__PURE__*/function (_PureComponent) {
     key: "killPopup",
     value: function killPopup() {
       var popup = this.state.popup;
-      this.removeListeners(popup);
       this.stopMonitoringClosing();
       if (!popup.closed) popup.close();
     }

package/dist/components/PopupService.js

@@ -1,5 +1,4 @@
 // @ts-check
-import { isMobileApp } from 'cozy-device-helper';
 import { popupCenter } from './Popup';
 import { windowOpen } from '../helpers/windowWrapper';
 /**
@@ -15,7 +14,6 @@ import { windowOpen } from '../helpers/windowWrapper';
  * @param {String} options.title - Title of the popup
  * @param {Number} options.width - Width of the popup
  * @param {Number} options.height - Height of the popup
- * @param {Function} options.handleUrlChange - Function to call when popup url changes
  * @param {Function} options.registerRealtime - Function to call to register realtime events
  * @returns {Promise<OpenWindowResult>}
  */
@@ -25,7 +23,6 @@ export function openWindow(_ref) {
       title = _ref.title,
       width = _ref.width,
       height = _ref.height,
-      handleUrlChange = _ref.handleUrlChange,
       registerRealtime = _ref.registerRealtime;
 
   var _popupCenter = popupCenter(width, height),
@@ -49,10 +46,6 @@ export function openWindow(_ref) {
     var unregisterRealtime;
 
     var cleanAndResolve = function cleanAndResolve(data) {
-      if (handleUrlChange) {
-        removeListeners(popup, handleUrlChange);
-      }
-
       stopMonitoringClosing(checkClosedInterval);
 
       if (registerRealtime) {
@@ -63,10 +56,6 @@ export function openWindow(_ref) {
       resolve(data);
     };
 
-    if (handleUrlChange) {
-      addListeners(popup, cleanAndResolve, handleUrlChange);
-    }
-
     if (registerRealtime) {
       unregisterRealtime = registerRealtime(cleanAndResolve);
     }
@@ -113,50 +102,4 @@ function startMonitoringClosing(popup, resolve) {
 
 function stopMonitoringClosing(checkClosedInterval) {
   clearInterval(checkClosedInterval);
-}
-/**
- * Removes all listeners
- *
- * @param {Object} popup - Current popup
- * @param {Function} handleUrlChange - handleUrlChange function not to listen anymore
- * @returns <void>
- */
-
-
-function removeListeners(popup, handleUrlChange) {
-  // rest of instructions only if popup is still opened
-  if (popup.closed) return; // rest of instructions only on mobile app
-
-  if (!isMobileApp()) return;
-  popup.removeEventListener('loadstart', handleUrlChange);
-  popup.removeEventListener('exit', handleClose);
-}
-/**
- * Add listeners
- *
- * @param {Object} popup
- * @param {Function} resolve
- * @param {Function} handleUrlChange
- * @returns <void>
- */
-
-
-function addListeners(popup, resolve, handleUrlChange) {
-  // rest of instructions only on mobile app
-  if (!isMobileApp()) return;
-  popup.addEventListener('loadstart', handleUrlChange(resolve));
-  popup.addEventListener('exit', handleClose(resolve));
-}
-/**
- * Function called when the popup is closed
- *
- * @param {Function} resolve
- * @returns {Function}
- */
-
-
-function handleClose(resolve) {
-  return function (popup) {
-    resolve(popup);
-  };
 }

package/dist/components/PopupService.spec.js

@@ -2,7 +2,6 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import util from 'util';
 import { openWindow } from 'components/PopupService';
-import { isMobileApp } from 'cozy-device-helper';
 import PopupMock from '../helpers/windowWrapperMocks';
 var mockPopup = new PopupMock();
 jest.mock('../helpers/windowWrapper', function () {
@@ -12,15 +11,8 @@ jest.mock('../helpers/windowWrapper', function () {
     })
   };
 });
-jest.mock('cozy-device-helper', function () {
-  return {
-    isMobileApp: jest.fn()
-  };
-});
 describe('PopupService', function () {
   describe('openWindow', function () {
-    var handleUrlChange = jest.fn();
-    var handleUrlChangeWrapper = jest.fn().mockReturnValue(handleUrlChange);
     var unregisterRealtime = jest.fn();
     var registerRealtime = jest.fn().mockReturnValue(unregisterRealtime);
     beforeEach(function () {
@@ -29,47 +21,34 @@ describe('PopupService', function () {
     afterEach(function () {
       jest.clearAllMocks();
     });
-    describe('on Cordova', function () {
-      beforeEach(function () {
-        isMobileApp.mockReturnValue(true);
-      });
+    describe('on web', function () {
       it('should render', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var promise, result;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                promise = openWindow({
-                  url: 'http://cozy.tools',
-                  title: 'SOME_TITLE',
-                  width: '20',
-                  height: '30',
-                  handleUrlChange: handleUrlChangeWrapper
-                });
+                promise = openWindow('http://cozy.tools', 'SOME_TITLE', 'SOME_OPTIONS');
                 expect(mockPopup.focus).toHaveBeenCalled();
-                expect(mockPopup.addEventListener).toHaveBeenCalledWith('loadstart', expect.anything());
-                expect(mockPopup.addEventListener).toHaveBeenCalledWith('exit', expect.anything());
                 expect(isPending(promise)).toBeTruthy();
-                mockPopup.emit('exit', {
-                  POPUP: 'data'
-                });
-                _context.next = 8;
+                mockPopup.close();
+                _context.next = 6;
                 return promise;
 
-              case 8:
+              case 6:
                 result = _context.sent;
                 expect(result).toStrictEqual({
-                  POPUP: 'data'
+                  result: 'CLOSED'
                 });
 
-              case 10:
+              case 8:
               case "end":
                 return _context.stop();
             }
           }
         }, _callee);
       })));
-      it('should call handUrlChange', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      it('should accept registerRealtime parameter', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var promise, result;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
@@ -80,100 +59,28 @@ describe('PopupService', function () {
                   title: 'SOME_TITLE',
                   width: '20',
                   height: '30',
-                  handleUrlChange: handleUrlChangeWrapper
-                });
-                expect(isPending(promise)).toBeTruthy();
-                mockPopup.emit('loadstart', 'HELLO');
-                expect(handleUrlChangeWrapper).toHaveBeenCalled();
-                expect(handleUrlChange).toHaveBeenCalledWith('HELLO');
-                mockPopup.emit('exit', {
-                  POPUP: 'data'
-                });
-                _context2.next = 8;
-                return promise;
-
-              case 8:
-                result = _context2.sent;
-                expect(result).toStrictEqual({
-                  POPUP: 'data'
-                });
-
-              case 10:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2);
-      })));
-    });
-    describe('on web', function () {
-      beforeEach(function () {
-        isMobileApp.mockReturnValue(false);
-      });
-      it('should render', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        var promise, result;
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                promise = openWindow('http://cozy.tools', 'SOME_TITLE', 'SOME_OPTIONS');
-                expect(mockPopup.focus).toHaveBeenCalled();
-                expect(mockPopup.addEventListener).not.toHaveBeenCalledWith('loadstart', expect.anything());
-                expect(mockPopup.addEventListener).not.toHaveBeenCalledWith('exit', expect.anything());
-                expect(isPending(promise)).toBeTruthy();
-                mockPopup.close();
-                _context3.next = 8;
-                return promise;
-
-              case 8:
-                result = _context3.sent;
-                expect(result).toStrictEqual({
-                  result: 'CLOSED'
-                });
-
-              case 10:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3);
-      })));
-      it('should accept registerRealtime parameter', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-        var promise, result;
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                promise = openWindow({
-                  url: 'http://cozy.tools',
-                  title: 'SOME_TITLE',
-                  width: '20',
-                  height: '30',
-                  handleUrlChange: handleUrlChangeWrapper,
                   registerRealtime: registerRealtime
                 });
                 expect(isPending(promise)).toBeTruthy();
                 expect(registerRealtime).toHaveBeenCalledTimes(1);
                 expect(unregisterRealtime).not.toHaveBeenCalled();
-                mockPopup.emit('loadstart', 'HELLO');
-                expect(handleUrlChange).not.toHaveBeenCalled();
                 mockPopup.close();
-                _context4.next = 9;
+                _context2.next = 7;
                 return promise;
 
-              case 9:
-                result = _context4.sent;
+              case 7:
+                result = _context2.sent;
                 expect(result).toStrictEqual({
                   result: 'CLOSED'
                 });
                 expect(unregisterRealtime).toHaveBeenCalledTimes(1);
 
-              case 12:
+              case 10:
               case "end":
-                return _context4.stop();
+                return _context2.stop();
             }
           }
-        }, _callee4);
+        }, _callee2);
       })));
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "32.4.4",
+  "version": "32.5.0",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -71,10 +71,10 @@
     "cozy-intent": "^2.30.0",
     "cozy-interapp": "^0.16.0",
     "cozy-keys-lib": "^6.1.1",
-    "cozy-realtime": "^5.6.4",
+    "cozy-realtime": "^5.7.0",
     "cozy-tsconfig": "^1.8.1",
     "cozy-ui": "^115.0.2",
-    "cozy-viewer": "^23.1.4",
+    "cozy-viewer": "^23.2.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
     "form-data": "4.0.0",
@@ -110,5 +110,5 @@
     "react-router-dom": ">=6.14.2"
   },
   "sideEffects": false,
-  "gitHead": "e65ef0b285982ef58269f766870bcb26fee91ef4"
+  "gitHead": "110b201fa4ddf5c89dfa634b88b6e495b410e90f"
 }

package/src/components/OAuthService.js

@@ -17,41 +17,6 @@ export const OAUTH_SERVICE_CLOSED = 'CLOSED'
 export const OAUTH_SERVICE_ERROR = 'ERROR'
 export const OAUTH_SERVICE_OK = 'OK'
 
-/**
- * Monitor URL changes for mobile apps and in app browsers
- * @param  {import('cozy-client/types/types').KonnectorsDoctype} konnector
- *
- * The provider redirect us to something like : oauthcallback.mycozy.cloud/?account=A&state=b
- * So we listen to the URL change with these informations, and we try to handle it.
- * It works well on iOS or when we are logged on the same device on the web, but it will
- * fail on Android if we're ne logged in the browser. Why ?
- * Our oauthcallback.mycozy.cloud/?account=A&state=b checks if we're logged, if not the server
- * sends an http redirect.
- * On Android, the 'loadstart' event is not dispatched by the browser when it get a redirect.
- * The inAppBrowser follows the URL and arrive on :
- * https://my.mycozy.cloud/auth?redirect=https://home.cozy.cloud/?account=a&state=b
- * So if we don't have account & state searchParams we have to check if we've a redirect searchParams
- * init it and search if we have inside this url an account and state params
- */
-function handleUrlChange(konnector) {
-  return resolve => {
-    return event => {
-      const { url } = event
-      const oAuthData = extractOAuthDataFromUrl(url)
-      if (oAuthData) {
-        return handleOAuthData(oAuthData, konnector, resolve)
-      }
-      const redirect = url.searchParams.get('redirect')
-      if (redirect) {
-        const redirectOAuthData = extractOAuthDataFromUrl(new URL(redirect))
-        if (redirectOAuthData) {
-          return handleOAuthData(redirectOAuthData, konnector, resolve)
-        }
-      }
-    }
-  }
-}
-
 /**
  * Handles OAuth data. OAuth data may be provided by different way:
  * * realtime message from web apps (see handleMessage)
@@ -89,26 +54,6 @@ function handleOAuthData(data, konnector, resolve) {
  * @property  {String} [finalLocation] - final query string added to the redirected url
  */
 
-/**
- * Extract OAuthData from url search params if any
- *
- * @param {URL} url
- * @returns {OAuthData|null} OAuthData
- */
-function extractOAuthDataFromUrl(url) {
-  const account = url.searchParams.get('account')
-  const state = url.searchParams.get('state')
-  const error = url.searchParams.get('error')
-  if (account && state) {
-    const oAuthData = { key: account, oAuthStateKey: state }
-    if (error) {
-      oAuthData.error = error
-    }
-    return oAuthData
-  }
-  return null
-}
-
 /**
  * @typedef OAuthServiceResult
  * @property {"OK"|"CLOSED"|"ERROR"} result
@@ -331,7 +276,6 @@ export function openOAuthWindow({
       title: title || '',
       width: OAUTH_POPUP_WIDTH,
       height: OAUTH_POPUP_HEIGHT,
-      handleUrlChange: handleUrlChange(konnector),
       registerRealtime: registerRealtime({ konnector, client })
     })
   }

package/src/components/OAuthService.spec.js

@@ -3,7 +3,7 @@ import util from 'util'
 import { openOAuthWindow, OAUTH_SERVICE_OK } from 'components/OAuthService'
 import MicroEE from 'microee'
 
-import { isMobileApp, isFlagshipApp } from 'cozy-device-helper'
+import { isFlagshipApp } from 'cozy-device-helper'
 
 import { OAUTH_REALTIME_CHANNEL, terminateOAuth } from '../helpers/oauth'
 import PopupMock from '../helpers/windowWrapperMocks'
@@ -60,7 +60,6 @@ const client = {
 }
 
 jest.mock('cozy-device-helper', () => ({
-  isMobileApp: jest.fn(),
   isFlagshipApp: jest.fn()
 }))
 
@@ -135,71 +134,8 @@ describe('OAuthService', () => {
       })
     })
 
-    describe('with intentsApi', () => {
-      beforeEach(() => {
-        isMobileApp.mockReturnValue(true)
-      })
-
-      it('should render', async () => {
-        let closePromise = new Promise(() => {})
-        const intentsApi = {
-          fetchSessionCode: jest.fn().mockResolvedValue('somesessioncode'),
-          showInAppBrowser: jest.fn().mockImplementation(() => {
-            return closePromise
-          }),
-          closeInAppBrowser: jest.fn().mockResolvedValue()
-        }
-        const promise = openOAuthWindow({
-          client,
-          konnector: { slug: 'ameli' },
-          redirectSlug: 'home',
-          extraParams: { extraParam1: 'extraParamValue' },
-          title: 'popup title',
-          account: { _id: 'someaccountid' },
-          intentsApi
-        })
-
-        expect(isPending(promise)).toBe(true)
-        expect(terminateOAuth).not.toHaveBeenCalled()
-
-        await sleep(100) // lets time to show inAppBrowser before realtime event occurs
-
-        mockCozyRealtime.emitRealtimeEvent(
-          'notified',
-          'io.cozy.accounts',
-          OAUTH_REALTIME_CHANNEL,
-          {
-            _id: 'oauth-popup',
-            data: {
-              error: null,
-              finalLocation: 'connection_id=194&state=someuuid',
-              key: null,
-              oAuthStateKey: 'someuuid'
-            }
-          }
-        )
-        const result = await promise
-        expect(result).toStrictEqual({
-          result: OAUTH_SERVICE_OK,
-          key: null,
-          data: {
-            error: null,
-            finalLocation: 'connection_id=194&state=someuuid',
-            key: null,
-            oAuthStateKey: 'someuuid'
-          }
-        })
-
-        expect(terminateOAuth).toHaveBeenCalled()
-        expect(intentsApi.fetchSessionCode).toHaveBeenCalledTimes(1)
-        expect(intentsApi.showInAppBrowser).toHaveBeenCalled() // TODO test url mock nonce
-        expect(intentsApi.closeInAppBrowser).toHaveBeenCalled()
-      })
-    })
-
     describe('on web', () => {
       beforeEach(() => {
-        isMobileApp.mockReturnValue(false)
         isFlagshipApp.mockReturnValue(false)
       })
 
@@ -251,7 +187,3 @@ describe('OAuthService', () => {
 const isPending = promise => {
   return util.inspect(promise).includes('pending')
 }
-
-function sleep(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms))
-}

package/src/components/Popup.jsx

@@ -1,8 +1,6 @@
 import PropTypes from 'prop-types'
 import { PureComponent } from 'react'
 
-import { isMobileApp } from 'cozy-device-helper'
-
 /**
  * Customized function to get dimensions and position for a centered
  * popup window
@@ -61,23 +59,6 @@ export class Popup extends PureComponent {
     this.killPopup()
   }
 
-  addListeners(popup) {
-    // rest of instructions only on mobile app
-    if (!isMobileApp()) return
-    popup.addEventListener('loadstart', this.handleUrlChange)
-    popup.addEventListener('exit', this.handleClose)
-  }
-
-  removeListeners(popup) {
-    // rest of instructions only if popup is still opened
-    if (popup.closed) return
-
-    // rest of instructions only on mobile app
-    if (!isMobileApp()) return
-    popup.removeEventListener('loadstart', this.handleUrlChange)
-    popup.removeEventListener('exit', this.handleClose)
-  }
-
   handleClose(popup) {
     this.killPopup()
 
@@ -111,14 +92,12 @@ export class Popup extends PureComponent {
       popup.focus()
     }
 
-    this.addListeners(popup)
     this.startMonitoringClosing(popup)
     this.setState({ popup })
   }
 
   killPopup() {
     const { popup } = this.state
-    this.removeListeners(popup)
     this.stopMonitoringClosing()
     if (!popup.closed) popup.close()
   }

package/src/components/PopupService.js

@@ -1,6 +1,4 @@
 // @ts-check
-import { isMobileApp } from 'cozy-device-helper'
-
 import { popupCenter } from './Popup'
 import { windowOpen } from '../helpers/windowWrapper'
 
@@ -17,18 +15,10 @@ import { windowOpen } from '../helpers/windowWrapper'
  * @param {String} options.title - Title of the popup
  * @param {Number} options.width - Width of the popup
  * @param {Number} options.height - Height of the popup
- * @param {Function} options.handleUrlChange - Function to call when popup url changes
  * @param {Function} options.registerRealtime - Function to call to register realtime events
  * @returns {Promise<OpenWindowResult>}
  */
-export function openWindow({
-  url,
-  title,
-  width,
-  height,
-  handleUrlChange,
-  registerRealtime
-}) {
+export function openWindow({ url, title, width, height, registerRealtime }) {
   const { w, h, top, left } = popupCenter(width, height)
   const popup = windowOpen(
     url,
@@ -51,9 +41,6 @@ export function openWindow({
     let checkClosedInterval
     let unregisterRealtime
     const cleanAndResolve = data => {
-      if (handleUrlChange) {
-        removeListeners(popup, handleUrlChange)
-      }
       stopMonitoringClosing(checkClosedInterval)
       if (registerRealtime) {
         unregisterRealtime()
@@ -61,9 +48,6 @@ export function openWindow({
       if (!popup.closed) popup.close()
       resolve(data)
     }
-    if (handleUrlChange) {
-      addListeners(popup, cleanAndResolve, handleUrlChange)
-    }
     if (registerRealtime) {
       unregisterRealtime = registerRealtime(cleanAndResolve)
     }
@@ -107,47 +91,3 @@ function startMonitoringClosing(popup, resolve) {
 function stopMonitoringClosing(checkClosedInterval) {
   clearInterval(checkClosedInterval)
 }
-
-/**
- * Removes all listeners
- *
- * @param {Object} popup - Current popup
- * @param {Function} handleUrlChange - handleUrlChange function not to listen anymore
- * @returns <void>
- */
-function removeListeners(popup, handleUrlChange) {
-  // rest of instructions only if popup is still opened
-  if (popup.closed) return
-
-  // rest of instructions only on mobile app
-  if (!isMobileApp()) return
-  popup.removeEventListener('loadstart', handleUrlChange)
-  popup.removeEventListener('exit', handleClose)
-}
-
-/**
- * Add listeners
- *
- * @param {Object} popup
- * @param {Function} resolve
- * @param {Function} handleUrlChange
- * @returns <void>
- */
-function addListeners(popup, resolve, handleUrlChange) {
-  // rest of instructions only on mobile app
-  if (!isMobileApp()) return
-  popup.addEventListener('loadstart', handleUrlChange(resolve))
-  popup.addEventListener('exit', handleClose(resolve))
-}
-
-/**
- * Function called when the popup is closed
- *
- * @param {Function} resolve
- * @returns {Function}
- */
-function handleClose(resolve) {
-  return popup => {
-    resolve(popup)
-  }
-}

package/src/components/PopupService.spec.js

@@ -2,8 +2,6 @@ import util from 'util'
 
 import { openWindow } from 'components/PopupService'
 
-import { isMobileApp } from 'cozy-device-helper'
-
 import PopupMock from '../helpers/windowWrapperMocks'
 
 const mockPopup = new PopupMock()
@@ -13,14 +11,8 @@ jest.mock('../helpers/windowWrapper', () => ({
   })
 }))
 
-jest.mock('cozy-device-helper', () => ({
-  isMobileApp: jest.fn()
-}))
-
 describe('PopupService', () => {
   describe('openWindow', () => {
-    const handleUrlChange = jest.fn()
-    const handleUrlChangeWrapper = jest.fn().mockReturnValue(handleUrlChange)
     const unregisterRealtime = jest.fn()
     const registerRealtime = jest.fn().mockReturnValue(unregisterRealtime)
 
@@ -32,64 +24,7 @@ describe('PopupService', () => {
       jest.clearAllMocks()
     })
 
-    describe('on Cordova', () => {
-      beforeEach(() => {
-        isMobileApp.mockReturnValue(true)
-      })
-
-      it('should render', async () => {
-        const promise = openWindow({
-          url: 'http://cozy.tools',
-          title: 'SOME_TITLE',
-          width: '20',
-          height: '30',
-          handleUrlChange: handleUrlChangeWrapper
-        })
-
-        expect(mockPopup.focus).toHaveBeenCalled()
-        expect(mockPopup.addEventListener).toHaveBeenCalledWith(
-          'loadstart',
-          expect.anything()
-        )
-        expect(mockPopup.addEventListener).toHaveBeenCalledWith(
-          'exit',
-          expect.anything()
-        )
-
-        expect(isPending(promise)).toBeTruthy()
-
-        mockPopup.emit('exit', { POPUP: 'data' })
-        const result = await promise
-
-        expect(result).toStrictEqual({ POPUP: 'data' })
-      })
-
-      it('should call handUrlChange', async () => {
-        const promise = openWindow({
-          url: 'http://cozy.tools',
-          title: 'SOME_TITLE',
-          width: '20',
-          height: '30',
-          handleUrlChange: handleUrlChangeWrapper
-        })
-
-        expect(isPending(promise)).toBeTruthy()
-
-        mockPopup.emit('loadstart', 'HELLO')
-        expect(handleUrlChangeWrapper).toHaveBeenCalled()
-        expect(handleUrlChange).toHaveBeenCalledWith('HELLO')
-
-        mockPopup.emit('exit', { POPUP: 'data' })
-        const result = await promise
-        expect(result).toStrictEqual({ POPUP: 'data' })
-      })
-    })
-
     describe('on web', () => {
-      beforeEach(() => {
-        isMobileApp.mockReturnValue(false)
-      })
-
       it('should render', async () => {
         const promise = openWindow(
           'http://cozy.tools',
@@ -98,14 +33,6 @@ describe('PopupService', () => {
         )
 
         expect(mockPopup.focus).toHaveBeenCalled()
-        expect(mockPopup.addEventListener).not.toHaveBeenCalledWith(
-          'loadstart',
-          expect.anything()
-        )
-        expect(mockPopup.addEventListener).not.toHaveBeenCalledWith(
-          'exit',
-          expect.anything()
-        )
 
         expect(isPending(promise)).toBeTruthy()
 
@@ -120,7 +47,6 @@ describe('PopupService', () => {
           title: 'SOME_TITLE',
           width: '20',
           height: '30',
-          handleUrlChange: handleUrlChangeWrapper,
           registerRealtime
         })
 
@@ -129,9 +55,6 @@ describe('PopupService', () => {
         expect(registerRealtime).toHaveBeenCalledTimes(1)
         expect(unregisterRealtime).not.toHaveBeenCalled()
 
-        mockPopup.emit('loadstart', 'HELLO')
-        expect(handleUrlChange).not.toHaveBeenCalled()
-
         mockPopup.close()
         const result = await promise
         expect(result).toStrictEqual({ result: 'CLOSED' })