cozy-harvest-lib 9.25.0 → 9.26.2

package/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.26.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.26.1...cozy-harvest-lib@9.26.2) (2022-08-26)
+
+**Note:** Version bump only for package cozy-harvest-lib
+
+
+
+
+
+## [9.26.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.26.0...cozy-harvest-lib@9.26.1) (2022-08-22)
+
+
+### Bug Fixes
+
+* RefreshContracts now updates contracts in realtime ([463e716](https://github.com/cozy/cozy-libs/commit/463e7169d78ce633308229257bd262d01842fdc1))
+
+
+
+
+
+# [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)
 
 

package/README.md

@@ -141,7 +141,7 @@ const client = new CozyClient({
 
 ReactDOM.render(
   <CozyProvider client={client}>
-    <Query query={()=> Q('io.cozy.apps').getById('my-konnector-id')}>
+    <Query query={()=> Q('io.cozy.konnectors').getById('my-konnector-id')}>
       {({ data: konnector }) => (
         <TriggerManager
           konnector={konnector}

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),
@@ -44,38 +42,13 @@ var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
   };
 
   useEffect(function () {
-    function refreshContracts() {
-      return _refreshContracts.apply(this, arguments);
-    }
-
-    function _refreshContracts() {
-      _refreshContracts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return konnectorPolicy.refreshContracts({
-                  client: client,
-                  account: account,
-                  konnector: konnector
-                });
-
-              case 2:
-                setShouldRefreshContracts(false);
-
-              case 3:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-      return _refreshContracts.apply(this, arguments);
-    }
-
     if (shouldRefreshContracts) {
-      refreshContracts();
+      setShouldRefreshContracts(false);
+      konnectorPolicy.refreshContracts({
+        client: client,
+        account: account,
+        konnector: konnector
+      });
     }
   }, [account, client, konnectorPolicy, shouldRefreshContracts, konnector]);
   useEffect(function () {
@@ -84,56 +57,54 @@ var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
     }
 
     function _handleLinkFetch() {
-      _handleLinkFetch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      _handleLinkFetch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var result;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context.prev = _context.next) {
               case 0:
-                _context2.next = 2;
-                return konnectorPolicy.fetchContractSynchronizationUrl({
+                _context.next = 2;
+                return konnectorPolicy.fetchExtraOAuthUrlParams({
                   client: client,
                   account: account,
                   konnector: konnector
                 });
 
               case 2:
-                result = _context2.sent;
-                setInitialUrl(result);
+                result = _context.sent;
+                setExtraParams(result);
 
               case 4:
               case "end":
-                return _context2.stop();
+                return _context.stop();
             }
           }
-        }, _callee2);
+        }, _callee);
       }));
       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

@@ -68,10 +68,10 @@ export var OAuthForm = /*#__PURE__*/function (_PureComponent) {
 
 
         konnectorPolicy.fetchExtraOAuthUrlParams({
-          flow: flow,
           account: account,
           konnector: konnector,
-          client: client
+          client: client,
+          reconnect: reconnect
         }).then(this.handleExtraParams);
       }
 

package/dist/components/OAuthForm.spec.js

@@ -69,7 +69,6 @@ describe('OAuthForm', function () {
         }
       },
       client: undefined,
-      flow: flow,
       konnector: {
         slug: 'test-konnector'
       }