feat: Return flags with values and adapt TUs

cozy · Jun 13, 2024 · cea0390 · cea0390
1 parent 0564482
commit cea0390
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/src/libs/ReactNativeLauncher.js b/src/libs/ReactNativeLauncher.js
@@ -17,7 +17,7 @@ import { sendKonnectorsLogs } from '/libs/konnectors/sendKonnectorsLogs'
 
 import { wrapTimerFactory } from 'cozy-clisk'
 import flag from 'cozy-flags'
-import { listFlags } from 'cozy-flags/dist/flag'
+import { listFlags, initialize } from 'cozy-flags/dist/flag'
 
 import {
   activateKeepAwake,
@@ -289,11 +289,12 @@ class ReactNativeLauncher extends Launcher {
   }
 
   async _start({ initKonnectorError } = {}) {
+    const { account: prevAccount, konnector, client } = this.getStartContext()
+    await initialize(client)
     if (flag('clisk.html-on-error')) {
       Minilog.pipe(Minilog.backends.array)
     }
     activateKeepAwake('clisk')
-    const { account: prevAccount, konnector } = this.getStartContext()
     try {
       if (initKonnectorError) {
         log.info('Got initKonnectorError ' + initKonnectorError.message)
@@ -341,13 +342,21 @@ class ReactNativeLauncher extends Launcher {
       const { account, trigger, job, manifest } = this.getStartContext()
       const { sourceAccountIdentifier } = this.getUserData()
       const cozyFlags = listFlags()
+      const flagsWithValues = {}
+      if (cozyFlags) {
+        for (const cozyFlag of cozyFlags) {
+          if (cozyFlag.startsWith('clisk')) {
+            flagsWithValues[cozyFlag] = flag(cozyFlag)
+          }
+        }
+      }
       const pilotContext = {
         manifest,
         account,
         trigger,
         job,
         sourceAccountIdentifier,
-        flags: cozyFlags
+        flags: flagsWithValues
       }
 
       if (hasPermission(manifest, 'io.cozy.files')) {

diff --git a/src/libs/ReactNativeLauncher.spec.js b/src/libs/ReactNativeLauncher.spec.js
@@ -18,6 +18,9 @@ jest.mock('./keychain', () => {
     removeCredential: jest.fn()
   }
 })
+jest.mock('cozy-flags', () => {
+  return {}
+})
 import CookieManager from '@react-native-cookies/cookies'
 import { waitFor } from '@testing-library/react-native'
 
@@ -220,7 +223,7 @@ describe('ReactNativeLauncher', () => {
         trigger: fixtures.trigger,
         konnector,
         manifest: konnector,
-        flags: [],
+        flags: {},
         launcherClient: {
           setAppMetadata: () => null
         }
@@ -303,7 +306,7 @@ describe('ReactNativeLauncher', () => {
         },
         sourceAccountIdentifier: 'testsourceaccountidentifier',
         manifest: konnector,
-        flags: []
+        flags: {}
       })
       expect(launcher.pilot.call).not.toHaveBeenCalledWith(
         'ensureNotAuthenticated'
@@ -321,7 +324,7 @@ describe('ReactNativeLauncher', () => {
         trigger: fixtures.trigger,
         konnector,
         manifest: konnector,
-        flags: [],
+        flags: {},
         launcherClient: {
           setAppMetadata: () => null
         }
@@ -349,7 +352,7 @@ describe('ReactNativeLauncher', () => {
           slug: 'testkonnector',
           name: 'Test Konnector'
         },
-        flags: [],
+        flags: {},
         launcherClient: {
           setAppMetadata: () => null
         }
@@ -394,7 +397,7 @@ describe('ReactNativeLauncher', () => {
           slug: 'testkonnector',
           name: 'Test Konnector'
         },
-        flags: [],
+        flags: {},
         launcherClient: {
           setAppMetadata: () => null
         }
@@ -489,7 +492,7 @@ describe('ReactNativeLauncher', () => {
         account: fixtures.account,
         trigger: fixtures.trigger,
         konnector: { slug: 'konnectorslug', clientSide: true },
-        flags: [],
+        flags: {},
         launcherClient: {
           setAppMetadata: () => null
         }
@@ -532,7 +535,7 @@ describe('ReactNativeLauncher', () => {
         account: fixtures.account,
         trigger: fixtures.trigger,
         konnector: { slug: 'konnectorslug', clientSide: true },
-        flags: [],
+        flags: {},
         launcherClient: {
           setAppMetadata: () => null
         }