feat: Make konnector prop mandatory to FlowProvider

Now it won't be possible to have a ConnectionFlow created in FlowProvider without a defined konnector, because it has no meaning at all.
cozy · Apr 5, 2023 · f3e3d48 · f3e3d48
1 parent e04a9ee
commit f3e3d48
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/packages/cozy-harvest-lib/src/components/AccountsList/Status.jsx b/packages/cozy-harvest-lib/src/components/AccountsList/Status.jsx
@@ -18,7 +18,7 @@ import FlowProvider from '../FlowProvider'
  */
 const Status = ({ t, trigger, konnector }) => {
   return (
-    <FlowProvider initialTrigger={trigger}>
+    <FlowProvider initialTrigger={trigger} konnector={konnector}>
       {({ flow }) => {
         const { error, running } = flow.getState()
         const errorTitle = getErrorLocale(error, konnector, t, 'title')

diff --git a/packages/cozy-harvest-lib/src/components/FlowProvider.jsx b/packages/cozy-harvest-lib/src/components/FlowProvider.jsx
@@ -5,6 +5,7 @@ import { createPortal } from 'react-dom'
 import { withClient } from 'cozy-client'
 import { translate } from 'cozy-ui/transpiled/react/I18n'
 
+import assert from '../assert'
 import ConnectionBackdrop from './AccountForm/ConnectionBackdrop'
 import TwoFAModal from './TwoFAModal'
 import logger from '../logger'
@@ -38,6 +39,7 @@ export class FlowProvider extends Component {
   constructor(props, context) {
     super(props, context)
     const { initialTrigger, konnector } = this.props
+    assert(konnector, 'no konnector given to FlowProvider')
     this.state = {
       showTwoFAModal: false
     }

diff --git a/packages/cozy-harvest-lib/src/components/OAuthForm.jsx b/packages/cozy-harvest-lib/src/components/OAuthForm.jsx
@@ -73,7 +73,7 @@ export const OAuthForm = props => {
     if (response.result === OAUTH_SERVICE_OK) {
       const konnectorPolicy = findKonnectorPolicy(konnector)
       if (konnectorPolicy.isBIWebView && flag('harvest.bi.fullwebhooks')) {
-        flow.expectTriggerLaunch({ konnector })
+        flow.expectTriggerLaunch()
       }
       const accountId = response.key
       if (typeof onSuccess === 'function') onSuccess(accountId)

diff --git a/packages/cozy-harvest-lib/src/components/TriggerManager.jsx b/packages/cozy-harvest-lib/src/components/TriggerManager.jsx
@@ -475,6 +475,7 @@ const LegacyTriggerManager = props => {
     onLoginSuccess,
     onError,
     initialTrigger,
+    konnector,
     ...otherProps
   } = props
 
@@ -494,13 +495,15 @@ const LegacyTriggerManager = props => {
       onSuccess={onSuccess}
       onLoginSuccess={onLoginSuccess}
       onError={onError}
+      konnector={konnector}
       initialTrigger={initialTrigger}
     >
       {({ flow }) => (
         <TriggerManager
           {...otherProps}
           error={flow.getState().error}
           flow={flow}
+          konnector={konnector}
         />
       )}
     </FlowProvider>

diff --git a/packages/cozy-harvest-lib/src/components/cards/LaunchTriggerCard.spec.jsx b/packages/cozy-harvest-lib/src/components/cards/LaunchTriggerCard.spec.jsx
@@ -132,7 +132,7 @@ describe('LaunchTriggerCard', () => {
 
   it('should display a syncing message when a trigger launch is expected', async () => {
     const flow = new ConnectionFlow(client, triggerFixture, konnectorFixture)
-    flow.expectTriggerLaunch({ konnector: konnectorFixture })
+    flow.expectTriggerLaunch()
 
     const { root } = setup({
       props: {

diff --git a/packages/cozy-harvest-lib/src/models/ConnectionFlow.js b/packages/cozy-harvest-lib/src/models/ConnectionFlow.js
@@ -351,8 +351,7 @@ export class ConnectionFlow {
    * @param {Object} options
    * @param {import('cozy-client/types/types').KonnectorsDoctype} options.konnector
    */
-  expectTriggerLaunch({ konnector }) {
-    this.konnector = konnector
+  expectTriggerLaunch() {
     // @ts-ignore
     logger.info(
       `ConnectionFlow: Expecting trigger launch for konnector ${this.konnector.slug}`
@@ -477,12 +476,11 @@ export class ConnectionFlow {
       })
       this.trigger = trigger
       this.account = account
-      this.konnector = konnector
 
       this.t = t
 
       assert(client, 'No client')
-      const konnectorPolicy = findKonnectorPolicy(konnector)
+      const konnectorPolicy = this.getKonnectorPolicy()
       // @ts-ignore
       logger.log(
         `ConnectionFlow: Handling submit, with konnector policy ${konnectorPolicy.name}`
@@ -723,7 +721,7 @@ export class ConnectionFlow {
       // this will especially allow to show the backdrop effect to tell the user to stay until the login is successful
       this.setState({ firstRun: true })
     }
-    const konnectorPolicy = findKonnectorPolicy(this.konnector)
+    const konnectorPolicy = this.getKonnectorPolicy()
 
     const computedAutoSuccessTimer = autoSuccessTimer
 

diff --git a/packages/cozy-harvest-lib/src/models/ConnectionFlow.spec.js b/packages/cozy-harvest-lib/src/models/ConnectionFlow.spec.js
@@ -809,7 +809,7 @@ describe('ConnectionFlow', () => {
         .mockReset()
         .mockReturnValue(onAccountCreationResult)
 
-      const { flow, client } = setup()
+      const { flow, client } = setup({ konnector: bankingKonnector })
 
       jest.spyOn(flow, 'launch')
 
@@ -836,7 +836,7 @@ describe('expectTriggerLaunch', () => {
     const { flow } = setup({ trigger: fixtures.erroredTrigger })
     flow.setState({ accountError: 'error to hide' })
 
-    flow.expectTriggerLaunch({ konnector: fixtures.konnector })
+    flow.expectTriggerLaunch()
 
     const { accountError } = flow.getState()
     expect(accountError).toBe(null)
@@ -845,7 +845,7 @@ describe('expectTriggerLaunch', () => {
   it('sets the flow status to EXPECTING_TRIGGER_LAUNCH', () => {
     const { flow } = setup({ trigger: fixtures.runningTrigger })
 
-    flow.expectTriggerLaunch({ konnector: fixtures.konnector })
+    flow.expectTriggerLaunch()
 
     const { status } = flow.getState()
     expect(status).toBe(EXPECTING_TRIGGER_LAUNCH)
@@ -854,7 +854,7 @@ describe('expectTriggerLaunch', () => {
   it('starts watching for konnector jobs creation', () => {
     const { flow } = setup({ trigger: fixtures.erroredTrigger })
 
-    flow.expectTriggerLaunch({ konnector: fixtures.konnector })
+    flow.expectTriggerLaunch()
 
     expect(realtimeMock.subscribe).toHaveBeenCalledWith(
       'created',
@@ -872,7 +872,7 @@ describe('expectTriggerLaunch', () => {
 
     it('stops watching for konnector jobs creation', async () => {
       const { flow } = setup({ trigger: fixtures.erroredTrigger })
-      flow.expectTriggerLaunch({ konnector: fixtures.konnector })
+      flow.expectTriggerLaunch()
 
       const job = konnectorJob(flow)
       realtimeMock.events.emit(realtimeMock.key('created', 'io.cozy.jobs'), job)
@@ -886,7 +886,7 @@ describe('expectTriggerLaunch', () => {
 
     it('starts watching for updates on the job itself', () => {
       const { flow } = setup({ trigger: fixtures.erroredTrigger })
-      flow.expectTriggerLaunch({ konnector: fixtures.konnector })
+      flow.expectTriggerLaunch()
 
       const watchJobSpy = jest.spyOn(flow, 'watchJob')
       try {