cozy-harvest-lib 9.24.3 → 9.26.0

package/CHANGELOG.md

@@ -3,6 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.26.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.25.0...cozy-harvest-lib@9.26.0) (2022-08-22)
+
+
+### Features
+
+* Detect reconnect explicitely ([b092392](https://github.com/cozy/cozy-libs/commit/b0923923727bdb08123bd78073a0dda238361f02))
+* Handle cas with multiple bank ids ([9729626](https://github.com/cozy/cozy-libs/commit/97296267e941265a08ad052f1e5a62c3830566f2))
+* Use BI account creation webview to handle accounts synchonization ([1b5e5ff](https://github.com/cozy/cozy-libs/commit/1b5e5ff06b6c98b14d0d8c388d31970ae36bfac0))
+
+
+
+
+
+# [9.25.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.24.4...cozy-harvest-lib@9.25.0) (2022-08-05)
+
+
+### Bug Fixes
+
+* Let OAuthForm component decide when to remove the OAuth window ([59a132f](https://github.com/cozy/cozy-libs/commit/59a132f71d528cb311d436041951aaae811aed6e))
+
+
+### Features
+
+* Close OAuthWindow only on login success ([a8cf6a3](https://github.com/cozy/cozy-libs/commit/a8cf6a37a9c76bf2702c1d73d292a4d337f7dc5a))
+
+
+
+
+
+## [9.24.4](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.24.3...cozy-harvest-lib@9.24.4) (2022-08-05)
+
+
+### Bug Fixes
+
+* Remove a reconnection step ([05d2cb6](https://github.com/cozy/cozy-libs/commit/05d2cb674d9ce69164cf0a099059520cbf4f1722))
+* Remove unused request to BI connection ([be09798](https://github.com/cozy/cozy-libs/commit/be09798e3c551fd9628d15e6f79b9de77b3d1aa5))
+
+
+
+
+
 ## [9.24.3](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.24.2...cozy-harvest-lib@9.24.3) (2022-08-01)
 
 

package/dist/components/KonnectorConfiguration/ConfigurationTab/BIContractActivationWindow.spec.js

@@ -4,15 +4,14 @@ import React from 'react';
 import CozyClient from 'cozy-client';
 import { render, fireEvent, act, waitFor } from '@testing-library/react';
 import AppLike from '../../../../test/AppLike';
-import BIContractActivationWindow from './BiContractActivationWindow';
-var fetchContractSynchronizationUrl = jest.fn();
+var fetchExtraOAuthUrlParams = jest.fn();
 var refreshContracts = jest.fn();
 jest.mock('../../../konnector-policies', function () {
   return {
     findKonnectorPolicy: jest.fn()
   };
 });
-jest.mock('cozy-ui/transpiled/react/Popup', function () {
+jest.mock('../../Popup', function () {
   return jest.fn().mockImplementation(function (_ref) {
     var onClose = _ref.onClose;
     setTimeout(onClose, 1);
@@ -26,14 +25,18 @@ jest.mock('../../InAppBrowser', function () {
     return null;
   });
 });
+jest.mock('../../../helpers/oauth');
+jest.mock('cozy-realtime');
 jest.mock('cozy-device-helper');
+import BIContractActivationWindow from './BiContractActivationWindow';
 import { findKonnectorPolicy } from '../../../konnector-policies';
-import Popup from 'cozy-ui/transpiled/react/Popup';
+import Popup from '../../Popup';
 import InAppBrowser from '../../InAppBrowser';
 import { isFlagshipApp } from 'cozy-device-helper';
+import { prepareOAuth } from '../../../helpers/oauth';
 findKonnectorPolicy.mockImplementation(function () {
   return {
-    fetchContractSynchronizationUrl: fetchContractSynchronizationUrl,
+    fetchExtraOAuthUrlParams: fetchExtraOAuthUrlParams,
     refreshContracts: refreshContracts
   };
 });
@@ -66,12 +69,17 @@ describe('BIContractActivationWindow', function () {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
+            prepareOAuth.mockImplementation(function () {
+              return {
+                oAuthUrl: 'https://test.url'
+              };
+            });
             isFlagshipApp.mockImplementation(function () {
               return false;
             });
-            fetchContractSynchronizationUrl.mockResolvedValue('bi url');
+            fetchExtraOAuthUrlParams.mockResolvedValue({});
             _setup = setup(), getByRole = _setup.getByRole;
-            _context3.next = 5;
+            _context3.next = 6;
             return act( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
               return _regeneratorRuntime.wrap(function _callee$(_context) {
                 while (1) {
@@ -90,8 +98,8 @@ describe('BIContractActivationWindow', function () {
               }, _callee);
             })));
 
-          case 5:
-            _context3.next = 7;
+          case 6:
+            _context3.next = 8;
             return act( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
               return _regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) {
@@ -111,14 +119,14 @@ describe('BIContractActivationWindow', function () {
               }, _callee2);
             })));
 
-          case 7:
-            expect(fetchContractSynchronizationUrl).toHaveBeenCalled();
+          case 8:
+            expect(fetchExtraOAuthUrlParams).toHaveBeenCalled();
             expect(refreshContracts).toHaveBeenCalledTimes(1);
             expect(Popup).toHaveBeenCalledWith(expect.objectContaining({
-              initialUrl: 'bi url'
-            }), expect.anything());
+              url: 'https://test.url'
+            }), {});
 
-          case 10:
+          case 11:
           case "end":
             return _context3.stop();
         }
@@ -135,9 +143,14 @@ describe('BIContractActivationWindow', function () {
             isFlagshipApp.mockImplementation(function () {
               return true;
             });
-            fetchContractSynchronizationUrl.mockResolvedValue('bi url');
+            prepareOAuth.mockImplementation(function () {
+              return {
+                oAuthUrl: 'https://testiab.url'
+              };
+            });
+            fetchExtraOAuthUrlParams.mockResolvedValue({});
             _setup2 = setup(), getByRole = _setup2.getByRole;
-            _context6.next = 5;
+            _context6.next = 6;
             return act( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
               return _regeneratorRuntime.wrap(function _callee4$(_context4) {
                 while (1) {
@@ -156,8 +169,8 @@ describe('BIContractActivationWindow', function () {
               }, _callee4);
             })));
 
-          case 5:
-            _context6.next = 7;
+          case 6:
+            _context6.next = 8;
             return act( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
               return _regeneratorRuntime.wrap(function _callee5$(_context5) {
                 while (1) {
@@ -177,14 +190,14 @@ describe('BIContractActivationWindow', function () {
               }, _callee5);
             })));
 
-          case 7:
-            expect(fetchContractSynchronizationUrl).toHaveBeenCalled();
+          case 8:
+            expect(fetchExtraOAuthUrlParams).toHaveBeenCalled();
             expect(refreshContracts).toHaveBeenCalledTimes(1);
             expect(InAppBrowser).toHaveBeenCalledWith(expect.objectContaining({
-              url: 'bi url'
+              url: 'https://testiab.url'
             }), expect.anything());
 
-          case 10:
+          case 11:
           case "end":
             return _context6.stop();
         }

package/dist/components/KonnectorConfiguration/ConfigurationTab/BiContractActivationWindow.js

@@ -5,11 +5,9 @@ import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { useClient } from 'cozy-client';
 import Button from 'cozy-ui/transpiled/react/MuiCozyTheme/Buttons';
-import Popup from 'cozy-ui/transpiled/react/Popup';
 import ListItem from 'cozy-ui/transpiled/react/MuiCozyTheme/ListItem';
 import { findKonnectorPolicy } from '../../../konnector-policies';
-import { isFlagshipApp } from 'cozy-device-helper';
-import InAppBrowser from '../../InAppBrowser';
+import OAuthWindow from '../../OAuthWindow';
 import withLocales from '../../hoc/withLocales';
 import { intentsApiProptype, innerAccountModalOverridesProptype } from '../../../helpers/proptypes';
 
@@ -22,8 +20,8 @@ var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
 
   var _useState = useState(null),
       _useState2 = _slicedToArray(_useState, 2),
-      initialUrl = _useState2[0],
-      setInitialUrl = _useState2[1];
+      extraParams = _useState2[0],
+      setExtraParams = _useState2[1];
 
   var _useState3 = useState(false),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -91,7 +89,7 @@ var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 _context2.next = 2;
-                return konnectorPolicy.fetchContractSynchronizationUrl({
+                return konnectorPolicy.fetchExtraOAuthUrlParams({
                   client: client,
                   account: account,
                   konnector: konnector
@@ -99,7 +97,7 @@ var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
 
               case 2:
                 result = _context2.sent;
-                setInitialUrl(result);
+                setExtraParams(result);
 
               case 4:
               case "end":
@@ -111,29 +109,27 @@ var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
       return _handleLinkFetch.apply(this, arguments);
     }
 
-    if (konnectorPolicy.fetchContractSynchronizationUrl) {
+    if (konnectorPolicy.fetchExtraOAuthUrlParams) {
       handleLinkFetch();
     }
   }, [konnector.slug, account, client, konnectorPolicy]);
-  if (!konnectorPolicy.fetchContractSynchronizationUrl) return null;
+  if (!konnectorPolicy.fetchExtraOAuthUrlParams) return null;
   var ButtonWrapper = innerAccountModalOverrides !== null && innerAccountModalOverrides !== void 0 && innerAccountModalOverrides.SyncButtonWrapperComp ? innerAccountModalOverrides.SyncButtonWrapperComp : React.Fragment;
   return /*#__PURE__*/React.createElement(ListItem, null, /*#__PURE__*/React.createElement(ButtonWrapper, null, /*#__PURE__*/React.createElement(Button, {
     variant: "text",
     color: "primary",
-    disabled: !initialUrl,
+    disabled: !extraParams,
     onClick: function onClick() {
       return setWindowVisible(true);
     }
-  }, t('contracts.handle-synchronization'))), isWindowVisible && (isFlagshipApp() || intentsApi ? /*#__PURE__*/React.createElement(InAppBrowser, {
-    url: initialUrl,
-    onClose: onPopupClosed,
-    intentsApi: intentsApi
-  }) : /*#__PURE__*/React.createElement(Popup, {
-    initialUrl: initialUrl,
-    width: "800",
-    height: "800",
-    onClose: onPopupClosed
-  })));
+  }, t('contracts.handle-synchronization'))), isWindowVisible && /*#__PURE__*/React.createElement(OAuthWindow, {
+    extraParams: extraParams,
+    konnector: konnector,
+    account: account,
+    intentsApi: intentsApi,
+    onSuccess: onPopupClosed,
+    onCancel: onPopupClosed
+  }));
 };
 
 BIContractActivationWindow.propTypes = {

package/dist/components/OAuthForm.js

@@ -19,7 +19,7 @@ import withLocales from './hoc/withLocales';
 import { findKonnectorPolicy } from '../konnector-policies';
 import { intentsApiProptype } from '../helpers/proptypes';
 import TriggerErrorInfo from './infos/TriggerErrorInfo';
-import { ERROR_EVENT } from '../models/flowEvents';
+import { ERROR_EVENT, LOGIN_SUCCESS_EVENT } from '../models/flowEvents';
 import { KonnectorJobError } from '../helpers/konnectors';
 /**
  * The OAuth Form is responsible for displaying a form for OAuth konnectors. It
@@ -41,9 +41,8 @@ export var OAuthForm = /*#__PURE__*/function (_PureComponent) {
     _this.handleConnect = _this.handleConnect.bind(_assertThisInitialized(_this));
     _this.handleOAuthCancel = _this.handleOAuthCancel.bind(_assertThisInitialized(_this));
     _this.handleExtraParams = _this.handleExtraParams.bind(_assertThisInitialized(_this));
-    _this.state = {
-      showingOAuthModal: false
-    };
+    _this.handleLoginSuccess = _this.handleLoginSuccess.bind(_assertThisInitialized(_this));
+    _this.state = {};
     return _this;
   }
 
@@ -54,21 +53,34 @@ export var OAuthForm = /*#__PURE__*/function (_PureComponent) {
           account = _this$props.account,
           konnector = _this$props.konnector,
           flow = _this$props.flow,
-          client = _this$props.client;
+          client = _this$props.client,
+          reconnect = _this$props.reconnect;
       var konnectorPolicy = findKonnectorPolicy(konnector);
 
       if (konnectorPolicy.fetchExtraOAuthUrlParams) {
         this.setState({
           needExtraParams: true
-        }); // eslint-disable-next-line promise/catch-or-return
+        });
+
+        if (reconnect) {
+          this.showOAuthWindow();
+        } // eslint-disable-next-line promise/catch-or-return
+
 
         konnectorPolicy.fetchExtraOAuthUrlParams({
-          flow: flow,
           account: account,
           konnector: konnector,
-          client: client
+          client: client,
+          reconnect: reconnect
         }).then(this.handleExtraParams);
       }
+
+      flow.on(LOGIN_SUCCESS_EVENT, this.handleLoginSuccess);
+    }
+  }, {
+    key: "handleLoginSuccess",
+    value: function handleLoginSuccess() {
+      this.hideOAuthWindow();
     }
   }, {
     key: "handleExtraParams",
@@ -81,7 +93,6 @@ export var OAuthForm = /*#__PURE__*/function (_PureComponent) {
     key: "handleAccountId",
     value: function handleAccountId(accountId) {
       var onSuccess = this.props.onSuccess;
-      this.hideOAuthWindow();
       if (typeof onSuccess === 'function') onSuccess(accountId);
     }
   }, {
@@ -89,6 +100,12 @@ export var OAuthForm = /*#__PURE__*/function (_PureComponent) {
     value: function handleConnect() {
       this.showOAuthWindow();
     }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      var flow = this.props.flow;
+      flow.removeListener(LOGIN_SUCCESS_EVENT, this.handleLoginSuccess);
+    }
     /**
      *  Translates errors from oauth redirection url to harvest know error messages
      *
@@ -149,14 +166,14 @@ export var OAuthForm = /*#__PURE__*/function (_PureComponent) {
         className: "u-mb-1",
         error: error,
         konnector: konnector
-      }), /*#__PURE__*/React.createElement(Button, {
+      }), !reconnect && /*#__PURE__*/React.createElement(Button, {
         className: "u-mt-1",
         busy: isBusy,
         disabled: isBusy,
         extension: "full",
         label: t(buttonLabel),
         onClick: this.handleConnect
-      }), showOAuthWindow && /*#__PURE__*/React.createElement(OAuthWindow, {
+      }), showOAuthWindow && extraParams && /*#__PURE__*/React.createElement(OAuthWindow, {
         extraParams: extraParams,
         konnector: konnector,
         reconnect: reconnect,

package/dist/components/OAuthForm.spec.js

@@ -4,11 +4,13 @@ import { shallow } from 'enzyme';
 import { OAuthForm } from 'components/OAuthForm';
 import { findKonnectorPolicy } from '../konnector-policies';
 import { KonnectorJobError } from '../helpers/konnectors';
+import ConnectionFlow from '../models/ConnectionFlow';
 jest.mock('../konnector-policies', function () {
   return {
     findKonnectorPolicy: jest.fn()
   };
 });
+jest.mock('../models/ConnectionFlow');
 var fetchExtraOAuthUrlParams = jest.fn();
 fetchExtraOAuthUrlParams.mockResolvedValue({});
 findKonnectorPolicy.mockReturnValue({
@@ -22,17 +24,20 @@ var fixtures = {
     slug: 'test-konnector'
   }
 };
+var flow = new ConnectionFlow();
 describe('OAuthForm', function () {
   it('should render', function () {
     var component = shallow( /*#__PURE__*/React.createElement(OAuthForm, {
+      flow: flow,
       flowState: {},
       konnector: fixtures.konnector,
       t: t
     })).getElement();
     expect(component).toMatchSnapshot();
   });
-  it('should render reconnect button when updating an account', function () {
+  it('should bypass reconnect button when updating an account', function () {
     var component = shallow( /*#__PURE__*/React.createElement(OAuthForm, {
+      flow: flow,
       flowState: {},
       account: {
         oauth: {
@@ -47,6 +52,7 @@ describe('OAuthForm', function () {
   });
   it('should call policy fetchExtraOAuthUrlParams with proper params', function () {
     shallow( /*#__PURE__*/React.createElement(OAuthForm, {
+      flow: flow,
       flowState: {},
       account: {
         oauth: {
@@ -63,7 +69,6 @@ describe('OAuthForm', function () {
         }
       },
       client: undefined,
-      flow: undefined,
       konnector: {
         slug: 'test-konnector'
       }
@@ -71,6 +76,7 @@ describe('OAuthForm', function () {
   });
   it('should handle oauth cancelation', function () {
     var component = shallow( /*#__PURE__*/React.createElement(OAuthForm, {
+      flow: flow,
       flowState: {
         error: new KonnectorJobError('OAUTH_CANCELED')
       },

package/dist/components/OAuthWindow.js

@@ -133,9 +133,6 @@ export var OAuthWindow = /*#__PURE__*/function (_PureComponent) {
         succeed: true
       });
       if (typeof onSuccess !== 'function') return;
-      this.setState({
-        succeed: true
-      });
       onSuccess(data.key);
     }
     /**
@@ -200,10 +197,8 @@ export var OAuthWindow = /*#__PURE__*/function (_PureComponent) {
       var _this$props3 = this.props,
           t = _this$props3.t,
           intentsApi = _this$props3.intentsApi;
-      var _this$state = this.state,
-          oAuthUrl = _this$state.oAuthUrl,
-          succeed = _this$state.succeed;
-      return oAuthUrl && !succeed && (!isFlagshipApp() && !intentsApi ? /*#__PURE__*/React.createElement(Popup, {
+      var oAuthUrl = this.state.oAuthUrl;
+      return oAuthUrl && (!isFlagshipApp() && !intentsApi ? /*#__PURE__*/React.createElement(Popup, {
         url: oAuthUrl,
         height: OAUTH_POPUP_HEIGHT,
         width: OAUTH_POPUP_WIDTH,

package/dist/components/__snapshots__/OAuthForm.spec.js.snap

@@ -1,5 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`OAuthForm should bypass reconnect button when updating an account 1`] = `<React.Fragment />`;
+
 exports[`OAuthForm should handle oauth cancelation 1`] = `
 <React.Fragment>
   <withI18n(withClient(withKonnectorLocales(TriggerErrorInfo))
@@ -34,16 +36,3 @@ exports[`OAuthForm should render 1`] = `
   />
 </React.Fragment>
 `;
-
-exports[`OAuthForm should render reconnect button when updating an account 1`] = `
-<React.Fragment>
-  <DefaultButton
-    busy={true}
-    className="u-mt-1"
-    disabled={true}
-    extension="full"
-    label="oauth.reconnect.label"
-    onClick={[Function]}
-  />
-</React.Fragment>
-`;