cozy-harvest-lib 7.3.7 → 8.1.1

package/CHANGELOG.md

@@ -3,6 +3,52 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.1.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.1.0...cozy-harvest-lib@8.1.1) (2022-04-11)
+
+
+### Bug Fixes
+
+* **cozy-harvest-lib:** Correctly handle onClick on AppLinkCard ([c9068c5](https://github.com/cozy/cozy-libs/commit/c9068c53a1ec2e1f6b9b7636f6b25aadec69900f))
+* **cozy-harvest-lib:** Disable AppLink button until fallback is resolved ([bedc90d](https://github.com/cozy/cozy-libs/commit/bedc90d80c899bb93a2be70d6963d62742fb600b))
+
+
+
+
+
+# [8.1.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.0.0...cozy-harvest-lib@8.1.0) (2022-04-08)
+
+
+### Bug Fixes
+
+* Remove unused restoreAllMocks ([6dd376a](https://github.com/cozy/cozy-libs/commit/6dd376a2a7f4393a9446375383d6b77510f87d95))
+
+
+### Features
+
+* Do not mark a job as succeeded on login success ([39e6d01](https://github.com/cozy/cozy-libs/commit/39e6d0161839a6d00ef0dcf24eb6aa0ddeff5f78))
+* Watch job changes when the trigger is already running ([ca01663](https://github.com/cozy/cozy-libs/commit/ca01663eb41bbbcfed5d1f146c9cd68956faa9df))
+
+
+
+
+
+# [8.0.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@7.3.7...cozy-harvest-lib@8.0.0) (2022-04-04)
+
+
+### Bug Fixes
+
+* **cozy-harvest-lib:** Correctly handle AppLinker's onClick ([b45b2e9](https://github.com/cozy/cozy-libs/commit/b45b2e9942635bf36a78bcbf9ac3f8eacdd1fde2)), closes [cozy/cozy-ui#2015](https://github.com/cozy/cozy-ui/issues/2015)
+* **cozy-harvest-lib:** Replace deprecated usage of slug in AppLinker ([24b33d7](https://github.com/cozy/cozy-libs/commit/24b33d7cf3fe26339a00d6f5279d5e92adc71bc5)), closes [cozy/cozy-ui#2015](https://github.com/cozy/cozy-ui/issues/2015)
+
+
+### BREAKING CHANGES
+
+* **cozy-harvest-lib:** `cozy-harvest-lib` now requires `cozy-ui` version `60.6.0` or superior
+
+
+
+
+
 ## [7.3.7](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@7.3.6...cozy-harvest-lib@7.3.7) (2022-04-01)
 
 

package/dist/components/KonnectorConfiguration/Success/BanksLink.js

@@ -18,17 +18,21 @@ var BanksLinkRedirectStore = function BanksLinkRedirectStore(_ref) {
 
   if (fetchStatus === 'loaded') {
     return /*#__PURE__*/React.createElement(AppLinker, {
-      slug: slug,
+      app: {
+        slug: slug
+      },
       href: url
     }, function (_ref2) {
       var href = _ref2.href,
-          name = _ref2.name;
+          name = _ref2.name,
+          onClick = _ref2.onClick;
       return /*#__PURE__*/React.createElement(ButtonLink, {
         icon: OpenwithIcon,
         href: href,
         label: t('account.success.banksLinkText', {
           appName: name
         }),
+        onClick: onClick,
         subtle: true
       });
     });

package/dist/components/KonnectorConfiguration/Success/DriveLink.js

@@ -19,18 +19,22 @@ var DriveLink = /*#__PURE__*/memo(function (_ref) {
 
   if (fetchStatus === 'loaded') {
     return /*#__PURE__*/React.createElement(AppLinker, {
-      slug: slug,
+      app: {
+        slug: slug
+      },
       href: url,
       nativePath: path
     }, function (_ref2) {
       var href = _ref2.href,
-          name = _ref2.name;
+          name = _ref2.name,
+          onClick = _ref2.onClick;
       return /*#__PURE__*/React.createElement(ButtonLink, {
         icon: OpenwithIcon,
         href: href,
         label: t('account.success.driveLinkText', {
           appName: name
         }),
+        onClick: onClick,
         subtle: true
       });
     });

package/dist/components/KonnectorSuggestionModal/index.js

@@ -117,7 +117,9 @@ var KonnectorSuggestionModal = function KonnectorSuggestionModal(_ref) {
   }), /*#__PURE__*/React.createElement("br", null), t('suggestions.reason_bank', {
     name: name
   })), /*#__PURE__*/React.createElement(AppLinker, {
-    slug: storeAppName,
+    app: {
+      slug: storeAppName
+    },
     nativePath: nativePath,
     href: generateWebLink({
       cozyUrl: cozyURL.origin,

package/dist/components/KonnectorUpdateLinker.js

@@ -11,11 +11,13 @@ var KonnectorUpdateButton = function KonnectorUpdateButton(_ref) {
   var disabled = _ref.disabled,
       isBlocking = _ref.isBlocking,
       href = _ref.href,
+      onClick = _ref.onClick,
       label = _ref.label;
   return /*#__PURE__*/React.createElement(ButtonLink, {
     disabled: disabled,
     className: "u-m-0",
     href: href,
+    onClick: onClick,
     icon: EyeIcon,
     label: label,
     theme: isBlocking ? 'danger' : 'secondary'
@@ -35,14 +37,18 @@ var KonnectorUpdateLinker = function KonnectorUpdateLinker(_ref2) {
   var konnectorUpdateUrl = data ? Application.getStoreInstallationURL(data, konnector) : null;
   var isReady = isLoaded && konnectorUpdateUrl;
   return isReady ? /*#__PURE__*/React.createElement(AppLinker, {
-    slug: "store",
+    app: {
+      slug: 'store'
+    },
     href: konnectorUpdateUrl
   }, function (_ref3) {
-    var href = _ref3.href;
+    var onClick = _ref3.onClick,
+        href = _ref3.href;
     return /*#__PURE__*/React.createElement(KonnectorUpdateButton, {
       href: href,
       isBlocking: isBlocking,
-      label: label
+      label: label,
+      onClick: onClick
     });
   }) : /*#__PURE__*/React.createElement(KonnectorUpdateButton, {
     disabled: true,

package/dist/components/cards/AppLinkCard.js

@@ -32,14 +32,17 @@ export var AppLinkButton = function AppLinkButton(_ref) {
       isInstalled = _useAppLinkWithStoreF.isInstalled;
 
   return /*#__PURE__*/React.createElement(AppLinker, {
-    slug: slug,
+    app: {
+      slug: slug
+    },
     nativePath: path,
     href: url || '#'
   }, function (_ref2) {
     var onClick = _ref2.onClick,
         href = _ref2.href;
     return /*#__PURE__*/React.createElement(ButtonLink, {
-      onClick: fetchStatus !== 'loaded' ? onClick : null,
+      disabled: fetchStatus !== 'loaded',
+      onClick: fetchStatus === 'loaded' ? onClick : null,
       href: href,
       icon: isInstalled ? /*#__PURE__*/React.createElement(AppIcon, {
         app: slug,

package/dist/models/ConnectionFlow.js

@@ -184,6 +184,7 @@ export var ConnectionFlow = /*#__PURE__*/function () {
     this.realtime = new Realtime({
       client: client
     });
+    this.watchCurrentJobIfTriggerIsAlreadyRunning();
   }
 
   _createClass(ConnectionFlow, [{
@@ -500,7 +501,8 @@ export var ConnectionFlow = /*#__PURE__*/function () {
   }, {
     key: "handleLoginSuccess",
     value: function handleLoginSuccess() {
-      this.jobWatcher.handleSuccess();
+      this.jobWatcher.handleLoginSuccess();
+      this.triggerEvent(LOGIN_SUCCESS_EVENT);
     }
   }, {
     key: "handleLoginSuccessHandled",
@@ -848,16 +850,11 @@ export var ConnectionFlow = /*#__PURE__*/function () {
     key: "launch",
     value: function () {
       var _launch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
-        var _this2 = this;
-
         var _ref5,
             _ref5$autoSuccessTime,
             autoSuccessTimer,
             computedAutoSuccessTimer,
             launcher,
-            _iterator2,
-            _step2,
-            _loop,
             _args11 = arguments;
 
         return _regeneratorRuntime.wrap(function _callee11$(_context11) {
@@ -908,42 +905,11 @@ export var ConnectionFlow = /*#__PURE__*/function () {
                   }
                 }
 
-                this.realtime.subscribe('updated', JOBS_DOCTYPE, this.job._id, this.handleJobUpdated.bind(this));
-                this.jobWatcher = watchKonnectorJob(this.client, this.job, {
+                this.watchJob({
                   autoSuccessTimer: computedAutoSuccessTimer
                 });
-                logger.info("ConnectionFlow: Subscribed to ".concat(JOBS_DOCTYPE, ":").concat(this.job._id));
-                _iterator2 = _createForOfIteratorHelper(JOB_EVENTS);
-
-                try {
-                  _loop = function _loop() {
-                    var ev = _step2.value;
-
-                    _this2.jobWatcher.on(ev, function () {
-                      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-                        args[_key2] = arguments[_key2];
-                      }
-
-                      return _this2.triggerEvent.apply(_this2, [ev].concat(args));
-                    });
-                  };
-
-                  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                    _loop();
-                  }
-                } catch (err) {
-                  _iterator2.e(err);
-                } finally {
-                  _iterator2.f();
-                }
-
-                this.unsubscribeAllRealtime = function () {
-                  _this2.jobWatcher.unsubscribeAll();
-
-                  _this2.realtime.unsubscribeAll();
-                };
 
-              case 19:
+              case 14:
               case "end":
                 return _context11.stop();
             }
@@ -957,6 +923,63 @@ export var ConnectionFlow = /*#__PURE__*/function () {
 
       return launch;
     }()
+    /**
+     * If the trigger we display is already running, subscribe to the associated job
+     */
+
+  }, {
+    key: "watchCurrentJobIfTriggerIsAlreadyRunning",
+    value: function watchCurrentJobIfTriggerIsAlreadyRunning() {
+      if (get(this, 'trigger.current_state.status') === 'running') {
+        this.job = {
+          _id: get(this, 'trigger.current_state.last_executed_job_id')
+        };
+        this.watchJob();
+      }
+    }
+  }, {
+    key: "watchJob",
+    value: function watchJob() {
+      var _this2 = this;
+
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+        autoSuccessTimer: false
+      };
+      this.realtime.subscribe('updated', JOBS_DOCTYPE, this.job._id, this.handleJobUpdated.bind(this));
+      this.jobWatcher = watchKonnectorJob(this.client, this.job, options);
+      logger.info("ConnectionFlow: Subscribed to ".concat(JOBS_DOCTYPE, ":").concat(this.job._id));
+
+      var _iterator2 = _createForOfIteratorHelper(JOB_EVENTS),
+          _step2;
+
+      try {
+        var _loop = function _loop() {
+          var ev = _step2.value;
+
+          _this2.jobWatcher.on(ev, function () {
+            for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+              args[_key2] = arguments[_key2];
+            }
+
+            return _this2.triggerEvent.apply(_this2, [ev].concat(args));
+          });
+        };
+
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          _loop();
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+
+      this.unsubscribeAllRealtime = function () {
+        _this2.jobWatcher.unsubscribeAll();
+
+        _this2.realtime.unsubscribeAll();
+      };
+    }
   }, {
     key: "unwatch",
     value: function unwatch() {
@@ -985,7 +1008,7 @@ export var ConnectionFlow = /*#__PURE__*/function () {
           accountError = _this$state.accountError;
       var triggerError = triggersModel.getKonnectorJobError(trigger);
       return {
-        running: ![ERRORED, IDLE, SUCCESS].includes(status),
+        running: get(trigger, 'current_state.status') === 'running' || ![ERRORED, IDLE, SUCCESS].includes(status),
         twoFARunning: status === RUNNING_TWOFA,
         twoFARetry: status == TWO_FA_MISMATCH,
         triggerError: triggerError,

package/dist/models/ConnectionFlow.spec.js

@@ -11,11 +11,12 @@ import cronHelpers from 'helpers/cron';
 import { saveAccount } from '../connections/accounts';
 import { createTrigger, ensureTrigger, prepareTriggerAccount, launchTrigger } from '../connections/triggers';
 import CozyRealtime from 'cozy-realtime';
-import KonnectorJobWatcher from './konnector/KonnectorJobWatcher';
+import KonnectorJobWatcher, { watchKonnectorJob } from './konnector/KonnectorJobWatcher';
 import { konnectorPolicy as biKonnectorPolicy } from '../services/budget-insight';
 import fixtures from '../../test/fixtures';
 import sentryHub from '../sentry';
 import { Q } from 'cozy-client';
+jest.mock('./konnector/KonnectorJobWatcher');
 jest.mock('../sentry', function () {
   var mockScope = {
     setTag: jest.fn()
@@ -190,6 +191,16 @@ describe('ConnectionFlow', function () {
       return flow.getState().running === true;
     };
 
+    beforeAll(function () {
+      watchKonnectorJob.mockReturnValue({
+        on: function on() {
+          return {};
+        }
+      });
+    });
+    afterEach(function () {
+      jest.clearAllMocks();
+    });
     it('should render as submitting when there is no account', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
       var _setup, flow, submitPromise;
 
@@ -371,6 +382,10 @@ describe('ConnectionFlow', function () {
                 userCredentials: {
                   login: 'foo',
                   password: 'bar'
+                },
+                account: {
+                  login: 'old',
+                  password: 'old'
                 }
               });
 
@@ -495,13 +510,15 @@ describe('ConnectionFlow', function () {
   describe('ensureTriggerAndLaunch', function () {
     beforeAll(function () {
       jest.spyOn(cronHelpers, 'fromFrequency').mockReturnValue('0 0 0 * * 0');
+      watchKonnectorJob.mockReturnValue({
+        on: function on() {
+          return {};
+        }
+      });
     });
     afterEach(function () {
       jest.clearAllMocks();
     });
-    afterAll(function () {
-      jest.restoreAllMocks();
-    });
     it('should launch trigger without account', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16() {
       var _setup11, flow, client;
 
@@ -782,5 +799,27 @@ describe('ConnectionFlow', function () {
     delete window.cozy;
     delete window.ReactNativeWebView;
   });
+  describe('constructor', function () {
+    beforeAll(function () {
+      watchKonnectorJob.mockReturnValue({
+        on: function on() {
+          return {};
+        }
+      });
+    });
+    afterEach(function () {
+      jest.clearAllMocks();
+    });
+    it('should watch a running trigger', function () {
+      setup({
+        trigger: fixtures.runningTrigger
+      });
+      expect(watchKonnectorJob).toHaveBeenCalledWith(expect.any(Object), {
+        _id: 'runningjobid'
+      }, {
+        autoSuccessTimer: false
+      });
+    });
+  });
 }); // it should have running false on trigger updates
 // it should set error on trigger updates

package/dist/models/konnector/KonnectorJobWatcher.js

@@ -76,6 +76,12 @@ export var KonnectorJobWatcher = /*#__PURE__*/function () {
       this._error = error;
       this.emit('error', new KonnectorJobError(error));
     }
+  }, {
+    key: "handleLoginSuccess",
+    value: function handleLoginSuccess() {
+      logger.info("KonnectorJobWatcher: login success");
+      this.disableSuccessTimer();
+    }
   }, {
     key: "handleSuccess",
     value: function handleSuccess() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "7.3.7",
+  "version": "8.1.1",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -57,7 +57,7 @@
     "cozy-flags": "^2.8.7",
     "cozy-keys-lib": "3.8.0",
     "cozy-realtime": "^4.0.5",
-    "cozy-ui": "57.6.0",
+    "cozy-ui": "60.6.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
     "form-data": "3.0.0",
@@ -80,10 +80,10 @@
     "cozy-flags": ">=2.3.5",
     "cozy-keys-lib": ">=3.7.0",
     "cozy-realtime": ">=3.12.2",
-    "cozy-ui": ">=57.6.0",
+    "cozy-ui": ">=60.6.0",
     "leaflet": "^1.7.1",
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "f0cc87a62171e60b8ec8e15aa92fd17db81c9921"
+  "gitHead": "33faa014567ecbc026970a630e43d4425b3ccec3"
 }

package/src/components/KonnectorConfiguration/Success/BanksLink.jsx

@@ -15,14 +15,15 @@ const BanksLinkRedirectStore = ({ client, t }) => {
 
   if (fetchStatus === 'loaded') {
     return (
-      <AppLinker slug={slug} href={url}>
-        {({ href, name }) => (
+      <AppLinker app={{ slug }} href={url}>
+        {({ href, name, onClick }) => (
           <ButtonLink
             icon={OpenwithIcon}
             href={href}
             label={t('account.success.banksLinkText', {
               appName: name
             })}
+            onClick={onClick}
             subtle
           />
         )}

package/src/components/KonnectorConfiguration/Success/DriveLink.jsx

@@ -15,14 +15,15 @@ const DriveLink = memo(({ folderId, client, t }) => {
 
   if (fetchStatus === 'loaded') {
     return (
-      <AppLinker slug={slug} href={url} nativePath={path}>
-        {({ href, name }) => (
+      <AppLinker app={{ slug }} href={url} nativePath={path}>
+        {({ href, name, onClick }) => (
           <ButtonLink
             icon={OpenwithIcon}
             href={href}
             label={t('account.success.driveLinkText', {
               appName: name
             })}
+            onClick={onClick}
             subtle
           />
         )}

package/src/components/KonnectorSuggestionModal/index.jsx

@@ -85,7 +85,7 @@ const KonnectorSuggestionModal = ({
               </Typography>
             )}
             <AppLinker
-              slug={storeAppName}
+              app={{ slug: storeAppName }}
               nativePath={nativePath}
               href={generateWebLink({
                 cozyUrl: cozyURL.origin,

package/src/components/KonnectorUpdateLinker.jsx

@@ -9,11 +9,18 @@ import EyeIcon from 'cozy-ui/transpiled/react/Icons/Eye'
 import { Application } from 'cozy-doctypes'
 import { appsConn } from '../connections/apps'
 
-const KonnectorUpdateButton = ({ disabled, isBlocking, href, label }) => (
+const KonnectorUpdateButton = ({
+  disabled,
+  isBlocking,
+  href,
+  onClick,
+  label
+}) => (
   <ButtonLink
     disabled={disabled}
     className="u-m-0"
     href={href}
+    onClick={onClick}
     icon={EyeIcon}
     label={label}
     theme={isBlocking ? 'danger' : 'secondary'}
@@ -29,13 +36,14 @@ const KonnectorUpdateLinker = ({ label, isBlocking, konnector }) => {
   const isReady = isLoaded && konnectorUpdateUrl
 
   return isReady ? (
-    <AppLinker slug="store" href={konnectorUpdateUrl}>
-      {({ href }) => {
+    <AppLinker app={{ slug: 'store' }} href={konnectorUpdateUrl}>
+      {({ onClick, href }) => {
         return (
           <KonnectorUpdateButton
             href={href}
             isBlocking={isBlocking}
             label={label}
+            onClick={onClick}
           />
         )
       }}

package/src/components/cards/AppLinkCard.jsx

@@ -25,10 +25,11 @@ export const AppLinkButton = ({ slug, path }) => {
     path
   )
   return (
-    <AppLinker slug={slug} nativePath={path} href={url || '#'}>
+    <AppLinker app={{ slug }} nativePath={path} href={url || '#'}>
       {({ onClick, href }) => (
         <ButtonLink
-          onClick={fetchStatus !== 'loaded' ? onClick : null}
+          disabled={fetchStatus !== 'loaded'}
+          onClick={fetchStatus === 'loaded' ? onClick : null}
           href={href}
           icon={
             isInstalled ? (

package/src/models/ConnectionFlow.js

@@ -175,6 +175,8 @@ export class ConnectionFlow {
     this.twoFAWaiters = this.twoFAWaiters || []
 
     this.realtime = new Realtime({ client })
+
+    this.watchCurrentJobIfTriggerIsAlreadyRunning()
   }
 
   getTwoFACodeProvider() {
@@ -344,7 +346,8 @@ export class ConnectionFlow {
   }
 
   handleLoginSuccess() {
-    this.jobWatcher.handleSuccess()
+    this.jobWatcher.handleLoginSuccess()
+    this.triggerEvent(LOGIN_SUCCESS_EVENT)
   }
 
   handleLoginSuccessHandled() {
@@ -576,16 +579,29 @@ export class ConnectionFlow {
         logger.info('Found no client connector launcher')
       }
     }
+    this.watchJob({ autoSuccessTimer: computedAutoSuccessTimer })
+  }
 
+  /**
+   * If the trigger we display is already running, subscribe to the associated job
+   */
+  watchCurrentJobIfTriggerIsAlreadyRunning() {
+    if (get(this, 'trigger.current_state.status') === 'running') {
+      this.job = {
+        _id: get(this, 'trigger.current_state.last_executed_job_id')
+      }
+      this.watchJob()
+    }
+  }
+
+  watchJob(options = {autoSuccessTimer: false}) {
     this.realtime.subscribe(
       'updated',
       JOBS_DOCTYPE,
       this.job._id,
       this.handleJobUpdated.bind(this)
     )
-    this.jobWatcher = watchKonnectorJob(this.client, this.job, {
-      autoSuccessTimer: computedAutoSuccessTimer
-    })
+    this.jobWatcher = watchKonnectorJob(this.client, this.job, options)
     logger.info(`ConnectionFlow: Subscribed to ${JOBS_DOCTYPE}:${this.job._id}`)
 
     for (const ev of JOB_EVENTS) {
@@ -621,7 +637,9 @@ export class ConnectionFlow {
     const { status, accountError } = this.state
     const triggerError = triggersModel.getKonnectorJobError(trigger)
     return {
-      running: ![ERRORED, IDLE, SUCCESS].includes(status),
+      running:
+        get(trigger, 'current_state.status') === 'running' ||
+        ![ERRORED, IDLE, SUCCESS].includes(status),
       twoFARunning: status === RUNNING_TWOFA,
       twoFARetry: status == TWO_FA_MISMATCH,
       triggerError: triggerError,

package/src/models/ConnectionFlow.spec.js

@@ -8,12 +8,13 @@ import {
   launchTrigger
 } from '../connections/triggers'
 import CozyRealtime from 'cozy-realtime'
-import KonnectorJobWatcher from './konnector/KonnectorJobWatcher'
+import KonnectorJobWatcher, { watchKonnectorJob } from './konnector/KonnectorJobWatcher'
 import { konnectorPolicy as biKonnectorPolicy } from '../services/budget-insight'
 import fixtures from '../../test/fixtures'
 import sentryHub from '../sentry'
 import { Q } from 'cozy-client'
 
+jest.mock('./konnector/KonnectorJobWatcher')
 jest.mock('../sentry', () => {
   const mockScope = {
     setTag: jest.fn()
@@ -116,6 +117,14 @@ describe('ConnectionFlow', () => {
     const isSubmitting = flow => {
       return flow.getState().running === true
     }
+    beforeAll(() => {
+      watchKonnectorJob.mockReturnValue({on: () => ({})})
+    })
+
+    afterEach(() => {
+      jest.clearAllMocks()
+    })
+
 
     it('should render as submitting when there is no account', async () => {
       const { flow } = setup()
@@ -213,6 +222,10 @@ describe('ConnectionFlow', () => {
         userCredentials: {
           login: 'foo',
           password: 'bar'
+        },
+        account: {
+          login: 'old',
+          password: 'old'
         }
       })
 
@@ -314,16 +327,13 @@ describe('ConnectionFlow', () => {
   describe('ensureTriggerAndLaunch', () => {
     beforeAll(() => {
       jest.spyOn(cronHelpers, 'fromFrequency').mockReturnValue('0 0 0 * * 0')
+      watchKonnectorJob.mockReturnValue({on: () => ({})})
     })
 
     afterEach(() => {
       jest.clearAllMocks()
     })
 
-    afterAll(() => {
-      jest.restoreAllMocks()
-    })
-
     it('should launch trigger without account', async () => {
       const { flow, client } = setup()
       await flow.ensureTriggerAndLaunch(client, {
@@ -481,6 +491,21 @@ describe('ConnectionFlow', () => {
     delete window.cozy
     delete window.ReactNativeWebView
   })
+
+  describe('constructor', () => {
+    beforeAll(() => {
+      watchKonnectorJob.mockReturnValue({on: () => ({})})
+    })
+
+    afterEach(() => {
+      jest.clearAllMocks()
+    })
+
+    it('should watch a running trigger', () => {
+      setup({trigger: fixtures.runningTrigger})
+      expect(watchKonnectorJob).toHaveBeenCalledWith(expect.any(Object), {_id: 'runningjobid'}, {autoSuccessTimer: false})
+    })
+  })
 })
 
 // it should have running false on trigger updates

package/src/models/konnector/KonnectorJobWatcher.js

@@ -66,6 +66,11 @@ export class KonnectorJobWatcher {
     this.emit('error', new KonnectorJobError(error))
   }
 
+  handleLoginSuccess() {
+    logger.info(`KonnectorJobWatcher: login success`)
+    this.disableSuccessTimer()
+  }
+
   handleSuccess() {
     logger.info(`KonnectorJobWatcher: Job has succeeded`)
     this.disableSuccessTimer()

package/test/fixtures.js

@@ -125,6 +125,23 @@ const fixtures = {
       }
     }
   },
+  runningTrigger: {
+    id: 'running-trigger-id',
+    _type: 'io.cozy.triggers',
+    current_state: {
+      status: 'running',
+      last_executed_job_id: 'runningjobid'
+    },
+    attributes: {
+      arguments: '0 0 0 * * 0',
+      type: '@cron',
+      worker: 'konnector',
+      message: {
+        account: 'updated-account-id',
+        konnector: 'konnectest'
+      }
+    }
+  },
   createdTriggerWithFolder: {
     id: 'created-trigger-id',
     _type: 'io.cozy.triggers',