cozy-harvest-lib 9.24.2 → 9.25.0

package/CHANGELOG.md

@@ -3,6 +3,45 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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)
+
+
+### Bug Fixes
+
+* **node:** Upgrade to Node 16 ([3a82521](https://github.com/cozy/cozy-libs/commit/3a825217b4a55d6434b20660d73df44ab17e7bd0))
+
+
+
+
+
 ## [9.24.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.24.1...cozy-harvest-lib@9.24.2) (2022-07-29)
 
 

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

@@ -79,7 +79,7 @@ describe('BIContractActivationWindow', function () {
                     case 0:
                       _context.next = 2;
                       return waitFor(function () {
-                        expect(getByRole('button').getAttribute('class')).not.toContain('Mui-disabled');
+                        return expect(getByRole('button').getAttribute('class')).not.toContain('Mui-disabled');
                       });
 
                     case 2:
@@ -100,7 +100,7 @@ describe('BIContractActivationWindow', function () {
                       fireEvent.click(getByRole('button'));
                       _context2.next = 3;
                       return waitFor(function () {
-                        expect(refreshContracts).toHaveBeenCalled();
+                        return expect(refreshContracts).toHaveBeenCalled();
                       });
 
                     case 3:
@@ -145,7 +145,7 @@ describe('BIContractActivationWindow', function () {
                     case 0:
                       _context4.next = 2;
                       return waitFor(function () {
-                        expect(getByRole('button').getAttribute('class')).not.toContain('Mui-disabled');
+                        return expect(getByRole('button').getAttribute('class')).not.toContain('Mui-disabled');
                       });
 
                     case 2:
@@ -166,7 +166,7 @@ describe('BIContractActivationWindow', function () {
                       fireEvent.click(getByRole('button'));
                       _context5.next = 3;
                       return waitFor(function () {
-                        expect(refreshContracts).toHaveBeenCalled();
+                        return expect(refreshContracts).toHaveBeenCalled();
                       });
 
                     case 3:

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

@@ -149,7 +149,6 @@ var EditContract = function EditContract(props) {
                   } // eslint-disable-next-line no-console
 
 
-                  // eslint-disable-next-line no-console
                   console.error(err);
                   Alerter.error(t('contractForm.failure'));
                 }

package/dist/components/KonnectorModal.spec.js

@@ -86,9 +86,9 @@ describe('KonnectorModal', function () {
         switch (_context.prev = _context.next) {
           case 0:
             _setup = setup(), root = _setup.root;
-            waitFor(function () {
+            return _context.abrupt("return", waitFor(function () {
               return root.getByRole('progressbar');
-            });
+            }));
 
           case 2:
           case "end":

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,13 +53,19 @@ 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,
@@ -69,6 +74,13 @@ export var OAuthForm = /*#__PURE__*/function (_PureComponent) {
           client: client
         }).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,7 @@ describe('OAuthForm', function () {
         }
       },
       client: undefined,
-      flow: undefined,
+      flow: flow,
       konnector: {
         slug: 'test-konnector'
       }
@@ -71,6 +77,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>
-`;

package/dist/components/{KonnectorUpdateInfos.spec.js → infos/KonnectorUpdateInfos.spec.js}

@@ -3,8 +3,21 @@ import _extends from "@babel/runtime/helpers/extends";
 /* eslint-env jest */
 import React from 'react';
 import { render } from '@testing-library/react';
-import AppLike from '../../test/AppLike';
-import KonnectorUpdateInfos from 'components/infos/KonnectorUpdateInfos'; // Default props
+import AppLike from '../../../test/AppLike';
+import KonnectorUpdateInfos from 'components/infos/KonnectorUpdateInfos';
+jest.mock('../KonnectorUpdateLinker', function () {
+  return function (_ref) {
+    var konnector = _ref.konnector,
+        label = _ref.label,
+        isBlocking = _ref.isBlocking;
+    return /*#__PURE__*/React.createElement("div", {
+      "data-testtid": "KonnectorUpdateLinker",
+      "data-label": label,
+      "data-konnector": konnector,
+      "data-is-blocking": isBlocking
+    });
+  };
+}); // Default props
 
 var intents = {
   redirect: jest.fn()

package/dist/services/biWebView.js

@@ -1,9 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-var _excluded = ["code"],
-    _excluded2 = ["code"];
+var _excluded = ["code"];
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
@@ -23,13 +22,13 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  *
  * - Deals with the konnector to get temporary tokens
  */
-import { getBIConnection, getBIConnectionAccountsList } from './bi-http';
+import { getBIConnectionAccountsList } from './bi-http';
 import assert from '../assert';
 import logger from '../logger';
 import { Q } from 'cozy-client'; // @ts-ignore (its a peerDep and I don't know how to configure ts for that)
 
 import flag from 'cozy-flags';
-import { setBIConnectionId, saveBIConfig, findAccountWithBiConnection, convertBIErrortoKonnectorJobError, isBudgetInsightConnector, getBIConnectionIdFromAccount } from './budget-insight';
+import { setBIConnectionId, findAccountWithBiConnection, convertBIErrortoKonnectorJobError, isBudgetInsightConnector, getBIConnectionIdFromAccount } from './budget-insight';
 import { KonnectorJobError } from '../helpers/konnectors';
 import { waitForRealtimeEvent } from './jobUtils';
 import '../types';
@@ -48,76 +47,56 @@ export var isBiWebViewConnector = function isBiWebViewConnector(konnector) {
 /**
  * Runs multiple checks on the bi connection referenced in the given account
  * @param {object} options
- * @param {IoCozyAccount} options.account The account content
+ * @param {number} options.connId The BI connection identifier
  * @param {KonnectorManifest} options.konnector konnector manifest content
- * @param {ConnectionFlow} options.flow The flow
  * @param {CozyClient} options.client CozyClient object
  *
- * @return {Promise<biConnection>} Connection Id
+ * @return {Promise}
+ * @throws KonnectorJobError
  */
 
 export var checkBIConnection = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
-    var account, client, konnector, flow, connId, biConfig, tempToken, config, connection, sameAccount, err;
+    var connId, client, konnector, sameAccount, err;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            account = _ref.account, client = _ref.client, konnector = _ref.konnector, flow = _ref.flow;
+            connId = _ref.connId, client = _ref.client, konnector = _ref.konnector;
             _context.prev = 1;
-            connId = getWebviewBIConnectionId(account);
             logger.info('Creating temporary token...');
-            _context.next = 6;
-            return createTemporaryToken({
-              client: client,
-              konnector: konnector,
-              account: account
-            });
-
-          case 6:
-            biConfig = _context.sent;
-            saveBIConfig(flow, biConfig);
-            tempToken = biConfig.code, config = _objectWithoutProperties(biConfig, _excluded);
-            logger.info('Created temporary token');
-            assert(tempToken, 'No temporary token');
-            logger.info("fetch connection ".concat(connId, "..."));
-            _context.next = 14;
-            return getBIConnection(config, connId, tempToken);
-
-          case 14:
-            connection = _context.sent;
-            _context.next = 17;
+            _context.next = 5;
             return findAccountWithBiConnection({
               client: client,
               konnector: konnector,
-              connectionId: connection.id
+              connectionId: connId
             });
 
-          case 17:
+          case 5:
             sameAccount = _context.sent;
 
             if (!sameAccount) {
-              _context.next = 21;
+              _context.next = 9;
               break;
             }
 
             err = new KonnectorJobError('ACCOUNT_WITH_SAME_IDENTIFIER_ALREADY_DEFINED');
             throw err;
 
-          case 21:
-            return _context.abrupt("return", connection);
+          case 9:
+            return _context.abrupt("return");
 
-          case 24:
-            _context.prev = 24;
+          case 12:
+            _context.prev = 12;
             _context.t0 = _context["catch"](1);
             return _context.abrupt("return", convertBIErrortoKonnectorJobError(_context.t0));
 
-          case 27:
+          case 15:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[1, 24]]);
+    }, _callee, null, [[1, 12]]);
   }));
 
   return function checkBIConnection(_x) {
@@ -170,7 +149,7 @@ export var fetchContractSynchronizationUrl = /*#__PURE__*/function () {
  * @param {CozyClient} options.client CozyClient object
  * @param {Boolean} options.reconnect If this is a reconnexion
  * @param {Function} options.t Translation fonction
- * @return {Promise<Number>} Connection Id
+ * @return {Promise<Number|null>} Connection Id
  */
 
 export var handleOAuthAccount = /*#__PURE__*/function () {
@@ -295,7 +274,7 @@ var getWebviewBIConnectionId = function getWebviewBIConnectionId(account) {
 
 export var onBIAccountCreation = /*#__PURE__*/function () {
   var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref7) {
-    var fullAccount, client, flow, konnector, account, biConnection, updatedAccount;
+    var fullAccount, client, flow, konnector, account, connId, updatedAccount;
     return _regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
@@ -306,30 +285,33 @@ export var onBIAccountCreation = /*#__PURE__*/function () {
 
           case 3:
             account = _context4.sent;
-            _context4.next = 6;
+            connId = getWebviewBIConnectionId(account);
+
+            if (!(connId === null)) {
+              _context4.next = 7;
+              break;
+            }
+
+            throw new Error('onBIAccountCreation: bi connection id should not be null on creation');
+
+          case 7:
+            _context4.next = 9;
             return checkBIConnection({
-              account: _objectSpread(_objectSpread({}, fullAccount), {}, {
-                _id: account._id
-              }),
+              connId: connId,
               client: client,
-              konnector: konnector,
-              flow: flow
+              konnector: konnector
             });
 
-          case 6:
-            biConnection = _context4.sent;
-            flow.setData({
-              biConnection: biConnection
-            });
-            _context4.next = 10;
-            return flow.saveAccount(setBIConnectionId(account, biConnection.id));
+          case 9:
+            _context4.next = 11;
+            return flow.saveAccount(setBIConnectionId(account, connId));
 
-          case 10:
+          case 11:
             updatedAccount = _context4.sent;
             flow.triggerEvent(LOGIN_SUCCESS_EVENT);
             return _context4.abrupt("return", updatedAccount);
 
-          case 13:
+          case 14:
           case "end":
             return _context4.stop();
         }
@@ -479,7 +461,7 @@ export var refreshContracts = /*#__PURE__*/function () {
 
           case 3:
             biConfig = _context6.sent;
-            code = biConfig.code, config = _objectWithoutProperties(biConfig, _excluded2);
+            code = biConfig.code, config = _objectWithoutProperties(biConfig, _excluded);
             connectionId = getWebviewBIConnectionId(account);
             _context6.next = 8;
             return getBIConnectionAccountsList(config, connectionId, code);