cozy-harvest-lib 9.1.1 → 9.2.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.2.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.1.2...cozy-harvest-lib@9.2.0) (2022-05-09)
+
+
+### Features
+
+* Add BI connection creation via BI webview ([35ea078](https://github.com/cozy/cozy-libs/commit/35ea07805b5604d7882051bc0f7b43b38516922f))
+* Unit tests + comments ([93e960e](https://github.com/cozy/cozy-libs/commit/93e960ee3236df742b8665d4d79cf6cf675d4f8f))
+
+
+
+
+
+## 9.1.2 (2022-05-05)
+
+**Note:** Version bump only for package cozy-harvest-lib
+
+
+
+
+
 ## [9.1.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.1.0...cozy-harvest-lib@9.1.1) (2022-05-02)
 
 

package/dist/components/TriggerManager.js

@@ -522,8 +522,9 @@ export var DumbTriggerManager = /*#__PURE__*/function (_Component) {
       var showSpinner = submitting && selectedCipher && step === 'ciphersList';
       var showCiphersList = step === 'ciphersList';
       var showAccountForm = step === 'accountForm';
+      var konnectorPolicy = findKonnectorPolicy(konnector);
 
-      if (oauth) {
+      if (oauth || konnectorPolicy.isBIWebView) {
         return /*#__PURE__*/React.createElement(OAuthForm, {
           client: client,
           flow: flow,

package/dist/helpers/oauth.js

@@ -88,7 +88,7 @@ export var handleOAuthResponse = function handleOAuthResponse() {
  * @param  {string} cozyUrl cozy url
  * @param  {string} accountType connector slug
  * @param  {string} oAuthStateKey localStorage key
- * @param  {Object} oAuthConf connector manifest oauth configuration
+ * @param  {Object} [oAuthConf={}]  connector manifest oauth configuration
  * @param  {string} redirectSlug The app we want to redirect the user on after the end of the flow
  * @param  {string} nonce unique nonce string
  * @param  {Object} extraParams some extra parameters to add to the query string
@@ -98,7 +98,8 @@ export var getOAuthUrl = function getOAuthUrl(_ref) {
   var cozyUrl = _ref.cozyUrl,
       accountType = _ref.accountType,
       oAuthStateKey = _ref.oAuthStateKey,
-      oAuthConf = _ref.oAuthConf,
+      _ref$oAuthConf = _ref.oAuthConf,
+      oAuthConf = _ref$oAuthConf === void 0 ? {} : _ref$oAuthConf,
       nonce = _ref.nonce,
       redirectSlug = _ref.redirectSlug,
       extraParams = _ref.extraParams;

package/dist/konnector-policies.js

@@ -1,5 +1,6 @@
 import logger from './logger';
 import { konnectorPolicy as biKonnectorPolicy } from './services/budget-insight';
+import { konnectorPolicy as biWebViewPolicy } from './services/biWebView';
 var defaultKonnectorPolicy = {
   accountContainsAuth: true,
   saveInVault: true,
@@ -9,7 +10,7 @@ var defaultKonnectorPolicy = {
   },
   name: 'default'
 };
-var policies = [biKonnectorPolicy, defaultKonnectorPolicy].filter(Boolean);
+var policies = [biWebViewPolicy, biKonnectorPolicy, defaultKonnectorPolicy].filter(Boolean);
 logger.info('Available konnector policies', policies);
 export var findKonnectorPolicy = function findKonnectorPolicy(konnector) {
   var policy = policies.find(function (policy) {

package/dist/services/biWebView.js

@@ -0,0 +1,271 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+var _excluded = ["code"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+
+/**
+ * Interface between Budget Insight and Cozy using BI's webview
+ *
+ * - Deals with the konnector to get temporary tokens
+ */
+import { getBIConnection } from './bi-http';
+import assert from '../assert';
+import logger from '../logger';
+import flag from 'cozy-flags';
+import { fetchExtraOAuthUrlParams, createTemporaryToken, setBIConnectionId, saveBIConfig, findAccountWithBiConnection, convertBIErrortoKonnectorJobError, isBudgetInsightConnector } from './budget-insight';
+import { KonnectorJobError } from '../helpers/konnectors';
+export var isBiWebViewConnector = function isBiWebViewConnector(konnector) {
+  return flag('harvest.bi.webview') && isBudgetInsightConnector(konnector);
+};
+/**
+ * Runs multiple checks on the bi connection referenced in the given account
+ *
+ * @param {io.cozy.accounts} options.account The account content
+ * @param {ConnectionFlow} options.flow
+ * @param {io.cozy.konnectors} options.konnector connector manifest content
+ * @param {CozyClient} options.client CozyClient object
+ *
+ * @return {Integer} Connection Id
+ */
+
+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;
+    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;
+            _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;
+            return findAccountWithBiConnection({
+              client: client,
+              konnector: konnector,
+              connectionId: connection.id
+            });
+
+          case 17:
+            sameAccount = _context.sent;
+
+            if (!sameAccount) {
+              _context.next = 22;
+              break;
+            }
+
+            err = new KonnectorJobError('ACCOUNT_WITH_SAME_IDENTIFIER_ALREADY_DEFINED');
+            err.accountId = sameAccount._id;
+            throw err;
+
+          case 22:
+            return _context.abrupt("return", connection);
+
+          case 25:
+            _context.prev = 25;
+            _context.t0 = _context["catch"](1);
+            return _context.abrupt("return", convertBIErrortoKonnectorJobError(_context.t0));
+
+          case 28:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[1, 25]]);
+  }));
+
+  return function checkBIConnection(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+/**
+ * Handles webview connection
+ *
+ * @param {io.cozy.accounts} options.account The account content
+ * @param {ConnectionFlow} options.flow
+ * @param {io.cozy.konnectors} options.konnector connector manifest content
+ * @param {CozyClient} options.client CozyClient object
+ *
+ * @return {Integer} Connection Id
+ */
+
+export var handleOAuthAccount = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref3) {
+    var account, flow, konnector, client, t, cozyBankId, biWebviewAccount, connectionId;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            account = _ref3.account, flow = _ref3.flow, konnector = _ref3.konnector, client = _ref3.client, t = _ref3.t;
+            cozyBankId = getCozyBankId({
+              konnector: konnector,
+              account: account
+            });
+            biWebviewAccount = _objectSpread(_objectSpread({}, account), cozyBankId ? {
+              auth: {
+                bankId: cozyBankId
+              }
+            } : {});
+            connectionId = getWebviewBIConnectionId(biWebviewAccount);
+
+            if (!connectionId) {
+              _context2.next = 12;
+              break;
+            }
+
+            logger.info("Found a BI webview connection id: ".concat(connectionId));
+            flow.konnector = konnector;
+            _context2.next = 9;
+            return flow.saveAccount(setBIConnectionId(biWebviewAccount, connectionId));
+
+          case 9:
+            biWebviewAccount = _context2.sent;
+            _context2.next = 12;
+            return flow.handleFormSubmit({
+              client: client,
+              account: biWebviewAccount,
+              konnector: konnector,
+              t: t
+            });
+
+          case 12:
+            return _context2.abrupt("return", connectionId);
+
+          case 13:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+
+  return function handleOAuthAccount(_x2) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+/**
+ * Gets BI webview connection id which is returned in the account by the stack
+ * via oauth callback url
+ *
+ * @param {io.cozy.accounts} The account content created by the stack
+ *
+ * @return {Integer} Connection Id
+ */
+
+var getWebviewBIConnectionId = function getWebviewBIConnectionId(account) {
+  var _account$oauth, _account$oauth$query, _account$oauth$query$;
+
+  return Number((account === null || account === void 0 ? void 0 : (_account$oauth = account.oauth) === null || _account$oauth === void 0 ? void 0 : (_account$oauth$query = _account$oauth.query) === null || _account$oauth$query === void 0 ? void 0 : (_account$oauth$query$ = _account$oauth$query.connection_id) === null || _account$oauth$query$ === void 0 ? void 0 : _account$oauth$query$[0]) || null);
+};
+/**
+ * Hook from ConnectionFlow after account creation
+ *
+ * @param {io.cozy.accounts} options.account - created account
+ * @param {io.cozy.konnectors} options.konnector  - manifest of the konnector for which the account is created
+ * @param {ConnectionFlow} options.flow - current ConnectionFlow instance
+ * @param {CozyClient} options.client - current CozyClient instance
+ *
+ * @returns {Promise<io.cozy.accounts>}
+ */
+
+
+export var onBIAccountCreation = /*#__PURE__*/function () {
+  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref5) {
+    var fullAccount, client, flow, konnector, account, biConnection;
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            fullAccount = _ref5.account, client = _ref5.client, flow = _ref5.flow, konnector = _ref5.konnector;
+            _context3.next = 3;
+            return flow.saveAccount(fullAccount);
+
+          case 3:
+            account = _context3.sent;
+            _context3.next = 6;
+            return checkBIConnection({
+              account: _objectSpread(_objectSpread({}, fullAccount), {}, {
+                _id: account._id
+              }),
+              client: client,
+              konnector: konnector,
+              flow: flow
+            });
+
+          case 6:
+            biConnection = _context3.sent;
+            flow.setData({
+              biConnection: biConnection
+            });
+            _context3.next = 10;
+            return flow.saveAccount(setBIConnectionId(account, biConnection.id));
+
+          case 10:
+            return _context3.abrupt("return", _context3.sent);
+
+          case 11:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+
+  return function onBIAccountCreation(_x3) {
+    return _ref6.apply(this, arguments);
+  };
+}();
+/**
+ * Finds the current bankIid in a given konnector or account
+ *
+ * @param {io.cozy.accounts} options.account The account content
+ * @param {io.cozy.konnectors} options.konnector connector manifest content
+ */
+
+export var getCozyBankId = function getCozyBankId(_ref7) {
+  var _konnector$parameters, _account$auth;
+
+  var konnector = _ref7.konnector,
+      account = _ref7.account;
+  var cozyBankId = (konnector === null || konnector === void 0 ? void 0 : (_konnector$parameters = konnector.parameters) === null || _konnector$parameters === void 0 ? void 0 : _konnector$parameters.bankId) || (account === null || account === void 0 ? void 0 : (_account$auth = account.auth) === null || _account$auth === void 0 ? void 0 : _account$auth.bankId);
+
+  if (!cozyBankId) {
+    logger.error('Could not find any bank id');
+  }
+
+  return cozyBankId;
+};
+export var konnectorPolicy = {
+  isBIWebView: true,
+  name: 'budget-insight-webview',
+  match: isBiWebViewConnector,
+  saveInVault: false,
+  onAccountCreation: onBIAccountCreation,
+  fetchExtraOAuthUrlParams: fetchExtraOAuthUrlParams,
+  handleOAuthAccount: handleOAuthAccount
+};

package/dist/services/biWebView.spec.js

@@ -0,0 +1,314 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import CozyClient from 'cozy-client';
+import { handleOAuthAccount, checkBIConnection, isBiWebViewConnector } from './biWebView';
+import ConnectionFlow from '../models/ConnectionFlow';
+import { waitForRealtimeEvent } from './jobUtils';
+import biPublicKeyProd from './bi-public-key-prod.json';
+import flag from 'cozy-flags';
+jest.mock('./bi-http', function () {
+  return {
+    createBIConnection: jest.fn().mockResolvedValue({
+      text: Promise.resolve('{}')
+    }),
+    updateBIConnection: jest.fn(),
+    getBIConnection: jest.fn()
+  };
+});
+import { getBIConnection } from './bi-http';
+jest.mock('cozy-logger', function () {
+  return {
+    namespace: function namespace() {
+      return function () {};
+    }
+  };
+});
+jest.mock('./jobUtils', function () {
+  return {
+    waitForRealtimeEvent: jest.fn()
+  };
+});
+
+var sleep = function sleep(duration) {
+  return new Promise(function (resolve) {
+    return setTimeout(resolve, duration);
+  });
+};
+
+var TEST_BANK_COZY_ID = '100000';
+var konnector = {
+  slug: 'boursorama83',
+  parameters: {
+    bankId: TEST_BANK_COZY_ID
+  },
+  partnership: {
+    domain: 'https://budget-insight.com'
+  }
+};
+var account = {
+  _id: '1337'
+};
+describe('handleOAuthAccount', function () {
+  it('should handle bi webview authentication if any connection is found in the account', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var client, flow, account, t;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            client = new CozyClient({
+              uri: 'http://testcozy.mycozy.cloud'
+            });
+            flow = new ConnectionFlow(client, null, konnector);
+            flow.account = account;
+            flow.handleFormSubmit = jest.fn();
+
+            flow.saveAccount = /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(account) {
+                return _regeneratorRuntime.wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        return _context.abrupt("return", account);
+
+                      case 1:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee);
+              }));
+
+              return function (_x) {
+                return _ref2.apply(this, arguments);
+              };
+            }();
+
+            account = {
+              oauth: {
+                query: {
+                  connection_id: ['12']
+                }
+              }
+            };
+            t = jest.fn();
+            _context2.next = 9;
+            return handleOAuthAccount({
+              account: account,
+              flow: flow,
+              client: client,
+              konnector: konnector,
+              t: t
+            });
+
+          case 9:
+            expect(flow.handleFormSubmit).toHaveBeenCalledWith({
+              client: client,
+              konnector: konnector,
+              t: t,
+              account: _objectSpread(_objectSpread(_objectSpread({}, account), {
+                auth: {
+                  bankId: TEST_BANK_COZY_ID
+                }
+              }), {
+                data: {
+                  auth: {
+                    bi: {
+                      connId: 12
+                    }
+                  }
+                }
+              })
+            });
+
+          case 10:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  })));
+});
+describe('checkBIConnection', function () {
+  var setup = function setup() {
+    var client = new CozyClient({
+      uri: 'http://testcozy.mycozy.cloud'
+    });
+    var flow = new ConnectionFlow(client, {
+      konnector: konnector,
+      account: account
+    });
+    client.stackClient.jobs.create = jest.fn().mockReturnValue({
+      data: {
+        attributes: {
+          _id: 'job-id-1337'
+        }
+      }
+    });
+    waitForRealtimeEvent.mockImplementation( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              sleep(2);
+              return _context3.abrupt("return", {
+                data: {
+                  result: {
+                    mode: 'prod',
+                    url: 'https://cozy.biapi.pro/2.0',
+                    publicKey: biPublicKeyProd,
+                    code: 'bi-temporary-access-token-145613'
+                  }
+                }
+              });
+
+            case 2:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    })));
+    jest.spyOn(client, 'query').mockImplementation( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        while (1) {
+          switch (_context4.prev = _context4.next) {
+            case 0:
+              return _context4.abrupt("return", {
+                data: []
+              });
+
+            case 1:
+            case "end":
+              return _context4.stop();
+          }
+        }
+      }, _callee4);
+    })));
+    return {
+      client: client,
+      flow: flow
+    };
+  };
+
+  it('should refuse to create an account with a bi connection id which already exists', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+    var _setup, client, flow, account, konnector;
+
+    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+      while (1) {
+        switch (_context6.prev = _context6.next) {
+          case 0:
+            _setup = setup(), client = _setup.client, flow = _setup.flow;
+            getBIConnection.mockReset().mockResolvedValue({
+              id: 12
+            });
+            account = {};
+            konnector = {
+              slug: 'bankingconnectortest',
+              parameters: {
+                bankId: TEST_BANK_COZY_ID
+              }
+            };
+            jest.spyOn(flow, 'saveAccount').mockImplementation(function (account) {
+              return _objectSpread({
+                _id: 'created-account-id'
+              }, account);
+            });
+            jest.spyOn(client, 'query').mockImplementation( /*#__PURE__*/function () {
+              var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref6) {
+                var doctype;
+                return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+                  while (1) {
+                    switch (_context5.prev = _context5.next) {
+                      case 0:
+                        doctype = _ref6.doctype;
+
+                        if (!(doctype === 'io.cozy.accounts')) {
+                          _context5.next = 5;
+                          break;
+                        }
+
+                        return _context5.abrupt("return", {
+                          data: [{
+                            _id: 'account_id',
+                            auth: {
+                              bi: {
+                                connId: 12
+                              }
+                            }
+                          }]
+                        });
+
+                      case 5:
+                        if (!(doctype === 'io.cozy.triggers')) {
+                          _context5.next = 9;
+                          break;
+                        }
+
+                        return _context5.abrupt("return", {
+                          data: [{
+                            message: {
+                              account: 'account_id'
+                            }
+                          }]
+                        });
+
+                      case 9:
+                        throw new Error('unexpected doctype ' + doctype);
+
+                      case 10:
+                      case "end":
+                        return _context5.stop();
+                    }
+                  }
+                }, _callee5);
+              }));
+
+              return function (_x2) {
+                return _ref7.apply(this, arguments);
+              };
+            }());
+            _context6.next = 8;
+            return expect(checkBIConnection({
+              client: client,
+              flow: flow,
+              account: account,
+              konnector: konnector
+            })).rejects.toEqual(new Error('ACCOUNT_WITH_SAME_IDENTIFIER_ALREADY_DEFINED'));
+
+          case 8:
+          case "end":
+            return _context6.stop();
+        }
+      }
+    }, _callee6);
+  })));
+});
+describe('isBiWebViewConnector', function () {
+  var BIConnector = {
+    slug: 'biconnector',
+    partnership: {
+      domain: 'budget-insight.com'
+    }
+  };
+  var notBIConnector = {
+    slug: 'otherconnector'
+  };
+  it('should return true if the connector is a BI connector and if the  "harvest.bi.webview" is activated', function () {
+    flag('harvest.bi.webview', true);
+    expect(isBiWebViewConnector(BIConnector)).toEqual(true);
+  });
+  it('should return false if the connector is not a BI connector', function () {
+    flag('harvest.bi.webview', true);
+    expect(isBiWebViewConnector(notBIConnector)).toEqual(false);
+  });
+  it('should return false if the "harvest.bi.webview" flag is not activated', function () {
+    flag('harvest.bi.webview', false);
+    expect(isBiWebViewConnector(BIConnector)).toEqual(false);
+  });
+});

package/dist/services/budget-insight.js

@@ -61,7 +61,7 @@ var extraBIErrorMap = {
  * Converts and chains error
  */
 
-var convertBIErrortoKonnectorJobError = function convertBIErrortoKonnectorJobError(error) {
+export var convertBIErrortoKonnectorJobError = function convertBIErrortoKonnectorJobError(error) {
   var errorCode = error ? error.code : null;
   var cozyErrorMessage = errorCode ? biErrorMap[errorCode] || extraBIErrorMap[errorCode] || null : null;
   var errorMessage = cozyErrorMessage || (errorCode ? "UNKNOWN_ERROR.".concat(errorCode) : 'UNKNOWN_ERROR');
@@ -69,12 +69,12 @@ var convertBIErrortoKonnectorJobError = function convertBIErrortoKonnectorJobErr
   err.original = error;
   throw err;
 };
-
 export var isBudgetInsightConnector = function isBudgetInsightConnector(konnector) {
-  return konnector.partnership && konnector.partnership.domain.includes('budget-insight');
-};
+  var _konnector$partnershi;
 
-var createTemporaryToken = /*#__PURE__*/function () {
+  return (konnector === null || konnector === void 0 ? void 0 : (_konnector$partnershi = konnector.partnership) === null || _konnector$partnershi === void 0 ? void 0 : _konnector$partnershi.domain) === 'budget-insight.com';
+};
+export var createTemporaryToken = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
     var client, konnector, account, cozyBankId, jobResponse, event;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -116,7 +116,6 @@ var createTemporaryToken = /*#__PURE__*/function () {
     return _ref2.apply(this, arguments);
   };
 }();
-
 export var saveBIConfig = function saveBIConfig(flow, biConfig) {
   return flow.setData({
     biConfig: biConfig
@@ -281,9 +280,6 @@ export var setBIConnectionId = function setBIConnectionId(originalAccount, biCon
   set(account, 'data.auth.bi.connId', biConnectionId);
   return account;
 };
-export var getBIConnectionId = function getBIConnectionId(account) {
-  return get(account, 'data.auth.bi.connId');
-};
 /**
  * Handles webauth connection
  *

package/dist/services/budget-insight.spec.js

@@ -90,7 +90,7 @@ var konnector = {
     bankId: TEST_BANK_COZY_ID
   },
   partnership: {
-    domain: 'https://budget-insight.com'
+    domain: 'budget-insight.com'
   }
 };
 var konnectorWithoutParam = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "9.1.1",
+  "version": "9.2.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-intent": "^1.17.1",
+    "cozy-intent": "^1.17.2",
     "cozy-keys-lib": "^4.1.9",
     "cozy-realtime": "^4.0.8",
     "cozy-ui": "60.6.0",
@@ -87,5 +87,5 @@
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "319a9e20bf7917c13c6efbde897e849837cfa5bf"
+  "gitHead": "a07bb44357ebb8ad18b7e16419a634c42c416a0d"
 }

package/src/components/TriggerManager.jsx

@@ -326,8 +326,9 @@ export class DumbTriggerManager extends Component {
     const showSpinner = submitting && selectedCipher && step === 'ciphersList'
     const showCiphersList = step === 'ciphersList'
     const showAccountForm = step === 'accountForm'
+    const konnectorPolicy = findKonnectorPolicy(konnector)
 
-    if (oauth) {
+    if (oauth || konnectorPolicy.isBIWebView) {
       return (
         <OAuthForm
           client={client}

package/src/helpers/oauth.js

@@ -92,7 +92,7 @@ export const handleOAuthResponse = (options = {}) => {
  * @param  {string} cozyUrl cozy url
  * @param  {string} accountType connector slug
  * @param  {string} oAuthStateKey localStorage key
- * @param  {Object} oAuthConf connector manifest oauth configuration
+ * @param  {Object} [oAuthConf={}]  connector manifest oauth configuration
  * @param  {string} redirectSlug The app we want to redirect the user on after the end of the flow
  * @param  {string} nonce unique nonce string
  * @param  {Object} extraParams some extra parameters to add to the query string
@@ -101,7 +101,7 @@ export const getOAuthUrl = ({
   cozyUrl,
   accountType,
   oAuthStateKey,
-  oAuthConf,
+  oAuthConf = {},
   nonce,
   redirectSlug,
   extraParams

package/src/konnector-policies.js

@@ -1,5 +1,6 @@
 import logger from './logger'
 import { konnectorPolicy as biKonnectorPolicy } from './services/budget-insight'
+import { konnectorPolicy as biWebViewPolicy } from './services/biWebView'
 
 const defaultKonnectorPolicy = {
   accountContainsAuth: true,
@@ -9,7 +10,11 @@ const defaultKonnectorPolicy = {
   name: 'default'
 }
 
-const policies = [biKonnectorPolicy, defaultKonnectorPolicy].filter(Boolean)
+const policies = [
+  biWebViewPolicy,
+  biKonnectorPolicy,
+  defaultKonnectorPolicy
+].filter(Boolean)
 
 logger.info('Available konnector policies', policies)
 

package/src/services/biWebView.js

@@ -0,0 +1,192 @@
+/**
+ * Interface between Budget Insight and Cozy using BI's webview
+ *
+ * - Deals with the konnector to get temporary tokens
+ */
+
+import { getBIConnection } from './bi-http'
+import assert from '../assert'
+import logger from '../logger'
+import flag from 'cozy-flags'
+import {
+  fetchExtraOAuthUrlParams,
+  createTemporaryToken,
+  setBIConnectionId,
+  saveBIConfig,
+  findAccountWithBiConnection,
+  convertBIErrortoKonnectorJobError,
+  isBudgetInsightConnector
+} from './budget-insight'
+import { KonnectorJobError } from '../helpers/konnectors'
+
+export const isBiWebViewConnector = konnector =>
+  flag('harvest.bi.webview') && isBudgetInsightConnector(konnector)
+
+/**
+ * Runs multiple checks on the bi connection referenced in the given account
+ *
+ * @param {io.cozy.accounts} options.account The account content
+ * @param {ConnectionFlow} options.flow
+ * @param {io.cozy.konnectors} options.konnector connector manifest content
+ * @param {CozyClient} options.client CozyClient object
+ *
+ * @return {Integer} Connection Id
+ */
+export const checkBIConnection = async ({
+  account,
+  client,
+  konnector,
+  flow
+}) => {
+  try {
+    let connId = getWebviewBIConnectionId(account)
+
+    logger.info('Creating temporary token...')
+
+    const biConfig = await createTemporaryToken({
+      client,
+      konnector,
+      account
+    })
+    saveBIConfig(flow, biConfig)
+
+    const { code: tempToken, ...config } = biConfig
+
+    logger.info('Created temporary token')
+    assert(tempToken, 'No temporary token')
+
+    logger.info(`fetch connection ${connId}...`)
+
+    const connection = await getBIConnection(config, connId, tempToken)
+
+    const sameAccount = await findAccountWithBiConnection({
+      client,
+      konnector,
+      connectionId: connection.id
+    })
+    if (sameAccount) {
+      const err = new KonnectorJobError(
+        'ACCOUNT_WITH_SAME_IDENTIFIER_ALREADY_DEFINED'
+      )
+      err.accountId = sameAccount._id
+      throw err
+    }
+    return connection
+  } catch (err) {
+    return convertBIErrortoKonnectorJobError(err)
+  }
+}
+
+/**
+ * Handles webview connection
+ *
+ * @param {io.cozy.accounts} options.account The account content
+ * @param {ConnectionFlow} options.flow
+ * @param {io.cozy.konnectors} options.konnector connector manifest content
+ * @param {CozyClient} options.client CozyClient object
+ *
+ * @return {Integer} Connection Id
+ */
+export const handleOAuthAccount = async ({
+  account,
+  flow,
+  konnector,
+  client,
+  t
+}) => {
+  const cozyBankId = getCozyBankId({ konnector, account })
+  let biWebviewAccount = {
+    ...account,
+    ...(cozyBankId ? { auth: { bankId: cozyBankId } } : {})
+  }
+
+  const connectionId = getWebviewBIConnectionId(biWebviewAccount)
+
+  if (connectionId) {
+    logger.info(`Found a BI webview connection id: ${connectionId}`)
+    flow.konnector = konnector
+    biWebviewAccount = await flow.saveAccount(
+      setBIConnectionId(biWebviewAccount, connectionId)
+    )
+
+    await flow.handleFormSubmit({
+      client,
+      account: biWebviewAccount,
+      konnector,
+      t
+    })
+  }
+
+  return connectionId
+}
+
+/**
+ * Gets BI webview connection id which is returned in the account by the stack
+ * via oauth callback url
+ *
+ * @param {io.cozy.accounts} The account content created by the stack
+ *
+ * @return {Integer} Connection Id
+ */
+const getWebviewBIConnectionId = account => {
+  return Number(account?.oauth?.query?.connection_id?.[0] || null)
+}
+
+/**
+ * Hook from ConnectionFlow after account creation
+ *
+ * @param {io.cozy.accounts} options.account - created account
+ * @param {io.cozy.konnectors} options.konnector  - manifest of the konnector for which the account is created
+ * @param {ConnectionFlow} options.flow - current ConnectionFlow instance
+ * @param {CozyClient} options.client - current CozyClient instance
+ *
+ * @returns {Promise<io.cozy.accounts>}
+ */
+export const onBIAccountCreation = async ({
+  account: fullAccount,
+  client,
+  flow,
+  konnector
+}) => {
+  const account = await flow.saveAccount(fullAccount)
+
+  const biConnection = await checkBIConnection({
+    account: {
+      ...fullAccount,
+      _id: account._id
+    },
+    client,
+    konnector,
+    flow
+  })
+
+  flow.setData({
+    biConnection
+  })
+
+  return await flow.saveAccount(setBIConnectionId(account, biConnection.id))
+}
+
+/**
+ * Finds the current bankIid in a given konnector or account
+ *
+ * @param {io.cozy.accounts} options.account The account content
+ * @param {io.cozy.konnectors} options.konnector connector manifest content
+ */
+export const getCozyBankId = ({ konnector, account }) => {
+  const cozyBankId = konnector?.parameters?.bankId || account?.auth?.bankId
+  if (!cozyBankId) {
+    logger.error('Could not find any bank id')
+  }
+  return cozyBankId
+}
+
+export const konnectorPolicy = {
+  isBIWebView: true,
+  name: 'budget-insight-webview',
+  match: isBiWebViewConnector,
+  saveInVault: false,
+  onAccountCreation: onBIAccountCreation,
+  fetchExtraOAuthUrlParams: fetchExtraOAuthUrlParams,
+  handleOAuthAccount
+}

package/src/services/biWebView.spec.js

@@ -0,0 +1,185 @@
+import CozyClient from 'cozy-client'
+import {
+  handleOAuthAccount,
+  checkBIConnection,
+  isBiWebViewConnector
+} from './biWebView'
+import ConnectionFlow from '../models/ConnectionFlow'
+import { waitForRealtimeEvent } from './jobUtils'
+import biPublicKeyProd from './bi-public-key-prod.json'
+import flag from 'cozy-flags'
+
+jest.mock('./bi-http', () => ({
+  createBIConnection: jest
+    .fn()
+    .mockResolvedValue({ text: Promise.resolve('{}') }),
+  updateBIConnection: jest.fn(),
+  getBIConnection: jest.fn()
+}))
+
+import { getBIConnection } from './bi-http'
+
+jest.mock('cozy-logger', () => ({
+  namespace: () => () => {}
+}))
+
+jest.mock('./jobUtils', () => ({
+  waitForRealtimeEvent: jest.fn()
+}))
+
+const sleep = duration => new Promise(resolve => setTimeout(resolve, duration))
+
+const TEST_BANK_COZY_ID = '100000'
+
+const konnector = {
+  slug: 'boursorama83',
+  parameters: {
+    bankId: TEST_BANK_COZY_ID
+  },
+  partnership: {
+    domain: 'https://budget-insight.com'
+  }
+}
+
+const account = {
+  _id: '1337'
+}
+
+describe('handleOAuthAccount', () => {
+  it('should handle bi webview authentication if any connection is found in the account', async () => {
+    const client = new CozyClient({
+      uri: 'http://testcozy.mycozy.cloud'
+    })
+    const flow = new ConnectionFlow(client, null, konnector)
+    flow.account = account
+    flow.handleFormSubmit = jest.fn()
+    flow.saveAccount = async account => account
+    const account = { oauth: { query: { connection_id: ['12'] } } }
+    const t = jest.fn()
+    await handleOAuthAccount({
+      account,
+      flow,
+      client,
+      konnector,
+      t
+    })
+    expect(flow.handleFormSubmit).toHaveBeenCalledWith({
+      client,
+      konnector,
+      t,
+      account: {
+        ...account,
+        ...{ auth: { bankId: TEST_BANK_COZY_ID } },
+        ...{ data: { auth: { bi: { connId: 12 } } } }
+      }
+    })
+  })
+})
+
+describe('checkBIConnection', () => {
+  const setup = () => {
+    const client = new CozyClient({
+      uri: 'http://testcozy.mycozy.cloud'
+    })
+    const flow = new ConnectionFlow(client, { konnector, account })
+    client.stackClient.jobs.create = jest.fn().mockReturnValue({
+      data: {
+        attributes: {
+          _id: 'job-id-1337'
+        }
+      }
+    })
+    waitForRealtimeEvent.mockImplementation(async () => {
+      sleep(2)
+      return {
+        data: {
+          result: {
+            mode: 'prod',
+            url: 'https://cozy.biapi.pro/2.0',
+            publicKey: biPublicKeyProd,
+            code: 'bi-temporary-access-token-145613'
+          }
+        }
+      }
+    })
+    jest.spyOn(client, 'query').mockImplementation(async () => ({ data: [] }))
+
+    return { client, flow }
+  }
+
+  it('should refuse to create an account with a bi connection id which already exists', async () => {
+    const { client, flow } = setup()
+
+    getBIConnection.mockReset().mockResolvedValue({
+      id: 12
+    })
+
+    const account = {}
+
+    const konnector = {
+      slug: 'bankingconnectortest',
+      parameters: {
+        bankId: TEST_BANK_COZY_ID
+      }
+    }
+
+    jest.spyOn(flow, 'saveAccount').mockImplementation(account => ({
+      _id: 'created-account-id',
+      ...account
+    }))
+
+    jest.spyOn(client, 'query').mockImplementation(async ({ doctype }) => {
+      if (doctype === 'io.cozy.accounts') {
+        return {
+          data: [
+            {
+              _id: 'account_id',
+              auth: { bi: { connId: 12 } }
+            }
+          ]
+        }
+      } else if (doctype === 'io.cozy.triggers') {
+        return {
+          data: [
+            {
+              message: { account: 'account_id' }
+            }
+          ]
+        }
+      } else {
+        throw new Error('unexpected doctype ' + doctype)
+      }
+    })
+
+    await expect(
+      checkBIConnection({
+        client,
+        flow,
+        account,
+        konnector
+      })
+    ).rejects.toEqual(new Error('ACCOUNT_WITH_SAME_IDENTIFIER_ALREADY_DEFINED'))
+  })
+})
+
+describe('isBiWebViewConnector', () => {
+  const BIConnector = {
+    slug: 'biconnector',
+    partnership: { domain: 'budget-insight.com' }
+  }
+  const notBIConnector = {
+    slug: 'otherconnector'
+  }
+  it('should return true if the connector is a BI connector and if the  "harvest.bi.webview" is activated', () => {
+    flag('harvest.bi.webview', true)
+    expect(isBiWebViewConnector(BIConnector)).toEqual(true)
+  })
+  it('should return false if the connector is not a BI connector', () => {
+    flag('harvest.bi.webview', true)
+    expect(isBiWebViewConnector(notBIConnector)).toEqual(false)
+  })
+  it('should return false if the "harvest.bi.webview" flag is not activated', () => {
+    flag('harvest.bi.webview', false)
+    expect(isBiWebViewConnector(BIConnector)).toEqual(false)
+  })
+})

package/src/services/budget-insight.js

@@ -52,7 +52,7 @@ const extraBIErrorMap = {
 /**
  * Converts and chains error
  */
-const convertBIErrortoKonnectorJobError = error => {
+export const convertBIErrortoKonnectorJobError = error => {
   const errorCode = error ? error.code : null
   const cozyErrorMessage = errorCode
     ? biErrorMap[errorCode] || extraBIErrorMap[errorCode] || null
@@ -65,14 +65,10 @@ const convertBIErrortoKonnectorJobError = error => {
   throw err
 }
 
-export const isBudgetInsightConnector = konnector => {
-  return (
-    konnector.partnership &&
-    konnector.partnership.domain.includes('budget-insight')
-  )
-}
+export const isBudgetInsightConnector = konnector =>
+  konnector?.partnership?.domain === 'budget-insight.com'
 
-const createTemporaryToken = async ({ client, konnector, account }) => {
+export const createTemporaryToken = async ({ client, konnector, account }) => {
   assert(
     konnector.slug,
     'createTemporaryToken: konnector passed in options has no slug'
@@ -215,10 +211,6 @@ export const setBIConnectionId = (originalAccount, biConnectionId) => {
   return account
 }
 
-export const getBIConnectionId = account => {
-  return get(account, 'data.auth.bi.connId')
-}
-
 /**
  * Handles webauth connection
  *

package/src/services/budget-insight.spec.js

@@ -70,7 +70,7 @@ const konnector = {
     bankId: TEST_BANK_COZY_ID
   },
   partnership: {
-    domain: 'https://budget-insight.com'
+    domain: 'budget-insight.com'
   }
 }