cozy-harvest-lib 9.15.2 → 9.16.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.16.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.15.4...cozy-harvest-lib@9.16.0) (2022-06-30)
+
+
+### Bug Fixes
+
+* Lint ([c47501c](https://github.com/cozy/cozy-libs/commit/c47501c22dd080f75232acea66e47e4c3376fb82))
+
+
+### Features
+
+* Allow EditAccountModal to have intentsApi ([43c5910](https://github.com/cozy/cozy-libs/commit/43c5910aba989fa09534cdfab8933512da606b2e))
+* Now open the BI manage webview to the correct connection id ([2f3da74](https://github.com/cozy/cozy-libs/commit/2f3da74213710a06ad8877dd350bcd04b86d5e64))
+
+
+
+
+
+## [9.15.4](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.15.3...cozy-harvest-lib@9.15.4) (2022-06-28)
+
+
+### Bug Fixes
+
+* **cozy-harvest-lib:** Revert RedirectToAccountFormButton label & size ([b942dce](https://github.com/cozy/cozy-libs/commit/b942dcef733a295e2334c8fdd3906f2f66318e70))
+
+
+
+
+
+## [9.15.3](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.15.2...cozy-harvest-lib@9.15.3) (2022-06-28)
+
+
+### Bug Fixes
+
+* **deps:** update dependency jsdom to v16.5.0 [security] ([d9f1689](https://github.com/cozy/cozy-libs/commit/d9f16896f2c071c87bb6e04f2c029affd7d513e9))
+
+
+
+
+
 ## [9.15.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.15.1...cozy-harvest-lib@9.15.2) (2022-06-24)
 
 **Note:** Version bump only for package cozy-harvest-lib

package/dist/components/AccountForm/AccountField.js

@@ -157,7 +157,7 @@ export var AccountField = /*#__PURE__*/function (_PureComponent) {
 
         case 'dropdown':
           return /*#__PURE__*/React.createElement(Field, _extends({}, sanitizeSelectProps(fieldProps), {
-            menuPosition: 'fixed'
+            menuPosition: "fixed"
           }));
 
         case 'password':

package/dist/components/AccountSelectBox/CreateAccountButton.js

@@ -14,8 +14,8 @@ var CreateAccount = translate()(function (_ref) {
       t = _ref.t;
   return /*#__PURE__*/React.createElement(Button, {
     subtle: true,
-    size: 'small',
-    className: 'u-m-half',
+    size: "small",
+    className: "u-m-half",
     onClick: createAction,
     onTouchEnd: createAction,
     label: t('modal.addAccount.button')

package/dist/components/EditAccountModal.js

@@ -32,6 +32,7 @@ import logger from '../logger';
 import { withTracker } from './hoc/tracking';
 import useTimeout from './hooks/useTimeout';
 import { withRouter } from 'react-router';
+import { intentsApiProptype } from '../helpers/proptypes';
 var showStyle = {
   opacity: 1,
   transition: 'opacity 0.3s ease'
@@ -47,7 +48,8 @@ var DumbEditAccountModal = withRouter(function (_ref) {
       fetching = _ref.fetching,
       redirectToAccount = _ref.redirectToAccount,
       location = _ref.location,
-      reconnect = _ref.reconnect;
+      reconnect = _ref.reconnect,
+      intentsApi = _ref.intentsApi;
 
   var _useCozyDialog = useCozyDialog({
     open: true,
@@ -103,7 +105,8 @@ var DumbEditAccountModal = withRouter(function (_ref) {
     showError: true,
     onVaultDismiss: redirectToAccount,
     fieldOptions: fieldOptions,
-    reconnect: fromReconnect
+    reconnect: fromReconnect,
+    intentsApi: intentsApi
   }), /*#__PURE__*/React.createElement("div", {
     className: "u-mb-2"
   })));
@@ -256,6 +259,7 @@ EditAccountModal.propTypes = {
   konnector: PropTypes.object.isRequired,
   accountId: PropTypes.string.isRequired,
   accounts: PropTypes.array.isRequired,
-  reconnect: PropTypes.bool
+  reconnect: PropTypes.bool,
+  intentsApi: intentsApiProptype
 };
 export default flow(withClient, withMountPointHistory, withTracker)(EditAccountModal);

package/dist/components/KonnectorModal.js

@@ -84,13 +84,13 @@ var DumbKonnectorDialog = function DumbKonnectorDialog(_ref) {
   })), /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(Icon, {
       icon: CrossIcon,
-      size: '24'
+      size: "24"
     }),
     onClick: onClose,
     iconOnly: true,
     label: t('close'),
     subtle: true,
-    theme: 'secondary'
+    theme: "secondary"
   }))), /*#__PURE__*/React.createElement(DialogContent, null, content));
 };
 

package/dist/components/RedirectToAccountFormButton.js

@@ -22,8 +22,7 @@ var RedirectToAccountFormButton = function RedirectToAccountFormButton(_ref) {
     className: "u-ml-0",
     theme: "secondary",
     label: t('error.reconnect-via-form'),
-    onClick: handleClick,
-    extension: "full"
+    onClick: handleClick
   });
 };
 

package/dist/components/RedirectToAccountFormButton.spec.js

@@ -19,7 +19,7 @@ describe('redirect to account form button', function () {
     }, /*#__PURE__*/React.createElement(RedirectToAccountFormButton, {
       trigger: trigger
     }))));
-    fireEvent.click(root.getByText('Set the connection'));
+    fireEvent.click(root.getByText('Reconnect'));
     expect(replaceHistory).toHaveBeenCalledWith('/accounts/account-id-1337/edit?reconnect');
   });
 });

package/dist/locales/en.json

@@ -124,7 +124,7 @@
     "baseDir": "/Administrative"
   },
   "error": {
-    "reconnect-via-form": "Set the connection",
+    "reconnect-via-form": "Reconnect",
     "job": {
       "DISK_QUOTA_EXCEEDED": {
         "title": "Storage full",

package/dist/locales/fr.json

@@ -124,7 +124,7 @@
     "baseDir": "/Administratif"
   },
   "error": {
-    "reconnect-via-form": "Régler la connexion",
+    "reconnect-via-form": "Se reconnecter",
     "job": {
       "DISK_QUOTA_EXCEEDED": {
         "title": "Espace Disque plein",

package/dist/services/biWebView.js

@@ -116,7 +116,7 @@ export var checkBIConnection = /*#__PURE__*/function () {
 }();
 export var fetchContractSynchronizationUrl = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref3) {
-    var account, client, konnector, _yield$createTemporar, code, url, clientId;
+    var account, client, konnector, _yield$createTemporar, code, url, clientId, connId;
 
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
@@ -135,9 +135,10 @@ export var fetchContractSynchronizationUrl = /*#__PURE__*/function () {
             code = _yield$createTemporar.code;
             url = _yield$createTemporar.url;
             clientId = _yield$createTemporar.clientId;
-            return _context2.abrupt("return", "".concat(url, "/auth/webview/manage?client_id=").concat(clientId, "&code=").concat(code));
+            connId = getBIConnectionIdFromAccount(account);
+            return _context2.abrupt("return", "".concat(url, "/auth/webview/manage?client_id=").concat(clientId, "&code=").concat(code, "&connection_id=").concat(connId));
 
-          case 8:
+          case 9:
           case "end":
             return _context2.stop();
         }

package/dist/services/biWebView.spec.js

@@ -356,14 +356,22 @@ describe('fetchContractSynchronizationUrl', function () {
             });
             _context8.next = 5;
             return fetchContractSynchronizationUrl({
-              account: account,
+              account: _objectSpread(_objectSpread({}, account), {}, {
+                data: {
+                  auth: {
+                    bi: {
+                      connId: 1337
+                    }
+                  }
+                }
+              }),
               client: client,
               konnector: konnector
             });
 
           case 5:
             url = _context8.sent;
-            expect(url).toEqual('https://cozy.biapi.pro/2.0/auth/webview/manage?client_id=test-client-id&code=bi-temporary-access-token-145613');
+            expect(url).toEqual('https://cozy.biapi.pro/2.0/auth/webview/manage?client_id=test-client-id&code=bi-temporary-access-token-145613&connection_id=1337');
 
           case 7:
           case "end":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "9.15.2",
+  "version": "9.16.0",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -66,7 +66,7 @@
     "jest": "26.6.3",
     "jest-environment-jsdom-sixteen": "1.0.3",
     "jest-resolve-cached": "1.0.0",
-    "jsdom": "16.4.0",
+    "jsdom": "16.5.0",
     "leaflet": "1.8.0",
     "prop-types": "15.7.2",
     "react": "16.12.0",
@@ -87,5 +87,5 @@
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "d4236ee62f017def90a5684b754b1632cfa05676"
+  "gitHead": "4f6aefaf76dfdadf5d9df433b954951feac5c0af"
 }

package/src/components/AccountForm/AccountField.jsx

@@ -132,7 +132,7 @@ export class AccountField extends PureComponent {
         )
       case 'dropdown':
         return (
-          <Field {...sanitizeSelectProps(fieldProps)} menuPosition={'fixed'} />
+          <Field {...sanitizeSelectProps(fieldProps)} menuPosition="fixed" />
         )
       case 'password':
         return (

package/src/components/AccountModal.jsx

@@ -66,9 +66,16 @@ export class AccountModal extends Component {
       'trigger'
     )
 
-    const hasTriggerStatusChanged = matchingTrigger && this.state.trigger && matchingTrigger.current_state.status !== this.state.trigger.current_state.status
-
-    if (this.props.accountId !== prevProps.accountId || hasTriggerStatusChanged) {
+    const hasTriggerStatusChanged =
+      matchingTrigger &&
+      this.state.trigger &&
+      matchingTrigger.current_state.status !==
+        this.state.trigger.current_state.status
+
+    if (
+      this.props.accountId !== prevProps.accountId ||
+      hasTriggerStatusChanged
+    ) {
       return await this.loadSelectedAccountId()
     }
   }

package/src/components/AccountSelectBox/CreateAccountButton.jsx

@@ -13,8 +13,8 @@ const CreateAccount = translate()(({ createAction, t }) => {
   return (
     <Button
       subtle
-      size={'small'}
-      className={'u-m-half'}
+      size="small"
+      className="u-m-half"
       onClick={createAction}
       onTouchEnd={createAction}
       label={t('modal.addAccount.button')}

package/src/components/EditAccountModal.jsx

@@ -24,6 +24,7 @@ import logger from '../logger'
 import { withTracker } from './hoc/tracking'
 import useTimeout from './hooks/useTimeout'
 import { withRouter } from 'react-router'
+import { intentsApiProptype } from '../helpers/proptypes'
 
 const showStyle = { opacity: 1, transition: 'opacity 0.3s ease' }
 const hideStyle = { opacity: 0, transition: 'opacity 0.3s ease' }
@@ -36,7 +37,8 @@ const DumbEditAccountModal = withRouter(
     fetching,
     redirectToAccount,
     location,
-    reconnect
+    reconnect,
+    intentsApi
   }) => {
     const { dialogProps, dialogTitleProps } = useCozyDialog({
       open: true,
@@ -96,6 +98,7 @@ const DumbEditAccountModal = withRouter(
               onVaultDismiss={redirectToAccount}
               fieldOptions={fieldOptions}
               reconnect={fromReconnect}
+              intentsApi={intentsApi}
             />
           )}
           <div className="u-mb-2" />
@@ -200,7 +203,8 @@ EditAccountModal.propTypes = {
   konnector: PropTypes.object.isRequired,
   accountId: PropTypes.string.isRequired,
   accounts: PropTypes.array.isRequired,
-  reconnect: PropTypes.bool
+  reconnect: PropTypes.bool,
+  intentsApi: intentsApiProptype
 }
 
 export default flow(

package/src/components/KonnectorModal.jsx

@@ -69,12 +69,12 @@ const DumbKonnectorDialog = ({
             )}
           </div>
           <Button
-            icon={<Icon icon={CrossIcon} size={'24'} />}
+            icon={<Icon icon={CrossIcon} size="24" />}
             onClick={onClose}
             iconOnly
             label={t('close')}
             subtle
-            theme={'secondary'}
+            theme="secondary"
           />
         </div>
       </DialogTitle>

package/src/components/RedirectToAccountFormButton.jsx

@@ -17,7 +17,6 @@ const RedirectToAccountFormButton = ({ trigger }) => {
       theme="secondary"
       label={t('error.reconnect-via-form')}
       onClick={handleClick}
-      extension="full"
     />
   )
 }

package/src/components/RedirectToAccountFormButton.spec.jsx

@@ -22,7 +22,7 @@ describe('redirect to account form button', () => {
         </MountPointContext.Provider>
       </AppLike>
     )
-    fireEvent.click(root.getByText('Set the connection'))
+    fireEvent.click(root.getByText('Reconnect'))
     expect(replaceHistory).toHaveBeenCalledWith(
       '/accounts/account-id-1337/edit?reconnect'
     )

package/src/locales/en.json

@@ -124,7 +124,7 @@
     "baseDir": "/Administrative"
   },
   "error": {
-    "reconnect-via-form": "Set the connection",
+    "reconnect-via-form": "Reconnect",
     "job": {
       "DISK_QUOTA_EXCEEDED": {
         "title": "Storage full",

package/src/locales/fr.json

@@ -124,7 +124,7 @@
     "baseDir": "/Administratif"
   },
   "error": {
-    "reconnect-via-form": "Régler la connexion",
+    "reconnect-via-form": "Se reconnecter",
     "job": {
       "DISK_QUOTA_EXCEEDED": {
         "title": "Espace Disque plein",

package/src/services/biWebView.js

@@ -91,7 +91,8 @@ export const fetchContractSynchronizationUrl = async ({
     konnector,
     account
   })
-  return `${url}/auth/webview/manage?client_id=${clientId}&code=${code}`
+  const connId = getBIConnectionIdFromAccount(account)
+  return `${url}/auth/webview/manage?client_id=${clientId}&code=${code}&connection_id=${connId}`
 }
 
 /**

package/src/services/biWebView.spec.js

@@ -216,12 +216,12 @@ describe('fetchContractSynchronizationUrl', () => {
     })
 
     const url = await fetchContractSynchronizationUrl({
-      account,
+      account: { ...account, data: { auth: { bi: { connId: 1337 } } } },
       client,
       konnector
     })
     expect(url).toEqual(
-      'https://cozy.biapi.pro/2.0/auth/webview/manage?client_id=test-client-id&code=bi-temporary-access-token-145613'
+      'https://cozy.biapi.pro/2.0/auth/webview/manage?client_id=test-client-id&code=bi-temporary-access-token-145613&connection_id=1337'
     )
   })
 })