cozy-harvest-lib 6.14.6 → 7.0.0

package/CHANGELOG.md

@@ -3,6 +3,70 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.0.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@6.15.2...cozy-harvest-lib@7.0.0) (2022-01-07)
+
+
+### Features
+
+* **eslint:** Propose Eslint plugin promise ([1fded18](https://github.com/cozy/cozy-libs/commit/1fded18))
+
+
+### BREAKING CHANGES
+
+* **eslint:** Most errors are not auto fixable,
+if needed, use // disable-next-line
+
+Or insert in .eslintrc:
+{
+  "rules": {
+    "promise/always-return": "warn",
+    "promise/no-return-wrap": "warn",
+    "promise/param-names": "warn",
+    "promise/catch-or-return": "warn",
+    "promise/no-native": "warn",
+    "promise/no-nesting": "warn",
+    "promise/no-promise-in-callback": "warn",
+    "promise/no-callback-in-promise": "warn",
+    "promise/avoid-new": "warn",
+    "promise/no-new-statics": "warn",
+    "promise/no-return-in-finally": "warn",
+    "promise/valid-params": "warn"
+  }
+}
+
+
+
+
+
+## [6.15.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@6.15.1...cozy-harvest-lib@6.15.2) (2022-01-06)
+
+**Note:** Version bump only for package cozy-harvest-lib
+
+
+
+
+
+## [6.15.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@6.15.0...cozy-harvest-lib@6.15.1) (2021-12-28)
+
+**Note:** Version bump only for package cozy-harvest-lib
+
+
+
+
+
+# [6.15.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@6.14.6...cozy-harvest-lib@6.15.0) (2021-12-20)
+
+
+### Features
+
+* Also use supportMail for TERMS_VERSION_MISMATCH error ([986cd33](https://github.com/cozy/cozy-libs/commit/986cd33))
+* Use configured support address in UNKNOWN_ERROR message ([1470f03](https://github.com/cozy/cozy-libs/commit/1470f03))
+* Use fetchQueryAndGetFromState ([bd4c497](https://github.com/cozy/cozy-libs/commit/bd4c497))
+
+
+
+
+
 ## [6.14.6](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@6.14.5...cozy-harvest-lib@6.14.6) (2021-12-20)
 
 **Note:** Version bump only for package cozy-harvest-lib

package/dist/cli/cli.js

@@ -334,11 +334,13 @@ var main = /*#__PURE__*/function () {
   return function main() {
     return _ref5.apply(this, arguments);
   };
-}();
+}(); // eslint-disable-next-line promise/catch-or-return
+
 
 main().catch(function (e) {
   logger.error(e);
   process.exit(1);
-}).then(function () {
+}) // eslint-disable-next-line promise/always-return
+.then(function () {
   process.exit(0);
 });

package/dist/components/AccountForm/__snapshots__/index.spec.jsx.snap

@@ -80,7 +80,7 @@ exports[`AccountForm should render error 1`] = `
   onFocusCapture={[Function]}
   onKeyUp={[Function]}
 >
-  <withI18n(withKonnectorLocales(TriggerErrorInfo)
+  <withI18n(withClient(withKonnectorLocales(TriggerErrorInfo))
     className="u-mb-1"
     error={[Error: Test error]}
     konnector={

package/dist/components/OAuthForm.js

@@ -60,7 +60,8 @@ export var OAuthForm = /*#__PURE__*/function (_PureComponent) {
       if (konnectorPolicy.fetchExtraOAuthUrlParams) {
         this.setState({
           needExtraParams: true
-        });
+        }); // eslint-disable-next-line promise/catch-or-return
+
         konnectorPolicy.fetchExtraOAuthUrlParams({
           flow: flow,
           account: account,

package/dist/components/infos/TriggerErrorInfo.js

@@ -1,8 +1,12 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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); }; }
 
@@ -13,7 +17,8 @@ import PropTypes from 'prop-types';
 import { translate } from 'cozy-ui/transpiled/react/I18n';
 import Infos from 'cozy-ui/transpiled/react/Infos';
 import Typography from 'cozy-ui/transpiled/react/Typography';
-import { getErrorLocale } from '../../helpers/konnectors';
+import { withClient } from 'cozy-client';
+import { getErrorLocale, fetchSupportMail } from '../../helpers/konnectors';
 import withKonnectorLocales from '../hoc/withKonnectorLocales';
 import Markdown from '../Markdown';
 /**
@@ -31,12 +36,82 @@ export var TriggerErrorInfo = /*#__PURE__*/function (_PureComponent) {
   var _super = _createSuper(TriggerErrorInfo);
 
   function TriggerErrorInfo() {
+    var _this;
+
     _classCallCheck(this, TriggerErrorInfo);
 
-    return _super.apply(this, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _defineProperty(_assertThisInitialized(_this), "state", {
+      supportMail: null
+    });
+
+    return _this;
   }
 
   _createClass(TriggerErrorInfo, [{
+    key: "componentDidMount",
+    value: function () {
+      var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return this.loadSupportMail();
+
+              case 2:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function componentDidMount() {
+        return _componentDidMount.apply(this, arguments);
+      }
+
+      return componentDidMount;
+    }()
+  }, {
+    key: "loadSupportMail",
+    value: function () {
+      var _loadSupportMail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var client, supportMail;
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                client = this.props.client;
+                _context2.next = 3;
+                return fetchSupportMail(client);
+
+              case 3:
+                supportMail = _context2.sent;
+                this.setState({
+                  supportMail: supportMail
+                });
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function loadSupportMail() {
+        return _loadSupportMail.apply(this, arguments);
+      }
+
+      return loadSupportMail;
+    }()
+  }, {
     key: "render",
     value: function render() {
       var _this$props = this.props,
@@ -45,6 +120,7 @@ export var TriggerErrorInfo = /*#__PURE__*/function (_PureComponent) {
           konnector = _this$props.konnector,
           t = _this$props.t,
           action = _this$props.action;
+      var supportMail = this.state.supportMail;
       return /*#__PURE__*/React.createElement(Infos, {
         className: className,
         theme: "danger",
@@ -53,12 +129,12 @@ export var TriggerErrorInfo = /*#__PURE__*/function (_PureComponent) {
           className: "u-error",
           variant: "h6",
           gutterBottom: true
-        }, getErrorLocale(error, konnector, t, 'title')), /*#__PURE__*/React.createElement(Typography, {
+        }, getErrorLocale(error, konnector, t, 'title')), supportMail ? /*#__PURE__*/React.createElement(Typography, {
           variant: "body1",
           component: "div"
         }, /*#__PURE__*/React.createElement(Markdown, {
-          source: getErrorLocale(error, konnector, t, 'description')
-        })))
+          source: getErrorLocale(error, konnector, t, 'description', supportMail)
+        })) : null)
       });
     }
   }]);
@@ -70,4 +146,4 @@ TriggerErrorInfo.proptTypes = {
   konnector: PropTypes.object.isRequired,
   t: PropTypes.func.isRequired
 };
-export default translate()(withKonnectorLocales(TriggerErrorInfo));
+export default translate()(withClient(withKonnectorLocales(TriggerErrorInfo)));

package/dist/components/infos/TriggerErrorInfo.spec.js

@@ -15,6 +15,7 @@ var tMock = jest.fn().mockImplementation(function (key) {
   return key;
 });
 describe('TriggerErrorInfo', function () {
+  var fakeClient;
   beforeAll(function () {
     jest.spyOn(console, 'error').mockImplementation(function () {});
   });
@@ -31,7 +32,9 @@ describe('TriggerErrorInfo', function () {
     var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
         optionProps = _ref.props;
 
-    var fakeClient = {};
+    fakeClient = {
+      fetchQueryAndGetFromState: jest.fn()
+    };
     var root = render( /*#__PURE__*/React.createElement(AppLike, {
       client: fakeClient
     }, /*#__PURE__*/React.createElement(TriggerErrorInfo, _extends({}, props, optionProps))));
@@ -56,4 +59,22 @@ describe('TriggerErrorInfo', function () {
 
     expect(root.findByText('An unknown error has occurred.')).toBeTruthy();
   });
+  it('should render unknown error with configured mail support if any', function () {
+    fakeClient.fetchQueryAndGetFromState.mockResolvedValue({
+      data: [{
+        attributes: {
+          support_address: 'test@address'
+        }
+      }]
+    });
+
+    var _setup3 = setup({
+      props: {
+        error: new Error('Something is undefined')
+      }
+    }),
+        root = _setup3.root;
+
+    expect(root.findByText('test@address')).toBeTruthy();
+  });
 });

package/dist/helpers/konnectors.js

@@ -1,3 +1,4 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
@@ -6,6 +7,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _wrapNativeSuper from "@babel/runtime/helpers/wrapNativeSuper";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
@@ -19,7 +21,9 @@ import get from 'lodash/get';
 import has from 'lodash/has';
 import trim from 'lodash/trim';
 import { getBoundT } from '../locales';
-import * as accounts from './accounts'; // Default name for base directory
+import { Q, fetchPolicies } from 'cozy-client';
+import * as accounts from './accounts';
+var DEFAULT_SUPPORT_MAIL = 'claude@cozycloud.cc'; // Default name for base directory
 
 var DEFAULT_LOCALIZED_BASE_DIR = 'Administrative'; // Type of errors returned by konnector
 
@@ -143,10 +147,12 @@ export var KonnectorJobError = /*#__PURE__*/function (_Error) {
  */
 
 export var getErrorLocale = function getErrorLocale(error, konnector, t, suffixKey) {
+  var supportMail = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : DEFAULT_SUPPORT_MAIL;
   var defaultKey = 'error.job.UNKNOWN_ERROR';
   var translationVariables = {
     name: konnector.name || '',
-    link: konnector.vendor_link || ''
+    link: konnector.vendor_link || '',
+    supportMail: supportMail
   }; // not handled errors
 
   if (!(error instanceof KonnectorJobError)) {
@@ -165,9 +171,41 @@ export var getErrorLocale = function getErrorLocale(error, konnector, t, suffixK
     }))
   }));
 };
-export var getErrorLocaleBound = function getErrorLocaleBound(error, konnector, lang, suffixKey) {
+export var fetchSupportMail = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(client) {
+    var result;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return client.fetchQueryAndGetFromState({
+              definition: Q('io.cozy.settings').getById('context'),
+              options: {
+                as: 'contextSupportMail',
+                fetchPolicy: fetchPolicies.olderThan(60 * 60 * 1000)
+              }
+            });
+
+          case 2:
+            result = _context.sent;
+            return _context.abrupt("return", get(result, 'data[0].attributes.support_address', DEFAULT_SUPPORT_MAIL));
+
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function fetchSupportMail(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export var getErrorLocaleBound = function getErrorLocaleBound(error, konnector, lang, suffixKey, supportMail) {
   var t = getBoundT(lang);
-  return getErrorLocale(error, konnector, t, suffixKey);
+  return getErrorLocale(error, konnector, t, suffixKey, supportMail);
 };
 /**
  * Returns the account type. Based on the information from the oauth attribute,
@@ -353,8 +391,8 @@ export var buildFolderPermission = function buildFolderPermission(folder) {
  * @returns {Object}
  */
 
-export var getLauncher = function getLauncher(_ref) {
-  var win = _ref.win;
+export var getLauncher = function getLauncher(_ref2) {
+  var win = _ref2.win;
   return get(win, 'cozy.ClientConnectorLauncher', null);
 };
 /**
@@ -365,10 +403,10 @@ export var getLauncher = function getLauncher(_ref) {
  * @returns {Boolean}
  */
 
-export var isRunnable = function isRunnable(_ref2) {
-  var win = _ref2.win,
-      _ref2$konnector = _ref2.konnector,
-      konnector = _ref2$konnector === void 0 ? {} : _ref2$konnector;
+export var isRunnable = function isRunnable(_ref3) {
+  var win = _ref3.win,
+      _ref3$konnector = _ref3.konnector,
+      konnector = _ref3$konnector === void 0 ? {} : _ref3$konnector;
   return Boolean(!konnector.clientSide || getLauncher({
     win: win
   }));
@@ -381,5 +419,7 @@ export default {
   getLauncher: getLauncher,
   isRunnable: isRunnable,
   hasNewVersionAvailable: hasNewVersionAvailable,
-  needsFolder: needsFolder
+  needsFolder: needsFolder,
+  fetchSupportMail: fetchSupportMail,
+  DEFAULT_SUPPORT_MAIL: DEFAULT_SUPPORT_MAIL
 };

package/dist/locales/en.json

@@ -151,11 +151,11 @@
       },
       "TERMS_VERSION_MISMATCH": {
         "title": "Latest Terms of Service non accepted",
-        "description": "%{name} seems to have updated its Terms Of Service. Please check that the service is up to date. It this error still occurs, please contact us at [contact@cozycloud.cc](mailto:contact@cozycloud.cc)."
+        "description": "%{name} seems to have updated its Terms Of Service. Please check that the service is up to date. It this error still occurs, please contact us at [%{supportMail}](mailto:%{supportMail})."
       },
       "UNKNOWN_ERROR": {
         "title": "Connection error",
-        "description": "An unknown error has occurred. You can try to update your data. If the problem persists, please contact us at [claude@cozycloud.cc](mailto:claude@cozycloud.cc)."
+        "description": "An unknown error has occurred. You can try to update your data. If the problem persists, please contact us at [%{supportMail}](mailto:%{supportMail})."
       },
       "USER_ACTION_NEEDED": {
         "title": "Action needed on the provider's website",

package/dist/locales/fr.json

@@ -151,11 +151,11 @@
       },
       "TERMS_VERSION_MISMATCH": {
         "title": "Nouvelles CGUs à accepter",
-        "description": "Il semblerait que %{name} ait mis à jour ses Conditions Générales d'Utilisation. Merci de vérifier que le service est à jour. Si l'erreur persiste, contacter nous via [contact@cozycloud.cc](mailto:contact@cozycloud.cc)."
+        "description": "Il semblerait que %{name} ait mis à jour ses Conditions Générales d'Utilisation. Merci de vérifier que le service est à jour. Si l'erreur persiste, contacter nous via [%{supportMail}](mailto:%{supportMail})."
       },
       "UNKNOWN_ERROR": {
         "title": "Erreur de Connexion",
-        "description": "Une erreur inconnue est survenue. Vous pouvez essayer de mettre à jour vos données. Si le problème persiste, n'hésitez pas à nous contacter via [claude@cozycloud.cc](mailto:claude@cozycloud.cc)."
+        "description": "Une erreur inconnue est survenue. Vous pouvez essayer de mettre à jour vos données. Si le problème persiste, n'hésitez pas à nous contacter via [%{supportMail}](mailto:%{supportMail})."
       },
       "USER_ACTION_NEEDED": {
         "title": "Action nécessaire chez le fournisseur",

package/dist/models/ConnectionFlow.js

@@ -319,7 +319,8 @@ export var ConnectionFlow = /*#__PURE__*/function () {
 
       if (this.jobWatcher) {
         this.jobWatcher.disableSuccessTimer();
-      }
+      } // eslint-disable-next-line promise/param-names
+
 
       return new Promise(function (rawResolve) {
         var accountId = _this.account._id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "6.14.6",
+  "version": "7.0.0",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -53,10 +53,10 @@
     "babel-plugin-inline-react-svg": "^1.1.0",
     "babel-preset-cozy-app": "^2.0.1",
     "cozy-client": "17.6.1",
-    "cozy-device-helper": "^1.13.2",
+    "cozy-device-helper": "^1.15.0",
     "cozy-flags": "^2.8.3",
     "cozy-keys-lib": "3.8.0",
-    "cozy-realtime": "^3.14.2",
+    "cozy-realtime": "^4.0.0",
     "cozy-ui": "^57.6.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
@@ -85,5 +85,5 @@
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "677ef88b7bf0f196792c5f06165138717d79c078"
+  "gitHead": "d0157461fc7919473be52fa994fed99c23b24ec2"
 }

package/src/cli/cli.js

@@ -201,11 +201,13 @@ const main = async () => {
   await args.handler(args, client)
 }
 
+// eslint-disable-next-line promise/catch-or-return
 main()
   .catch(e => {
     logger.error(e)
     process.exit(1)
   })
+  // eslint-disable-next-line promise/always-return
   .then(() => {
     process.exit(0)
   })

package/src/components/AccountForm/__snapshots__/index.spec.jsx.snap

@@ -80,7 +80,7 @@ exports[`AccountForm should render error 1`] = `
   onFocusCapture={[Function]}
   onKeyUp={[Function]}
 >
-  <withI18n(withKonnectorLocales(TriggerErrorInfo)
+  <withI18n(withClient(withKonnectorLocales(TriggerErrorInfo))
     className="u-mb-1"
     error={[Error: Test error]}
     konnector={

package/src/components/OAuthForm.jsx

@@ -33,6 +33,7 @@ export class OAuthForm extends PureComponent {
 
     if (konnectorPolicy.fetchExtraOAuthUrlParams) {
       this.setState({ needExtraParams: true })
+      // eslint-disable-next-line promise/catch-or-return
       konnectorPolicy
         .fetchExtraOAuthUrlParams({
           flow,

package/src/components/infos/TriggerErrorInfo.jsx

@@ -4,8 +4,9 @@ import PropTypes from 'prop-types'
 import { translate } from 'cozy-ui/transpiled/react/I18n'
 import Infos from 'cozy-ui/transpiled/react/Infos'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import { withClient } from 'cozy-client'
 
-import { getErrorLocale } from '../../helpers/konnectors'
+import { getErrorLocale, fetchSupportMail } from '../../helpers/konnectors'
 import withKonnectorLocales from '../hoc/withKonnectorLocales'
 import Markdown from '../Markdown'
 
@@ -18,8 +19,20 @@ import Markdown from '../Markdown'
  * deals mainly with translation concerns.
  */
 export class TriggerErrorInfo extends PureComponent {
+  state = {
+    supportMail: null
+  }
+  async componentDidMount() {
+    await this.loadSupportMail()
+  }
+  async loadSupportMail() {
+    const { client } = this.props
+    const supportMail = await fetchSupportMail(client)
+    this.setState({ supportMail })
+  }
   render() {
     const { className, error, konnector, t, action } = this.props
+    const { supportMail } = this.state
     return (
       <Infos
         className={className}
@@ -30,11 +43,19 @@ export class TriggerErrorInfo extends PureComponent {
             <Typography className="u-error" variant="h6" gutterBottom>
               {getErrorLocale(error, konnector, t, 'title')}
             </Typography>
-            <Typography variant="body1" component="div">
-              <Markdown
-                source={getErrorLocale(error, konnector, t, 'description')}
-              />
-            </Typography>
+            {supportMail ? (
+              <Typography variant="body1" component="div">
+                <Markdown
+                  source={getErrorLocale(
+                    error,
+                    konnector,
+                    t,
+                    'description',
+                    supportMail
+                  )}
+                />
+              </Typography>
+            ) : null}
           </>
         }
       />
@@ -48,4 +69,4 @@ TriggerErrorInfo.proptTypes = {
   t: PropTypes.func.isRequired
 }
 
-export default translate()(withKonnectorLocales(TriggerErrorInfo))
+export default translate()(withClient(withKonnectorLocales(TriggerErrorInfo)))

package/src/components/infos/TriggerErrorInfo.spec.js

@@ -16,6 +16,7 @@ const fixtures = {
 const tMock = jest.fn().mockImplementation(key => key)
 
 describe('TriggerErrorInfo', () => {
+  let fakeClient
   beforeAll(() => {
     jest.spyOn(console, 'error').mockImplementation(() => {})
   })
@@ -31,7 +32,9 @@ describe('TriggerErrorInfo', () => {
   }
 
   const setup = ({ props: optionProps } = {}) => {
-    const fakeClient = {}
+    fakeClient = {
+      fetchQueryAndGetFromState: jest.fn()
+    }
     const root = render(
       <AppLike client={fakeClient}>
         <TriggerErrorInfo {...props} {...optionProps} />
@@ -53,4 +56,16 @@ describe('TriggerErrorInfo', () => {
     })
     expect(root.findByText('An unknown error has occurred.')).toBeTruthy()
   })
+
+  it('should render unknown error with configured mail support if any', () => {
+    fakeClient.fetchQueryAndGetFromState.mockResolvedValue({
+      data: [{ attributes: { support_address: 'test@address' } }]
+    })
+    const { root } = setup({
+      props: {
+        error: new Error('Something is undefined')
+      }
+    })
+    expect(root.findByText('test@address')).toBeTruthy()
+  })
 })

package/src/helpers/konnectors.js

@@ -3,8 +3,12 @@ import has from 'lodash/has'
 import trim from 'lodash/trim'
 import { getBoundT } from '../locales'
 
+import { Q, fetchPolicies } from 'cozy-client'
+
 import * as accounts from './accounts'
 
+const DEFAULT_SUPPORT_MAIL = 'claude@cozycloud.cc'
+
 // Default name for base directory
 const DEFAULT_LOCALIZED_BASE_DIR = 'Administrative'
 
@@ -130,11 +134,18 @@ export class KonnectorJobError extends Error {
  * @param  {Func} suffixKey   What part of the error message should be returned, title or description
  * @return {String}           The error locale
  */
-export const getErrorLocale = (error, konnector, t, suffixKey) => {
+export const getErrorLocale = (
+  error,
+  konnector,
+  t,
+  suffixKey,
+  supportMail = DEFAULT_SUPPORT_MAIL
+) => {
   const defaultKey = 'error.job.UNKNOWN_ERROR'
   const translationVariables = {
     name: konnector.name || '',
-    link: konnector.vendor_link || ''
+    link: konnector.vendor_link || '',
+    supportMail
   }
 
   // not handled errors
@@ -156,9 +167,26 @@ export const getErrorLocale = (error, konnector, t, suffixKey) => {
   })
 }
 
-export const getErrorLocaleBound = (error, konnector, lang, suffixKey) => {
+export const fetchSupportMail = async client => {
+  const result = await client.fetchQueryAndGetFromState({
+    definition: Q('io.cozy.settings').getById('context'),
+    options: {
+      as: 'contextSupportMail',
+      fetchPolicy: fetchPolicies.olderThan(60 * 60 * 1000)
+    }
+  })
+  return get(result, 'data[0].attributes.support_address', DEFAULT_SUPPORT_MAIL)
+}
+
+export const getErrorLocaleBound = (
+  error,
+  konnector,
+  lang,
+  suffixKey,
+  supportMail
+) => {
   const t = getBoundT(lang)
-  return getErrorLocale(error, konnector, t, suffixKey)
+  return getErrorLocale(error, konnector, t, suffixKey, supportMail)
 }
 
 /**
@@ -364,5 +392,7 @@ export default {
   getLauncher,
   isRunnable,
   hasNewVersionAvailable,
-  needsFolder
+  needsFolder,
+  fetchSupportMail,
+  DEFAULT_SUPPORT_MAIL
 }

package/src/locales/en.json

@@ -151,11 +151,11 @@
       },
       "TERMS_VERSION_MISMATCH": {
         "title": "Latest Terms of Service non accepted",
-        "description": "%{name} seems to have updated its Terms Of Service. Please check that the service is up to date. It this error still occurs, please contact us at [contact@cozycloud.cc](mailto:contact@cozycloud.cc)."
+        "description": "%{name} seems to have updated its Terms Of Service. Please check that the service is up to date. It this error still occurs, please contact us at [%{supportMail}](mailto:%{supportMail})."
       },
       "UNKNOWN_ERROR": {
         "title": "Connection error",
-        "description": "An unknown error has occurred. You can try to update your data. If the problem persists, please contact us at [claude@cozycloud.cc](mailto:claude@cozycloud.cc)."
+        "description": "An unknown error has occurred. You can try to update your data. If the problem persists, please contact us at [%{supportMail}](mailto:%{supportMail})."
       },
       "USER_ACTION_NEEDED": {
         "title": "Action needed on the provider's website",

package/src/locales/fr.json

@@ -151,11 +151,11 @@
       },
       "TERMS_VERSION_MISMATCH": {
         "title": "Nouvelles CGUs à accepter",
-        "description": "Il semblerait que %{name} ait mis à jour ses Conditions Générales d'Utilisation. Merci de vérifier que le service est à jour. Si l'erreur persiste, contacter nous via [contact@cozycloud.cc](mailto:contact@cozycloud.cc)."
+        "description": "Il semblerait que %{name} ait mis à jour ses Conditions Générales d'Utilisation. Merci de vérifier que le service est à jour. Si l'erreur persiste, contacter nous via [%{supportMail}](mailto:%{supportMail})."
       },
       "UNKNOWN_ERROR": {
         "title": "Erreur de Connexion",
-        "description": "Une erreur inconnue est survenue. Vous pouvez essayer de mettre à jour vos données. Si le problème persiste, n'hésitez pas à nous contacter via [claude@cozycloud.cc](mailto:claude@cozycloud.cc)."
+        "description": "Une erreur inconnue est survenue. Vous pouvez essayer de mettre à jour vos données. Si le problème persiste, n'hésitez pas à nous contacter via [%{supportMail}](mailto:%{supportMail})."
       },
       "USER_ACTION_NEEDED": {
         "title": "Action nécessaire chez le fournisseur",

package/src/models/ConnectionFlow.js

@@ -255,6 +255,7 @@ export class ConnectionFlow {
       this.jobWatcher.disableSuccessTimer()
     }
 
+    // eslint-disable-next-line promise/param-names
     return new Promise(rawResolve => {
       const accountId = this.account._id
       assert(accountId, 'Cannot wait for two fa on account without id')