cozy-harvest-lib 8.4.3 → 9.0.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.0.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.4.3...cozy-harvest-lib@9.0.0) (2022-04-29)
+
+
+### Bug Fixes
+
+* Check if we need to display the unlock form ([fe230ce](https://github.com/cozy/cozy-libs/commit/fe230ce0791c511c31098be47e633408bceb9c30))
+* Upgrade cozy-keys-lib requirement ([c4eb57f](https://github.com/cozy/cozy-libs/commit/c4eb57f22b4a86d42c4422619a158605d894edcf))
+* VaultClient can be undefined at first ([8a6f02b](https://github.com/cozy/cozy-libs/commit/8a6f02b9e9c161622afedff88ba4805468ee6f59))
+
+
+### BREAKING CHANGES
+
+* cozy-keys-lib >= 4.1.9 is now
+required.
+
+
+
+
+
 ## [8.4.3](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.4.2...cozy-harvest-lib@8.4.3) (2022-04-28)
 
 **Note:** Version bump only for package cozy-harvest-lib

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

@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { useClient } from 'cozy-client';
 import { Account } from 'cozy-doctypes';
-import { useVaultClient } from 'cozy-keys-lib';
+import { useVaultClient, CozyUtils } from 'cozy-keys-lib';
 import Button from 'cozy-ui/transpiled/react/Button';
 import Spinner from 'cozy-ui/transpiled/react/Spinner';
 import palette from 'cozy-ui/transpiled/react/palette';
@@ -118,7 +118,10 @@ var ConfigurationTab = function ConfigurationTab(_ref2) {
 
               showUnlockForm({
                 closable: true,
-                onUnlock: handleUnlockForDeletion
+                onUnlock: handleUnlockForDeletion,
+                addCheckShouldUnlock: function addCheckShouldUnlock() {
+                  return CozyUtils.checkHasInstalledExtension(client);
+                }
               });
               _context.next = 8;
               break;

package/dist/components/TriggerManager.js

@@ -1,5 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
@@ -9,6 +10,9 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 var _excluded = ["onLaunch", "onSuccess", "onLoginSuccess", "onError", "initialTrigger"],
     _excluded2 = ["vaultUnlockFormProps"];
+
+var _DumbTriggerManager$p;
+
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -24,7 +28,7 @@ import { Account } from 'cozy-doctypes';
 import { translate } from 'cozy-ui/transpiled/react/I18n';
 import Spinner from 'cozy-ui/transpiled/react/Spinner';
 import { ModalBackButton } from 'cozy-ui/transpiled/react/Modal';
-import { CipherType } from 'cozy-keys-lib';
+import { CipherType, withVaultUnlockContext, VaultUnlockPlaceholder, VaultUnlockProvider, useVaultClient, CozyUtils } from 'cozy-keys-lib';
 import AccountForm from './AccountForm';
 import OAuthForm from './OAuthForm';
 import { fetchAccount } from '../connections/accounts';
@@ -34,7 +38,6 @@ import manifest from '../helpers/manifest';
 import logger from '../logger';
 import { findKonnectorPolicy } from '../konnector-policies';
 import withConnectionFlow from '../models/withConnectionFlow';
-import { withVaultUnlockContext, VaultUnlockPlaceholder, VaultUnlockProvider } from 'cozy-keys-lib';
 import HarvestVaultProvider from './HarvestVaultProvider';
 var IDLE = 'IDLE';
 var RUNNING = 'RUNNING';
@@ -301,13 +304,13 @@ export var DumbTriggerManager = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function () {
       var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        var _this$props3, konnector, showUnlockForm, onVaultDismiss, vaultClosable, vaultClient, konnectorPolicy, isVaultLocked;
+        var _this$props3, konnector, showUnlockForm, onVaultDismiss, vaultClosable, vaultClient, client, konnectorPolicy, isVaultLocked;
 
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                _this$props3 = this.props, konnector = _this$props3.konnector, showUnlockForm = _this$props3.showUnlockForm, onVaultDismiss = _this$props3.onVaultDismiss, vaultClosable = _this$props3.vaultClosable, vaultClient = _this$props3.vaultClient;
+                _this$props3 = this.props, konnector = _this$props3.konnector, showUnlockForm = _this$props3.showUnlockForm, onVaultDismiss = _this$props3.onVaultDismiss, vaultClosable = _this$props3.vaultClosable, vaultClient = _this$props3.vaultClient, client = _this$props3.client;
                 konnectorPolicy = findKonnectorPolicy(konnector);
 
                 if (!konnectorPolicy.saveInVault) {
@@ -333,7 +336,10 @@ export var DumbTriggerManager = /*#__PURE__*/function (_Component) {
                   showUnlockForm({
                     onDismiss: onVaultDismiss,
                     closable: vaultClosable,
-                    onUnlock: this.handleVaultUnlock
+                    onUnlock: this.handleVaultUnlock,
+                    addCheckShouldUnlock: function addCheckShouldUnlock() {
+                      return CozyUtils.checkHasInstalledExtension(client);
+                    }
                   });
                 } else {
                   this.handleVaultUnlock();
@@ -561,7 +567,7 @@ export var DumbTriggerManager = /*#__PURE__*/function (_Component) {
 
   return DumbTriggerManager;
 }(Component);
-DumbTriggerManager.propTypes = {
+DumbTriggerManager.propTypes = (_DumbTriggerManager$p = {
   /**
    * Account document. Used to get initial form values.
    * If no account is passed, AccountForm will use empty initial values.
@@ -594,11 +600,29 @@ DumbTriggerManager.propTypes = {
    * Whether the vault will be closable or not.
    * @type {Boolean}
    */
-  vaultClosable: PropTypes.bool
-};
+  vaultClosable: PropTypes.bool,
+
+  /**
+   *
+   */
+  vaultClient: PropTypes.object,
+  client: PropTypes.object,
+  onError: PropTypes.func,
+  showUnlockForm: PropTypes.func
+}, _defineProperty(_DumbTriggerManager$p, "onVaultDismiss", PropTypes.func), _defineProperty(_DumbTriggerManager$p, "error", PropTypes.any), _defineProperty(_DumbTriggerManager$p, "showError", PropTypes.bool), _defineProperty(_DumbTriggerManager$p, "fieldOptions", PropTypes.object), _defineProperty(_DumbTriggerManager$p, "flow", PropTypes.object), _defineProperty(_DumbTriggerManager$p, "flowState", PropTypes.object), _DumbTriggerManager$p);
 var TriggerManager = compose(translate(), withClient, withVaultUnlockContext, withConnectionFlow())(DumbTriggerManager); // TriggerManager is exported wrapped in FlowProvider to avoid breaking changes.
 
 var LegacyTriggerManager = function LegacyTriggerManager(props) {
+  // Since the 4.1.0 of cozy-keys-lib, we
+  // render children even if vaultClient is
+  // not defined yet. In that case we we were
+  // displaying TriggerManager without vaultClient.
+  // It was raising an error.
+  // The current fix, is to not display the
+  // TriggerManager when vaultClient is null.
+  var vaultClient = useVaultClient();
+  if (!vaultClient) return null;
+
   var onLaunch = props.onLaunch,
       onSuccess = props.onSuccess,
       onLoginSuccess = props.onLoginSuccess,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "8.4.3",
+  "version": "9.0.0",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -55,7 +55,7 @@
     "cozy-client": "27.17.0",
     "cozy-device-helper": "^2.0.0",
     "cozy-flags": "^2.8.7",
-    "cozy-keys-lib": "3.8.0",
+    "cozy-keys-lib": "^4.1.9",
     "cozy-realtime": "^4.0.8",
     "cozy-ui": "60.6.0",
     "enzyme": "3.11.0",
@@ -78,12 +78,12 @@
     "cozy-client": ">=27.17.0",
     "cozy-device-helper": ">=1.10.2",
     "cozy-flags": ">=2.3.5",
-    "cozy-keys-lib": ">=3.7.0",
+    "cozy-keys-lib": ">=4.1.9",
     "cozy-realtime": ">=3.12.2",
     "cozy-ui": ">=60.6.0",
     "leaflet": "^1.7.1",
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "cf4a2648a38de3c6c0f0e8546fcf7427a7d2693c"
+  "gitHead": "45955517b20ac0da6a5df0add16a84024eccf791"
 }

package/src/components/AccountForm/index.jsx

@@ -132,7 +132,9 @@ export class AccountForm extends PureComponent {
   handleSubmit(values, form) {
     const { account, konnector } = this.props
 
-    const identifier = manifest.getIdentifier(manifest.sanitizeFields(konnector.fields))
+    const identifier = manifest.getIdentifier(
+      manifest.sanitizeFields(konnector.fields)
+    )
     if (
       account &&
       account.auth[identifier] &&

package/src/components/KonnectorConfiguration/ConfigurationTab/index.jsx

@@ -4,7 +4,7 @@ import cx from 'classnames'
 
 import { useClient } from 'cozy-client'
 import { Account } from 'cozy-doctypes'
-import { useVaultClient } from 'cozy-keys-lib'
+import { useVaultClient, CozyUtils } from 'cozy-keys-lib'
 
 import Button from 'cozy-ui/transpiled/react/Button'
 import Spinner from 'cozy-ui/transpiled/react/Spinner'
@@ -96,7 +96,8 @@ const ConfigurationTab = ({
     if (konnectorPolicy.saveInVault) {
       showUnlockForm({
         closable: true,
-        onUnlock: handleUnlockForDeletion
+        onUnlock: handleUnlockForDeletion,
+        addCheckShouldUnlock: () => CozyUtils.checkHasInstalledExtension(client)
       })
     } else {
       await handleDeleteAccount()

package/src/components/NewAccountModal.spec.jsx

@@ -58,7 +58,9 @@ describe('NewAccountModal', () => {
       </AppLike>
     )
     onLoginSuccessFn(konnectorTrigger)
-    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumber/success')
+    expect(replaceHistory).toHaveBeenCalledWith(
+      '/accounts/accountNumber/success'
+    )
   })
   it('should redirect to route without success on login success for client triggers', () => {
     render(
@@ -85,7 +87,9 @@ describe('NewAccountModal', () => {
       </AppLike>
     )
     onSuccessFn(konnectorTrigger)
-    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumber/success')
+    expect(replaceHistory).toHaveBeenCalledWith(
+      '/accounts/accountNumber/success'
+    )
   })
   it('should redirect to route without success on success for client triggers', () => {
     render(

package/src/components/TriggerManager.jsx

@@ -10,7 +10,14 @@ import { translate } from 'cozy-ui/transpiled/react/I18n'
 import Spinner from 'cozy-ui/transpiled/react/Spinner'
 import { ModalBackButton } from 'cozy-ui/transpiled/react/Modal'
 
-import { CipherType } from 'cozy-keys-lib'
+import {
+  CipherType,
+  withVaultUnlockContext,
+  VaultUnlockPlaceholder,
+  VaultUnlockProvider,
+  useVaultClient,
+  CozyUtils
+} from 'cozy-keys-lib'
 
 import AccountForm from './AccountForm'
 import OAuthForm from './OAuthForm'
@@ -21,11 +28,6 @@ import manifest from '../helpers/manifest'
 import logger from '../logger'
 import { findKonnectorPolicy } from '../konnector-policies'
 import withConnectionFlow from '../models/withConnectionFlow'
-import {
-  withVaultUnlockContext,
-  VaultUnlockPlaceholder,
-  VaultUnlockProvider
-} from 'cozy-keys-lib'
 import HarvestVaultProvider from './HarvestVaultProvider'
 
 const IDLE = 'IDLE'
@@ -210,7 +212,8 @@ export class DumbTriggerManager extends Component {
       showUnlockForm,
       onVaultDismiss,
       vaultClosable,
-      vaultClient
+      vaultClient,
+      client
     } = this.props
     const konnectorPolicy = findKonnectorPolicy(konnector)
     if (konnectorPolicy.saveInVault) {
@@ -224,7 +227,9 @@ export class DumbTriggerManager extends Component {
         showUnlockForm({
           onDismiss: onVaultDismiss,
           closable: vaultClosable,
-          onUnlock: this.handleVaultUnlock
+          onUnlock: this.handleVaultUnlock,
+          addCheckShouldUnlock: () =>
+            CozyUtils.checkHasInstalledExtension(client)
         })
       } else {
         this.handleVaultUnlock()
@@ -410,7 +415,29 @@ DumbTriggerManager.propTypes = {
    * Whether the vault will be closable or not.
    * @type {Boolean}
    */
-  vaultClosable: PropTypes.bool
+  vaultClosable: PropTypes.bool,
+  /**
+   *
+   */
+  vaultClient: PropTypes.object,
+  client: PropTypes.object,
+  onError: PropTypes.func,
+  showUnlockForm: PropTypes.func,
+  onVaultDismiss: PropTypes.func,
+  error: PropTypes.any,
+   /**
+   * Indicates if the AccountForm has to show errors. Sometimes errors may be
+   * displayed elsewhere. However, a KonnectorJobError corresponding to a login
+   * error is always displayed.
+   * @type {Boolean}
+   */
+    showError: PropTypes.bool,
+  /**
+   * Used to have options on fields (forceEncryptedPlaceholder or focus)
+   */
+  fieldOptions: PropTypes.object,
+  flow: PropTypes.object,
+  flowState: PropTypes.object
 }
 
 const TriggerManager = compose(
@@ -422,6 +449,15 @@ const TriggerManager = compose(
 
 // TriggerManager is exported wrapped in FlowProvider to avoid breaking changes.
 const LegacyTriggerManager = props => {
+  // Since the 4.1.0 of cozy-keys-lib, we
+  // render children even if vaultClient is
+  // not defined yet. In that case we we were
+  // displaying TriggerManager without vaultClient.
+  // It was raising an error.
+  // The current fix, is to not display the
+  // TriggerManager when vaultClient is null.
+  const vaultClient = useVaultClient()
+  if (!vaultClient) return null
   const {
     onLaunch,
     onSuccess,

package/src/models/ConnectionFlow.js

@@ -594,7 +594,7 @@ export class ConnectionFlow {
     }
   }
 
-  watchJob(options = {autoSuccessTimer: false}) {
+  watchJob(options = { autoSuccessTimer: false }) {
     this.realtime.subscribe(
       'updated',
       JOBS_DOCTYPE,

package/src/models/ConnectionFlow.spec.js

@@ -8,7 +8,9 @@ import {
   launchTrigger
 } from '../connections/triggers'
 import CozyRealtime from 'cozy-realtime'
-import KonnectorJobWatcher, { watchKonnectorJob } from './konnector/KonnectorJobWatcher'
+import KonnectorJobWatcher, {
+  watchKonnectorJob
+} from './konnector/KonnectorJobWatcher'
 import { konnectorPolicy as biKonnectorPolicy } from '../services/budget-insight'
 import fixtures from '../../test/fixtures'
 import sentryHub from '../sentry'
@@ -118,14 +120,13 @@ describe('ConnectionFlow', () => {
       return flow.getState().running === true
     }
     beforeAll(() => {
-      watchKonnectorJob.mockReturnValue({on: () => ({})})
+      watchKonnectorJob.mockReturnValue({ on: () => ({}) })
     })
 
     afterEach(() => {
       jest.clearAllMocks()
     })
 
-
     it('should render as submitting when there is no account', async () => {
       const { flow } = setup()
       const submitPromise = setupSubmit(flow)
@@ -327,7 +328,7 @@ describe('ConnectionFlow', () => {
   describe('ensureTriggerAndLaunch', () => {
     beforeAll(() => {
       jest.spyOn(cronHelpers, 'fromFrequency').mockReturnValue('0 0 0 * * 0')
-      watchKonnectorJob.mockReturnValue({on: () => ({})})
+      watchKonnectorJob.mockReturnValue({ on: () => ({}) })
     })
 
     afterEach(() => {
@@ -494,7 +495,7 @@ describe('ConnectionFlow', () => {
 
   describe('constructor', () => {
     beforeAll(() => {
-      watchKonnectorJob.mockReturnValue({on: () => ({})})
+      watchKonnectorJob.mockReturnValue({ on: () => ({}) })
     })
 
     afterEach(() => {
@@ -502,8 +503,12 @@ describe('ConnectionFlow', () => {
     })
 
     it('should watch a running trigger', () => {
-      setup({trigger: fixtures.runningTrigger})
-      expect(watchKonnectorJob).toHaveBeenCalledWith(expect.any(Object), {_id: 'runningjobid'}, {autoSuccessTimer: false})
+      setup({ trigger: fixtures.runningTrigger })
+      expect(watchKonnectorJob).toHaveBeenCalledWith(
+        expect.any(Object),
+        { _id: 'runningjobid' },
+        { autoSuccessTimer: false }
+      )
     })
   })
 })