cozy-harvest-lib 22.0.7 → 22.0.8

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [22.0.8](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@22.0.7...cozy-harvest-lib@22.0.8) (2024-01-23)
+
+
+### Bug Fixes
+
+* No more disabled submit button on 2nd 2FA ([7bdd26c](https://github.com/cozy/cozy-libs/commit/7bdd26c381f8883ea007fafb5515bb8625da67a1))
+
+
+
+
+
 ## [22.0.7](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@22.0.6...cozy-harvest-lib@22.0.7) (2024-01-17)
 
 

package/dist/components/TwoFAModal.js

@@ -69,7 +69,7 @@ export var TwoFAModal = /*#__PURE__*/function (_PureComponent) {
       var flowState = this.props.flow.getState();
       this.setState({
         hasErrored: flowState.twoFARetry,
-        isJobRunning: flowState.twoFARunning || flowState.konnectorRunning
+        isJobRunning: flowState.twoFARunning
       });
     }
   }, {

package/dist/components/TwoFAModal.spec.js

@@ -1,4 +1,6 @@
-import { render, fireEvent } from '@testing-library/react';
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { render, fireEvent, waitFor } from '@testing-library/react';
 import React from 'react';
 import TwoFAModal from './TwoFAModal';
 import AppLike from '../../test/AppLike';
@@ -91,41 +93,77 @@ describe('TwoFAModal', function () {
     expect(root.queryByPlaceholderText('')).toBeFalsy();
     expect(root.getByText("You need to open your provider's app to confirm your authentication. In some cases, you will have to validate two times."));
   });
-  it('should work for several two fa requests', function () {
-    var opts = {
-      account: {
-        state: 'TWO_FA_NEEDED.SMS'
-      },
-      konnectorSlug: 'boursoma83'
-    };
-
-    var _setup3 = setup(opts),
-        root = _setup3.root,
-        flow = _setup3.flow;
-
-    var input = root.getByPlaceholderText('');
-    expect(input).toBeTruthy(); // expect(inp.length).toBe(1)
-    // expect((root)).toBe('')
-
-    expect(root.getByText('This code enables you to finish your connexion.')).toBeTruthy();
-    expect(root.getByText('code')).toBeTruthy();
-    fireEvent.change(input, {
-      target: {
-        value: 'abcd'
+  it('should work for several two fa requests', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var opts, _setup3, root, flow, input, button, input2, input3;
+
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            opts = {
+              account: {
+                state: 'TWO_FA_NEEDED.SMS'
+              },
+              konnectorSlug: 'boursoma83'
+            };
+            _setup3 = setup(opts), root = _setup3.root, flow = _setup3.flow;
+            input = root.getByPlaceholderText('');
+            expect(input).toBeTruthy(); // expect(inp.length).toBe(1)
+            // expect((root)).toBe('')
+
+            expect(root.getByText('This code enables you to finish your connexion.')).toBeTruthy();
+            expect(root.getByText('code')).toBeTruthy();
+            fireEvent.change(input, {
+              target: {
+                value: 'abcd'
+              }
+            });
+            button = root.getByText('Validate').closest('button');
+            expect(button.getAttribute('aria-disabled')).toBe(null);
+            fireEvent.click(button); // 2nd 2FA request
+
+            flow.emit('twoFARequest');
+            expect(getInputValue(root)).toBe('');
+            expect(root.getByText('The second code received on your mobile phone or by email enables you to finalize your connexion.')).toBeTruthy();
+            expect(root.getByText('Second code')).toBeTruthy();
+            input2 = root.getByPlaceholderText('');
+            fireEvent.change(input2, {
+              target: {
+                value: 'abcd'
+              }
+            });
+            _context.next = 18;
+            return waitFor(function () {
+              return expect(root.getByText('Validate').closest('button').getAttribute('aria-disabled')).toBe(null);
+            });
+
+          case 18:
+            flow.emit('twoFARequest'); // 3rd 2FA (should not happen, hypothetical case)
+
+            flow.emit('twoFARequest');
+            expect(getInputValue(root)).toBe('');
+            input3 = root.getByPlaceholderText('');
+            fireEvent.change(input3, {
+              target: {
+                value: 'abcd'
+              }
+            });
+            _context.next = 25;
+            return waitFor(function () {
+              return expect(root.getByText('Validate').closest('button').getAttribute('aria-disabled')).toBe(null);
+            });
+
+          case 25:
+            // First attempt translations are re-used
+            expect(root.getByText('This code enables you to finish your connexion.')).toBeTruthy();
+            expect(root.getByText('code (4)')).toBeTruthy();
+            flow.emit('twoFARequest');
+
+          case 28:
+          case "end":
+            return _context.stop();
+        }
       }
-    }); // 2nd 2FA request
-
-    flow.emit('twoFARequest');
-    expect(getInputValue(root)).toBe('');
-    expect(root.getByText('The second code received on your mobile phone or by email enables you to finalize your connexion.')).toBeTruthy();
-    expect(root.getByText('Second code')).toBeTruthy();
-    flow.emit('twoFARequest'); // 3rd 2FA (should not happen, hypothetical case)
-
-    flow.emit('twoFARequest');
-    expect(getInputValue(root)).toBe(''); // First attempt translations are re-used
-
-    expect(root.getByText('This code enables you to finish your connexion.')).toBeTruthy();
-    expect(root.getByText('code (4)')).toBeTruthy();
-    flow.emit('twoFARequest');
-  });
+    }, _callee);
+  })));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "22.0.7",
+  "version": "22.0.8",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -106,5 +106,5 @@
     "react-router-dom": ">=4.3.1"
   },
   "sideEffects": false,
-  "gitHead": "e96e3f59e027dc5c55614bbe1877b0b7a527b076"
+  "gitHead": "7eb1353edacb3d79bed197c198651f8c685c2fdf"
 }

package/src/components/TwoFAModal.jsx

@@ -47,7 +47,7 @@ export class TwoFAModal extends PureComponent {
     const flowState = this.props.flow.getState()
     this.setState({
       hasErrored: flowState.twoFARetry,
-      isJobRunning: flowState.twoFARunning || flowState.konnectorRunning
+      isJobRunning: flowState.twoFARunning
     })
   }
 

package/src/components/TwoFAModal.spec.jsx

@@ -1,4 +1,4 @@
-import { render, fireEvent } from '@testing-library/react'
+import { render, fireEvent, waitFor } from '@testing-library/react'
 import React from 'react'
 
 import TwoFAModal from './TwoFAModal'
@@ -82,7 +82,7 @@ describe('TwoFAModal', () => {
     )
   })
 
-  it('should work for several two fa requests', () => {
+  it('should work for several two fa requests', async () => {
     const opts = {
       account: {
         state: 'TWO_FA_NEEDED.SMS'
@@ -103,6 +103,9 @@ describe('TwoFAModal', () => {
     expect(root.getByText('code')).toBeTruthy()
 
     fireEvent.change(input, { target: { value: 'abcd' } })
+    const button = root.getByText('Validate').closest('button')
+    expect(button.getAttribute('aria-disabled')).toBe(null)
+    fireEvent.click(button)
 
     // 2nd 2FA request
     flow.emit('twoFARequest')
@@ -115,12 +118,32 @@ describe('TwoFAModal', () => {
     ).toBeTruthy()
 
     expect(root.getByText('Second code')).toBeTruthy()
+    const input2 = root.getByPlaceholderText('')
+    fireEvent.change(input2, { target: { value: 'abcd' } })
+    await waitFor(() =>
+      expect(
+        root
+          .getByText('Validate')
+          .closest('button')
+          .getAttribute('aria-disabled')
+      ).toBe(null)
+    )
     flow.emit('twoFARequest')
 
     // 3rd 2FA (should not happen, hypothetical case)
     flow.emit('twoFARequest')
 
     expect(getInputValue(root)).toBe('')
+    const input3 = root.getByPlaceholderText('')
+    fireEvent.change(input3, { target: { value: 'abcd' } })
+    await waitFor(() =>
+      expect(
+        root
+          .getByText('Validate')
+          .closest('button')
+          .getAttribute('aria-disabled')
+      ).toBe(null)
+    )
     // First attempt translations are re-used
     expect(
       root.getByText('This code enables you to finish your connexion.')