cozy-harvest-lib 7.2.4 → 7.3.2

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.3.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@7.3.1...cozy-harvest-lib@7.3.2) (2022-03-01)
+
+**Note:** Version bump only for package cozy-harvest-lib
+
+
+
+
+
+## [7.3.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@7.3.0...cozy-harvest-lib@7.3.1) (2022-02-23)
+
+
+### Bug Fixes
+
+* **Harvest:** Launch Banking Konnector in manual mode ([082b53d](https://github.com/cozy/cozy-libs/commit/082b53d5048cd5841977422ba298a472ca538a8f))
+
+
+
+
+
+# [7.3.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@7.2.4...cozy-harvest-lib@7.3.0) (2022-02-18)
+
+
+### Bug Fixes
+
+* **deps:** pin dependencies ([e53d065](https://github.com/cozy/cozy-libs/commit/e53d065090224ea340b2c25c3afd14f223f4d119))
+
+
+### Features
+
+* Do not allow multiple accounts with same BI connection ID ([55b5f23](https://github.com/cozy/cozy-libs/commit/55b5f23f0adbc308c3b70fa287c3938ee1b0a4cc))
+
+
+
+
+
 ## [7.2.4](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@7.2.3...cozy-harvest-lib@7.2.4) (2022-02-15)
 
 

package/dist/helpers/konnectors.js

@@ -36,7 +36,8 @@ var TERMS_VERSION_MISMATCH = 'TERMS_VERSION_MISMATCH';
 var UNKNOWN_ERROR = 'UNKNOWN_ERROR';
 var USER_ACTION_NEEDED = 'USER_ACTION_NEEDED';
 var VENDOR_DOWN = 'VENDOR_DOWN';
-var KNOWN_ERRORS = [CHALLENGE_ASKED, DISK_QUOTA_EXCEEDED, LOGIN_FAILED, MAINTENANCE, NOT_EXISTING_DIRECTORY, TERMS_VERSION_MISMATCH, USER_ACTION_NEEDED, VENDOR_DOWN];
+var ACCOUNT_WITH_SAME_IDENTIFIER_ALREADY_DEFINED = 'ACCOUNT_WITH_SAME_IDENTIFIER_ALREADY_DEFINED';
+var KNOWN_ERRORS = [CHALLENGE_ASKED, DISK_QUOTA_EXCEEDED, LOGIN_FAILED, MAINTENANCE, NOT_EXISTING_DIRECTORY, TERMS_VERSION_MISMATCH, USER_ACTION_NEEDED, VENDOR_DOWN, ACCOUNT_WITH_SAME_IDENTIFIER_ALREADY_DEFINED];
 var USER_ERRORS = [CHALLENGE_ASKED, DISK_QUOTA_EXCEEDED, LOGIN_FAILED, NOT_EXISTING_DIRECTORY, USER_ACTION_NEEDED];
 var sanitizeAccountIdentifierRx = /\//g;
 /**

package/dist/locales/en.json

@@ -204,6 +204,10 @@
       "VENDOR_DOWN.LINXO_DOWN": {
         "title": "Unavailable service",
         "description": "It seems that we are experiencing overload with our bank konnectors at the moment. Please rerun the connector later."
+      },
+      "ACCOUNT_WITH_SAME_IDENTIFIER_ALREADY_DEFINED": {
+        "title": "This account already exists",
+        "description": "You already have configured an account with these identifiers."
       }
     }
   },

package/dist/locales/fr.json

@@ -204,6 +204,10 @@
       "VENDOR_DOWN.LINXO_DOWN": {
         "title": "Service non disponible",
         "description": "Il semble que le service [%{name}](%{link}) ne nous ait pas répondu dans les temps. Vous pouvez tenter de le relancer manuellement maintenant ou ultérieurement."
+      },
+      "ACCOUNT_WITH_SAME_IDENTIFIER_ALREADY_DEFINED": {
+        "title": "Ce compte est déjà configuré",
+        "description": "Vous avez déjà configuré un compte avec ces identifiants."
       }
     }
   },

package/dist/services/budget-insight.js

@@ -1,3 +1,4 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
@@ -23,7 +24,9 @@ import get from 'lodash/get';
 import omit from 'lodash/omit';
 import clone from 'lodash/clone';
 import set from 'lodash/set';
+import keyBy from 'lodash/keyBy';
 import defaults from 'lodash/defaults';
+import { Q } from 'cozy-client';
 import { waitForRealtimeEvent } from './jobUtils';
 import { getBIConnection, createBIConnection, updateBIConnection, getBIUserConfig, updateBIUserConfig, setBIConnectionSyncStatus } from './bi-http';
 import assert from '../assert';
@@ -51,7 +54,8 @@ var getBIIdFromContract = function getBIIdFromContract(bankAccount) {
 
 
 var extraBIErrorMap = {
-  config: 'LOGIN_FAILED'
+  config: 'LOGIN_FAILED',
+  ACCOUNT_WITH_SAME_IDENTIFIER_ALREADY_DEFINED: 'ACCOUNT_WITH_SAME_IDENTIFIER_ALREADY_DEFINED'
 };
 /**
  * Converts and chains error
@@ -89,7 +93,7 @@ var createTemporaryToken = /*#__PURE__*/function () {
               mode: 'getTemporaryToken',
               konnector: konnector.slug,
               bankId: cozyBankId
-            });
+            }, {}, true);
 
           case 6:
             jobResponse = _context.sent;
@@ -144,7 +148,7 @@ export var getBIConfig = function getBIConfig(flow) {
 
 export var createOrUpdateBIConnection = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref3) {
-    var account, client, konnector, flow, connId, biConfig, tempToken, config, credentials, credsToSend, biConnection, connection;
+    var account, client, konnector, flow, connId, biConfig, tempToken, config, credentials, credsToSend, biConnection, isUpdate, connection, sameAccount, err;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -212,25 +216,52 @@ export var createOrUpdateBIConnection = /*#__PURE__*/function () {
 
           case 31:
             logger.info('Creating or updating connection...');
-            _context2.next = 34;
-            return connId ? updateBIConnection(config, connId, credsToSend, tempToken) : createBIConnection(config, credsToSend, tempToken);
+            isUpdate = Boolean(connId);
+            _context2.next = 35;
+            return isUpdate ? updateBIConnection(config, connId, credsToSend, tempToken) : createBIConnection(config, credsToSend, tempToken);
 
-          case 34:
+          case 35:
             connection = _context2.sent;
+
+            if (isUpdate) {
+              _context2.next = 44;
+              break;
+            }
+
+            _context2.next = 39;
+            return findAccountWithBiConnection({
+              client: client,
+              konnector: konnector,
+              connectionId: connection.id
+            });
+
+          case 39:
+            sameAccount = _context2.sent;
+
+            if (!sameAccount) {
+              _context2.next = 44;
+              break;
+            }
+
+            err = new KonnectorJobError('ACCOUNT_WITH_SAME_IDENTIFIER_ALREADY_DEFINED');
+            err.accountId = sameAccount._id;
+            throw err;
+
+          case 44:
             logger.info("Created or updated connection ".concat(connection.id));
             return _context2.abrupt("return", connection);
 
-          case 39:
-            _context2.prev = 39;
+          case 48:
+            _context2.prev = 48;
             _context2.t1 = _context2["catch"](15);
             return _context2.abrupt("return", convertBIErrortoKonnectorJobError(_context2.t1));
 
-          case 42:
+          case 51:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[15, 39], [17, 27]]);
+    }, _callee2, null, [[15, 48], [17, 27]]);
   }));
 
   return function createOrUpdateBIConnection(_x2) {
@@ -761,7 +792,64 @@ export var fetchExtraOAuthUrlParams = /*#__PURE__*/function () {
 var shouldResumeConnection = function shouldResumeConnection(error) {
   return error === DECOUPLED_ERROR || error === ADDITIONAL_INFORMATION_NEEDED_ERROR;
 };
+/**
+ * Tries to find an existing account, associated to an existing trigger
+ * with the given bi connection id
+ *
+ * @param  {CozyClient} options.client - Cozy client
+ * @param  {Object} options.konnector - Konnector manifest
+ * @param  {Integer} options.connectionId - BI connection id
+ * @return {Account|null} An account with a trigger with the same identifier if any
+ */
+
+
+export var findAccountWithBiConnection = /*#__PURE__*/function () {
+  var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref21) {
+    var client, konnector, connectionId, _yield$Promise$all, _yield$Promise$all2, accountsResult, triggersResult, accountsIndex, trigger;
+
+    return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+      while (1) {
+        switch (_context11.prev = _context11.next) {
+          case 0:
+            client = _ref21.client, konnector = _ref21.konnector, connectionId = _ref21.connectionId;
+            _context11.next = 3;
+            return Promise.all([client.query(Q('io.cozy.accounts').where({
+              data: {
+                auth: {
+                  bi: {
+                    connId: connectionId
+                  }
+                }
+              }
+            }).indexFields(['data.auth.bi.connId'])), client.query(Q('io.cozy.triggers').where({
+              message: {
+                konnector: konnector.slug
+              }
+            }).indexFields(['message.konnector']))]);
+
+          case 3:
+            _yield$Promise$all = _context11.sent;
+            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
+            accountsResult = _yield$Promise$all2[0];
+            triggersResult = _yield$Promise$all2[1];
+            accountsIndex = keyBy(accountsResult.data, '_id');
+            trigger = triggersResult.data.find(function (t) {
+              return accountsIndex[get(t, 'message.account')];
+            });
+            return _context11.abrupt("return", trigger ? accountsIndex[trigger.message.account] : null);
 
+          case 10:
+          case "end":
+            return _context11.stop();
+        }
+      }
+    }, _callee11);
+  }));
+
+  return function findAccountWithBiConnection(_x12) {
+    return _ref22.apply(this, arguments);
+  };
+}();
 export var konnectorPolicy = {
   name: 'budget-insight',
   match: isBudgetInsightConnector,
@@ -772,5 +860,6 @@ export var konnectorPolicy = {
   fetchExtraOAuthUrlParams: fetchExtraOAuthUrlParams,
   getAdditionalInformationNeeded: getAdditionalInformationNeeded,
   handleOAuthAccount: handleOAuthAccount,
-  setSync: setSync
+  setSync: setSync,
+  findAccountWithBiConnection: findAccountWithBiConnection
 };