cozy-harvest-lib 9.27.2 → 9.28.0

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.28.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.27.2...cozy-harvest-lib@9.28.0) (2022-10-24)
+
+
+### Bug Fixes
+
+* Add useEffect dependencies to useOAuthExtraParams hook ([fb046e4](https://github.com/cozy/cozy-libs/commit/fb046e4034754075a65f5dd4ffd184ba6e180941))
+* Do not depend only on konnector.slug for useEffect dependencies ([65869cf](https://github.com/cozy/cozy-libs/commit/65869cfd154a8e925c6b1ef6ee084883e4484cdf))
+
+
+### Features
+
+* Do not create trigger with full webhooks flag ([8ce5e78](https://github.com/cozy/cozy-libs/commit/8ce5e786e30e48fa46e0d31a912560740c5206a3))
+* Reconnection with BI webviews & webhooks ([591047b](https://github.com/cozy/cozy-libs/commit/591047b0143dab480952d67787451ffeddb57632))
+* Send realtime notifications when expecting a trigger ([b76da3d](https://github.com/cozy/cozy-libs/commit/b76da3d5ec184c6dcc4c2555f92aec6aa523b294))
+* Use BI manage url to update contract synchronization ([fad2994](https://github.com/cozy/cozy-libs/commit/fad2994458e3c0c1f4ee1833855b60ea590fab49))
+
+
+
+
+
 ## [9.27.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.27.1...cozy-harvest-lib@9.27.2) (2022-10-19)
 
 

package/dist/components/FlowProvider.js

@@ -161,6 +161,8 @@ export var FlowProvider = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleLoginSuccess",
     value: function handleLoginSuccess() {
+      var _flow$account;
+
       logger.info('FlowProvider: Handle success');
 
       if (this.state.showTwoFAModal) {
@@ -176,7 +178,7 @@ export var FlowProvider = /*#__PURE__*/function (_Component) {
 
       var triggerLike = _objectSpread({
         message: {
-          account: flow.account._id
+          account: flow === null || flow === void 0 ? void 0 : (_flow$account = flow.account) === null || _flow$account === void 0 ? void 0 : _flow$account._id
         }
       }, flow.trigger);
 

package/dist/components/FlowProvider.spec.js

@@ -14,6 +14,9 @@ var client = {
   on: jest.fn(),
   stackClient: {
     uri: 'https://cozy.tools:8080'
+  },
+  plugins: {
+    realtime: jest.fn()
   }
 };
 var trigger = {

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

@@ -1,6 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+// @ts-check
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { useClient } from 'cozy-client';
@@ -10,6 +11,7 @@ import { findKonnectorPolicy } from '../../../konnector-policies';
 import OAuthWindow from '../../OAuthWindow';
 import withLocales from '../../hoc/withLocales';
 import { intentsApiProptype, innerAccountModalOverridesProptype } from '../../../helpers/proptypes';
+import isEqual from 'lodash/isEqual';
 
 var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
   var konnector = _ref.konnector,
@@ -67,7 +69,8 @@ var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
                 return konnectorPolicy.fetchExtraOAuthUrlParams({
                   client: client,
                   account: account,
-                  konnector: konnector
+                  konnector: konnector,
+                  manage: true
                 });
 
               case 2:
@@ -87,7 +90,7 @@ var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
     if (konnectorPolicy.fetchExtraOAuthUrlParams) {
       handleLinkFetch();
     }
-  }, [konnector.slug, account, client, konnectorPolicy]);
+  }, [konnector, account, client, konnectorPolicy]);
   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, {
@@ -103,7 +106,8 @@ var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
     account: account,
     intentsApi: intentsApi,
     onSuccess: onPopupClosed,
-    onCancel: onPopupClosed
+    onCancel: onPopupClosed,
+    manage: true
   }));
 };
 
@@ -112,5 +116,7 @@ BIContractActivationWindow.propTypes = {
   account: PropTypes.object,
   intentsApi: intentsApiProptype,
   innerAccountModalOverrides: innerAccountModalOverridesProptype
-};
-export default withLocales(BIContractActivationWindow);
+}; // use isEqual to avoid an infinite rerender since the konnector object is a new one on each render
+// when used in the home application
+
+export default /*#__PURE__*/React.memo(withLocales(BIContractActivationWindow), isEqual);

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

@@ -28,10 +28,8 @@ import { deleteAccount } from '../../../connections/accounts';
 import { unshareCipher } from '../../../models/cipherUtils';
 import { findKonnectorPolicy } from '../../../konnector-policies';
 import useSafeState from '../../useSafeState';
-import TriggerErrorInfo from '../../infos/TriggerErrorInfo';
 import { MountPointContext } from '../../MountPointContext';
 import { useTrackPage, useTracker } from '../../hoc/tracking';
-import RedirectToAccountFormButton from '../../RedirectToAccountFormButton';
 import { ContractsForAccount } from './Contracts';
 import { intentsApiProptype, innerAccountModalOverridesProptype } from '../../../helpers/proptypes';
 var tabMobileNavListStyle = {
@@ -95,9 +93,9 @@ var ConfigurationTab = function ConfigurationTab(_ref2) {
       setRequestDeletion = _useState2[1];
 
   var tracker = useTracker();
-  var flowState = flow.getState();
-  var error = flowState.error,
-      running = flowState.running;
+
+  var _flow$getState = flow.getState(),
+      running = _flow$getState.running;
 
   var _useVaultUnlockContex = useVaultUnlockContext(),
       showUnlockForm = _useVaultUnlockContex.showUnlockForm;
@@ -229,17 +227,7 @@ var ConfigurationTab = function ConfigurationTab(_ref2) {
   var konnectorPolicy = findKonnectorPolicy(konnector);
   return /*#__PURE__*/React.createElement("div", {
     className: isMobile ? '' : 'u-pt-1 u-pb-1-half'
-  }, error && /*#__PURE__*/React.createElement("div", {
-    className: isMobile ? 'u-p-1' : 'u-pb-2'
-  }, /*#__PURE__*/React.createElement(TriggerErrorInfo, {
-    error: error,
-    konnector: konnector,
-    trigger: flow.trigger,
-    action: error.isSolvableViaReconnect() ? /*#__PURE__*/React.createElement(RedirectToAccountFormButton, {
-      konnector: konnector,
-      trigger: flow.trigger
-    }) : null
-  })), /*#__PURE__*/React.createElement(NavigationList, {
+  }, /*#__PURE__*/React.createElement(NavigationList, {
     style: isMobile ? tabMobileNavListStyle : null
   }, /*#__PURE__*/React.createElement(NavigationListHeader, null, t('modal.updateAccount.general-subheader')), /*#__PURE__*/React.createElement(NavigationListSection, null, konnector.oauth || konnectorPolicy.isBIWebView ? null : /*#__PURE__*/React.createElement(ListItem, {
     button: true,

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

@@ -13,7 +13,6 @@ import React from 'react';
 import { MountPointProvider } from '../../../components/MountPointContext';
 import { createMockClient } from 'cozy-client/dist/mock';
 import { deleteAccount } from '../../../connections/accounts';
-import { KonnectorJobError } from '../../../helpers/konnectors';
 import AppLike from '../../../../test/AppLike';
 import { VaultProvider, VaultUnlockPlaceholder, VaultUnlockProvider, useVaultClient } from 'cozy-keys-lib';
 import { findKonnectorPolicy } from '../../../konnector-policies';
@@ -128,36 +127,17 @@ describe('ConfigurationTab', function () {
 
     expect(root.getByText('Identifiers')).toBeTruthy();
   });
-  describe('reconnect button', function () {
-    it('should show a reconnect button if error is solvable by reconnecting through form', function () {
-      var _setup2 = setup({
-        checkShouldUnlock: jest.fn().mockResolvedValue(false),
-        trigger: {
-          message: {
-            account: 'account-id-123',
-            konnector: 'konnector-slug'
-          }
-        },
-        flowState: {
-          error: new KonnectorJobError('LOGIN_FAILED')
-        }
-      }),
-          root = _setup2.root;
-
-      expect(root.getByText('Reconnect')).toBeTruthy();
-    });
-  });
   describe('deletion modal', function () {
     it('should display deletion modal when clicking on disconnect this account (vault does not need to be unlocked)', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var _setup3, root, btn, modalText, confirmBtn;
+      var _setup2, root, btn, modalText, confirmBtn;
 
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              _setup3 = setup({
+              _setup2 = setup({
                 checkShouldUnlock: jest.fn().mockResolvedValue(false)
-              }), root = _setup3.root;
+              }), root = _setup2.root;
               useVaultClient.mockReturnValue({
                 isLocked: jest.fn().mockResolvedValue(false)
               });
@@ -198,7 +178,7 @@ describe('ConfigurationTab', function () {
       }, _callee2);
     })));
     it('should display deletion modal when clicking on disconnect this account (vault needs to be unlocked, connector policy does not save in vault)', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-      var _setup4, root, btn, confirmBtn;
+      var _setup3, root, btn, confirmBtn;
 
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
@@ -209,9 +189,9 @@ describe('ConfigurationTab', function () {
                   saveInVault: false
                 };
               });
-              _setup4 = setup({
+              _setup3 = setup({
                 checkShouldUnlock: jest.fn().mockResolvedValue(true)
-              }), root = _setup4.root;
+              }), root = _setup3.root;
               btn = root.getByText('Disconnect this account');
               expect(root.queryByText('Your account will be disconnected, but already imported data will be kept.')).toBeFalsy();
               fireEvent.click(btn);
@@ -245,7 +225,7 @@ describe('ConfigurationTab', function () {
       }, _callee4);
     })));
     xit('should display deletion modal when clicking on disconnect this account (vault needs to be unlocked, connector policy saves in vault)', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-      var _setup5, root, btn, confirmBtn;
+      var _setup4, root, btn, confirmBtn;
 
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
@@ -257,9 +237,9 @@ describe('ConfigurationTab', function () {
               useVaultClient.mockReturnValue({
                 isLocked: jest.fn().mockResolvedValue(true)
               });
-              _setup5 = setup({
+              _setup4 = setup({
                 checkShouldUnlock: jest.fn().mockResolvedValue(true)
-              }), root = _setup5.root;
+              }), root = _setup4.root;
               btn = root.getByText('Disconnect this account');
               expect(root.queryByText('Your account will be disconnected, but already imported data will be kept.')).toBeFalsy();
               fireEvent.click(btn);
@@ -318,12 +298,12 @@ describe('ConfigurationTab', function () {
       isLocked: jest.fn().mockResolvedValue(false)
     });
 
-    var _setup6 = setup({
+    var _setup5 = setup({
       konnector: {
         oauth: true
       }
     }),
-        root = _setup6.root;
+        root = _setup5.root;
 
     expect(root.queryByText('Identifiers')).toBe(null);
   });
@@ -337,14 +317,14 @@ describe('ConfigurationTab', function () {
       isLocked: jest.fn().mockResolvedValue(false)
     });
 
-    var _setup7 = setup({
+    var _setup6 = setup({
       konnector: {
         partnership: {
           domain: 'budget-insight.com'
         }
       }
     }),
-        root = _setup7.root;
+        root = _setup6.root;
 
     expect(root.queryByText('Identifiers')).toBe(null);
   });

package/dist/components/KonnectorConfiguration/DataTab/index.js

@@ -12,12 +12,10 @@ import LaunchTriggerCard from '../../../components/cards/LaunchTriggerCard';
 import KonnectorMaintenance from '../../../components/Maintenance';
 import AppLinkCard from '../../../components/cards/AppLinkCard';
 import WebsiteLinkCard from '../../../components/cards/WebsiteLinkCard';
-import TriggerErrorInfo from '../../../components/infos/TriggerErrorInfo';
 import useMaintenanceStatus from '../../../components/hooks/useMaintenanceStatus';
 import getRelatedAppsSlugs from '../../../models/getRelatedAppsSlugs';
 import appLinksProps from '../../../components/KonnectorConfiguration/DataTab/appLinksProps';
 import { useTrackPage } from '../../../components/hoc/tracking';
-import RedirectToAccountFormButton from '../../RedirectToAccountFormButton';
 import Datacards from '../../Datacards';
 export var DataTab = function DataTab(_ref) {
   var konnector = _ref.konnector,
@@ -31,9 +29,8 @@ export var DataTab = function DataTab(_ref) {
 
   var flowState = flow.getState();
   var error = flowState.error;
-  var hasError = !!error;
   useTrackPage('donnees');
-  var hasTermsVersionMismatchError = hasError && error.isTermsVersionMismatchError();
+  var hasTermsVersionMismatchError = !!error && error.isTermsVersionMismatchError();
   var appLinks = getRelatedAppsSlugs({
     konnectorManifest: konnector,
     trigger: trigger
@@ -59,13 +56,6 @@ export var DataTab = function DataTab(_ref) {
   })), konnectorsModel.hasNewVersionAvailable(konnector) && /*#__PURE__*/React.createElement(KonnectorUpdateInfos, {
     konnector: konnector,
     isBlocking: hasTermsVersionMismatchError
-  }), hasError && !isInMaintenance && /*#__PURE__*/React.createElement(TriggerErrorInfo, {
-    error: error,
-    konnector: konnector,
-    action: error.isSolvableViaReconnect() ? /*#__PURE__*/React.createElement(RedirectToAccountFormButton, {
-      konnector: konnector,
-      trigger: trigger
-    }) : null
   }), /*#__PURE__*/React.createElement(LaunchTriggerCard, {
     flow: flow,
     disabled: isInMaintenance

package/dist/components/KonnectorConfiguration/DataTab.spec.js

@@ -9,7 +9,6 @@ import { shallow } from 'enzyme';
 import { DataTab } from 'components/KonnectorConfiguration/DataTab';
 import LaunchTriggerCard from 'components/cards/LaunchTriggerCard';
 import AppLinkCard from 'components/cards/AppLinkCard';
-import TriggerErrorInfo from 'components/infos/TriggerErrorInfo';
 import KonnectorMaintenance from 'components/Maintenance';
 import useMaintenanceStatus from 'components/hooks/useMaintenanceStatus';
 jest.mock('components/hooks/useMaintenanceStatus');
@@ -70,32 +69,12 @@ describe('DataTab', function () {
     var component = setup();
     expect(component.find(LaunchTriggerCard).length).toEqual(1);
   });
-  it('should show error info', function () {
-    var component = setup({}, {
-      isError: true
-    });
-    expect(component.find(TriggerErrorInfo).length).toEqual(1);
-  });
   it('should show maintenance info', function () {
     var component = setup({}, {
       isInMaintenance: true
     });
     expect(component.find(KonnectorMaintenance).length).toEqual(1);
   });
-  it('should show error info if konnector is not in maintenance', function () {
-    var component = setup({}, {
-      isError: true,
-      isInMaintenance: false
-    });
-    expect(component.find(TriggerErrorInfo).length).toEqual(1);
-  });
-  it('should not show error info if konnector is in maintenance', function () {
-    var component = setup({}, {
-      isError: true,
-      isInMaintenance: true
-    });
-    expect(component.find(TriggerErrorInfo).length).toEqual(0);
-  });
   describe('links to other apps', function () {
     it('should show the link to drive when the konnector saves files', function () {
       var withoutFolder = setup({

package/dist/components/KonnectorConfiguration/KonnectorAccountTabs.js

@@ -2,16 +2,25 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useState, useRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
+import { useClient } from 'cozy-client';
+import flag from 'cozy-flags';
 import { makeStyles } from '@material-ui/core/styles';
 import { Tab as UITab, Tabs } from 'cozy-ui/transpiled/react/MuiTabs';
 import Divider from 'cozy-ui/transpiled/react/MuiCozyTheme/Divider';
 import { useI18n } from 'cozy-ui/transpiled/react/I18n';
 import useBreakpoints from 'cozy-ui/transpiled/react/hooks/useBreakpoints';
 import SwipeableViews from 'react-swipeable-views';
+import Button from 'cozy-ui/transpiled/react/Buttons';
 import useDOMMutations from '../hooks/useDOMMutations';
 import FlowProvider from '../FlowProvider';
 import DataTab from './DataTab';
 import ConfigurationTab from './ConfigurationTab';
+import TriggerErrorInfo from '../infos/TriggerErrorInfo';
+import RedirectToAccountFormButton from '../RedirectToAccountFormButton';
+import useOAuthExtraParams from '../hooks/useOAuthExtraParams';
+import OAuthWindow from '../OAuthWindow';
+import { findKonnectorPolicy } from '../../konnector-policies';
+import useMaintenanceStatus from '../hooks/useMaintenanceStatus';
 import { intentsApiProptype, innerAccountModalOverridesProptype } from '../../helpers/proptypes';
 var tabIndexes = {
   data: 0,
@@ -62,6 +71,10 @@ var DumbKonnectorAccountTabs = function DumbKonnectorAccountTabs(props) {
       flow = props.flow,
       intentsApi = props.intentsApi,
       innerAccountModalOverrides = props.innerAccountModalOverrides;
+  var client = useClient();
+
+  var _useI18n2 = useI18n(),
+      t = _useI18n2.t;
 
   var _useBreakpoints = useBreakpoints(),
       isMobile = _useBreakpoints.isMobile;
@@ -71,6 +84,9 @@ var DumbKonnectorAccountTabs = function DumbKonnectorAccountTabs(props) {
       tab = _useState2[0],
       setTab = _useState2[1];
 
+  var _useMaintenanceStatus = useMaintenanceStatus(client, konnector),
+      isInMaintenance = _useMaintenanceStatus.data.isInMaintenance;
+
   var handleTabChange = function handleTabChange(ev, newTab) {
     return setTab(newTab);
   };
@@ -85,13 +101,62 @@ var DumbKonnectorAccountTabs = function DumbKonnectorAccountTabs(props) {
     return swipeableActions.current.updateHeight();
   }, [swipeableActions]);
   useDOMMutations(nodeRef.current, domMutationsConfig, updateSwiperHeight);
+  var konnectorPolicy = findKonnectorPolicy(konnector);
+
+  var _useOAuthExtraParams = useOAuthExtraParams({
+    account: account,
+    client: client,
+    konnector: konnector,
+    reconnect: true
+  }),
+      extraParams = _useOAuthExtraParams.extraParams;
+
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      showBIWebView = _useState4[0],
+      setShowBIWebView = _useState4[1];
+
+  var hideBIWebView = useCallback(function () {
+    setShowBIWebView(false);
+  }, []);
+  var handleClick = useCallback(function () {
+    setShowBIWebView(true);
+
+    if (flag('harvest.bi.fullwebhooks')) {
+      flow.expectTriggerLaunch();
+    }
+  }, [flow]);
+  var errorActionButton = konnectorPolicy.isBIWebView ? /*#__PURE__*/React.createElement(Button, {
+    className: "u-ml-0",
+    variant: "secondary",
+    label: t('error.reconnect-via-form'),
+    onClick: handleClick,
+    disabled: !extraParams,
+    busy: !extraParams
+  }) : /*#__PURE__*/React.createElement(RedirectToAccountFormButton, {
+    konnector: konnector,
+    trigger: initialTrigger
+  });
   return /*#__PURE__*/React.createElement("div", {
     ref: nodeRef
   }, /*#__PURE__*/React.createElement(KonnectorAccountTabsTabs, {
     tab: tab,
     onChange: handleTabChange,
     flowState: flowState
-  }), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(SwipeableViews, {
+  }), /*#__PURE__*/React.createElement(Divider, null), error && !isInMaintenance && /*#__PURE__*/React.createElement(TriggerErrorInfo, {
+    error: error,
+    konnector: konnector,
+    action: error.isSolvableViaReconnect() ? errorActionButton : null,
+    className: "u-mt-1"
+  }), showBIWebView && /*#__PURE__*/React.createElement(OAuthWindow, {
+    extraParams: extraParams,
+    konnector: konnector,
+    reconnect: true,
+    onSuccess: hideBIWebView,
+    onCancel: hideBIWebView,
+    account: account,
+    intentsApi: intentsApi
+  }), /*#__PURE__*/React.createElement(SwipeableViews, {
     animateHeight: true,
     index: tab,
     disabled: true,