feat: Propogate NFC availability config to ID Check SDK

jonnyandrew · jonnyandrew · commit 0bffdb8b9ab0 · 2026-02-17T11:11:24.000Z
diff --git a/features/config/public-api/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/config/publicapi/FakeConfig.kt b/features/config/public-api/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/config/publicapi/FakeConfig.kt
@@ -3,6 +3,7 @@ package uk.gov.onelogin.criorchestrator.features.config.publicapi
 import kotlinx.collections.immutable.persistentListOf
 import uk.gov.onelogin.criorchestrator.features.config.publicapi.SdkConfigKey.IdCheckAsyncBackendBaseUrl
 import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.publicapi.IdCheckWrapperConfigKey
+import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.publicapi.nfc.NfcConfigKey
 
 object FakeConfig {
     const val ID_CHECK_BACKEND_ASYNC_URL_TEST_VALUE = "https://test.backend.url"
@@ -31,6 +32,10 @@ object FakeConfig {
                         key = IdCheckWrapperConfigKey.ExperimentalComposeNavigation,
                         value = Config.Value.BooleanValue(false),
                     ),
+                    Config.Entry<Config.Value.StringValue>(
+                        key = NfcConfigKey.NfcAvailability,
+                        value = Config.Value.StringValue(NfcConfigKey.NfcAvailability.OPTION_DEVICE),
+                    ),
                 ),
         )
 }
diff --git a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/activity/IdCheckSdkActivityParameters.kt b/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/activity/IdCheckSdkActivityParameters.kt
@@ -11,4 +11,5 @@ internal fun LauncherData.toIdCheckSdkActivityParameters() =
         bioToken = this.biometricToken,
         backendMode = this.backendMode,
         experimentalComposeNavigation = this.experimentalComposeNavigation,
+        nfcAvailability = this.nfcAvailability,
     )
diff --git a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/data/LauncherDataReader.kt b/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/data/LauncherDataReader.kt
@@ -3,6 +3,7 @@ package uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internal.data
 import dev.zacsweers.metro.Inject
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.first
+import uk.gov.idcheck.repositories.api.config.NfcAvailability
 import uk.gov.idcheck.repositories.api.webhandover.backend.BackendMode
 import uk.gov.onelogin.criorchestrator.features.config.internalapi.ConfigStore
 import uk.gov.onelogin.criorchestrator.features.config.publicapi.SdkConfigKey
@@ -12,6 +13,7 @@ import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internal.model.La
 import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internal.nav.toDocumentType
 import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internalapi.DocumentVariety
 import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.publicapi.IdCheckWrapperConfigKey
+import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.publicapi.nfc.NfcConfigKey
 import uk.gov.onelogin.criorchestrator.features.session.internalapi.domain.Session
 import uk.gov.onelogin.criorchestrator.features.session.internalapi.domain.SessionStore
 
@@ -30,6 +32,13 @@ class LauncherDataReader(
         val experimentalComposeNavigation: Boolean =
             configStore.readSingle(IdCheckWrapperConfigKey.ExperimentalComposeNavigation).value
 
+        val nfcAvailability =
+            when (configStore.readSingle(NfcConfigKey.NfcAvailability).value) {
+                NfcConfigKey.NfcAvailability.OPTION_AVAILABLE -> NfcAvailability.Available
+                NfcConfigKey.NfcAvailability.OPTION_NOT_AVAILABLE -> NfcAvailability.Unavailable
+                else -> NfcAvailability.Device
+            }
+
         if (result is BiometricTokenResult.Success) {
             sessionStore.updateToDocumentSelected()
         }
@@ -73,6 +82,7 @@ class LauncherDataReader(
                         documentType = documentVariety.toDocumentType(),
                         backendMode = backendMode,
                         experimentalComposeNavigation = experimentalComposeNavigation,
+                        nfcAvailability = nfcAvailability,
                     ),
                 )
             }
diff --git a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/model/LauncherData.kt b/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/model/LauncherData.kt
@@ -1,5 +1,6 @@
 package uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internal.model
 
+import uk.gov.idcheck.repositories.api.config.NfcAvailability
 import uk.gov.idcheck.repositories.api.vendor.BiometricToken
 import uk.gov.idcheck.repositories.api.webhandover.backend.BackendMode
 import uk.gov.idcheck.repositories.api.webhandover.documenttype.DocumentType
@@ -14,6 +15,7 @@ data class LauncherData(
     val documentType: DocumentType,
     val backendMode: BackendMode,
     val experimentalComposeNavigation: Boolean,
+    val nfcAvailability: NfcAvailability,
 ) {
     companion object;
 
diff --git a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/nfc/NfcBindings.kt b/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/nfc/NfcBindings.kt
@@ -5,28 +5,11 @@ import android.nfc.NfcManager
 import dev.zacsweers.metro.BindingContainer
 import dev.zacsweers.metro.ContributesTo
 import dev.zacsweers.metro.Provides
-import dev.zacsweers.metro.SingleIn
-import uk.gov.onelogin.criorchestrator.features.config.internalapi.ConfigStore
-import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internalapi.nfc.NfcChecker
 import uk.gov.onelogin.criorchestrator.libraries.di.CriOrchestratorScope
-import uk.gov.idcheck.sdk.passport.nfc.checker.NfcCheckerImpl as IdCheckSdkNfcCheckerImpl
 
 @BindingContainer
 @ContributesTo(CriOrchestratorScope::class)
 object NfcBindings {
     @Provides
-    @SingleIn(CriOrchestratorScope::class)
-    fun provideNfcChecker(
-        context: Context,
-        configStore: ConfigStore,
-    ): NfcChecker {
-        val nfcManager = context.getSystemService(Context.NFC_SERVICE) as NfcManager
-
-        val idCheckSdkNfcCheckerImpl = IdCheckSdkNfcCheckerImpl(nfcManager)
-
-        return NfcCheckerImpl(
-            configStore = configStore,
-            deviceNfcChecker = idCheckSdkNfcCheckerImpl,
-        )
-    }
+    fun provideNfcManager(context: Context): NfcManager = context.getSystemService(Context.NFC_SERVICE) as NfcManager
 }
diff --git a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/nfc/NfcCheckerImpl.kt b/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/nfc/NfcCheckerImpl.kt
@@ -1,18 +1,21 @@
 package uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internal.nfc
 
+import android.nfc.NfcManager
+import dev.zacsweers.metro.ContributesBinding
 import uk.gov.onelogin.criorchestrator.features.config.internalapi.ConfigStore
 import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internalapi.nfc.NfcChecker
 import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.publicapi.nfc.NfcConfigKey
-import uk.gov.idcheck.sdk.passport.nfc.checker.NfcChecker as IdCheckSdkNfcChecker
+import uk.gov.onelogin.criorchestrator.libraries.di.CriOrchestratorScope
 
+@ContributesBinding(CriOrchestratorScope::class)
 class NfcCheckerImpl(
     private val configStore: ConfigStore,
-    private val deviceNfcChecker: IdCheckSdkNfcChecker,
+    private val nfcManager: NfcManager,
 ) : NfcChecker {
     override fun hasNfc(): Boolean =
         when (configStore.readSingle(NfcConfigKey.NfcAvailability).value) {
             NfcConfigKey.NfcAvailability.OPTION_AVAILABLE -> true
             NfcConfigKey.NfcAvailability.OPTION_NOT_AVAILABLE -> false
-            else -> deviceNfcChecker.hasNfc()
+            else -> nfcManager.defaultAdapter != null
         }
 }
diff --git a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/screen/SyncIdCheckScreenManualLauncherContent.kt b/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/screen/SyncIdCheckScreenManualLauncherContent.kt
@@ -21,6 +21,7 @@ import uk.gov.android.ui.componentsv2.inputs.radio.TitleType
 import uk.gov.android.ui.patterns.leftalignedscreen.LeftAlignedScreen
 import uk.gov.android.ui.theme.m3.GdsTheme
 import uk.gov.android.ui.theme.util.UnstableDesignSystemAPI
+import uk.gov.idcheck.repositories.api.config.NfcAvailability
 import uk.gov.idcheck.repositories.api.vendor.BiometricToken
 import uk.gov.idcheck.repositories.api.webhandover.backend.BackendMode
 import uk.gov.idcheck.repositories.api.webhandover.documenttype.DocumentType
@@ -140,6 +141,7 @@ internal fun PreviewSyncIdCheckManualLauncherContent() {
                         ),
                     backendMode = BackendMode.V2,
                     experimentalComposeNavigation = false,
+                    nfcAvailability = NfcAvailability.Device,
                 ),
             exitStateOptions = ExitStateOption.entries.map { it.displayName }.toPersistentList(),
             selectedExitState = 0,
diff --git a/features/id-check-wrapper/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/data/LauncherDataReaderTest.kt b/features/id-check-wrapper/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/data/LauncherDataReaderTest.kt
@@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
+import uk.gov.idcheck.repositories.api.config.NfcAvailability
 import uk.gov.idcheck.repositories.api.vendor.BiometricToken
 import uk.gov.idcheck.repositories.api.webhandover.backend.BackendMode
 import uk.gov.idcheck.repositories.api.webhandover.documenttype.DocumentType
@@ -23,6 +24,7 @@ import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internal.biometri
 import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internal.model.LauncherData
 import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internalapi.DocumentVariety
 import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.publicapi.IdCheckWrapperConfigKey
+import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.publicapi.nfc.NfcConfigKey
 import uk.gov.onelogin.criorchestrator.features.session.internalapi.domain.FakeSessionStore
 import uk.gov.onelogin.criorchestrator.features.session.internalapi.domain.Session
 import uk.gov.onelogin.criorchestrator.features.session.internalapi.domain.SessionStore
@@ -52,6 +54,11 @@ class LauncherDataReaderTest {
                         value =
                             Config.Value.BooleanValue(false),
                     ),
+                    Config.Entry<Config.Value.StringValue>(
+                        key = NfcConfigKey.NfcAvailability,
+                        value =
+                            Config.Value.StringValue(NfcConfigKey.NfcAvailability.OPTION_DEVICE),
+                    ),
                 ),
         )
     private val configStore by lazy {
@@ -73,6 +80,7 @@ class LauncherDataReaderTest {
                     documentType = DocumentType.NFC_PASSPORT,
                     backendMode = BackendMode.V2,
                     experimentalComposeNavigation = false,
+                    nfcAvailability = NfcAvailability.Device,
                 ),
             )
 
diff --git a/features/id-check-wrapper/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/nfc/NfcCheckerImplTest.kt b/features/id-check-wrapper/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/nfc/NfcCheckerImplTest.kt
@@ -1,5 +1,6 @@
 package uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internal.nfc
 
+import android.nfc.NfcManager
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
@@ -8,15 +9,14 @@ import org.mockito.kotlin.given
 import uk.gov.onelogin.criorchestrator.features.config.internalapi.FakeConfigStore
 import uk.gov.onelogin.criorchestrator.features.config.publicapi.Config
 import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.publicapi.nfc.NfcConfigKey
-import uk.gov.idcheck.sdk.passport.nfc.checker.NfcChecker as IdCheckSdkNfcChecker
 
 class NfcCheckerImplTest {
     private val configStore = FakeConfigStore()
-    private val deviceNfcChecker = mock<IdCheckSdkNfcChecker>()
+    private val nfcManager = mock<NfcManager>()
     val nfcChecker =
         NfcCheckerImpl(
             configStore = configStore,
-            deviceNfcChecker = deviceNfcChecker,
+            nfcManager = nfcManager,
         )
 
     @Test
@@ -28,7 +28,7 @@ class NfcCheckerImplTest {
                     Config.Value.StringValue(NfcConfigKey.NfcAvailability.OPTION_DEVICE),
                 ),
         )
-        given(deviceNfcChecker.hasNfc()).willReturn(true)
+        givenDeviceNfc(available = true)
 
         assertTrue(nfcChecker.hasNfc())
     }
@@ -42,7 +42,7 @@ class NfcCheckerImplTest {
                     Config.Value.StringValue(NfcConfigKey.NfcAvailability.OPTION_DEVICE),
                 ),
         )
-        given(deviceNfcChecker.hasNfc()).willReturn(false)
+        givenDeviceNfc(available = false)
 
         assertFalse(nfcChecker.hasNfc())
     }
@@ -56,7 +56,7 @@ class NfcCheckerImplTest {
                     Config.Value.StringValue(NfcConfigKey.NfcAvailability.OPTION_AVAILABLE),
                 ),
         )
-        given(deviceNfcChecker.hasNfc()).willReturn(false)
+        givenDeviceNfc(available = false)
 
         assertTrue(nfcChecker.hasNfc())
     }
@@ -70,8 +70,13 @@ class NfcCheckerImplTest {
                     Config.Value.StringValue(NfcConfigKey.NfcAvailability.OPTION_NOT_AVAILABLE),
                 ),
         )
-        given(deviceNfcChecker.hasNfc()).willReturn(true)
+        givenDeviceNfc(available = true)
 
         assertFalse(nfcChecker.hasNfc())
     }
+
+    private fun givenDeviceNfc(available: Boolean) =
+        given(nfcManager.defaultAdapter).willReturn(
+            if (available) mock() else null,
+        )
 }
diff --git a/features/id-check-wrapper/internal/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/config/StubIdCheckWrapperConfig.kt b/features/id-check-wrapper/internal/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/config/StubIdCheckWrapperConfig.kt
@@ -4,6 +4,7 @@ import kotlinx.collections.immutable.persistentListOf
 import uk.gov.onelogin.criorchestrator.features.config.publicapi.Config
 import uk.gov.onelogin.criorchestrator.features.config.publicapi.SdkConfigKey
 import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.publicapi.IdCheckWrapperConfigKey
+import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.publicapi.nfc.NfcConfigKey
 
 fun Config.Companion.createTestInstance(
     enableManualLauncher: Boolean = false,
@@ -25,5 +26,9 @@ fun Config.Companion.createTestInstance(
                     key = IdCheckWrapperConfigKey.ExperimentalComposeNavigation,
                     value = Config.Value.BooleanValue(experimentalComposeNavigation),
                 ),
+                Config.Entry<Config.Value.StringValue>(
+                    key = NfcConfigKey.NfcAvailability,
+                    value = Config.Value.StringValue(NfcConfigKey.NfcAvailability.OPTION_DEVICE),
+                ),
             ),
     )
diff --git a/features/id-check-wrapper/internal/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/model/StubLauncherData.kt b/features/id-check-wrapper/internal/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/model/StubLauncherData.kt
@@ -1,5 +1,6 @@
 package uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internal.model
 
+import uk.gov.idcheck.repositories.api.config.NfcAvailability
 import uk.gov.idcheck.repositories.api.vendor.BiometricToken
 import uk.gov.idcheck.repositories.api.webhandover.backend.BackendMode
 import uk.gov.idcheck.repositories.api.webhandover.documenttype.DocumentType
@@ -18,4 +19,5 @@ fun LauncherData.Companion.createTestInstance(
     biometricToken = biometricToken,
     backendMode = BackendMode.V2,
     experimentalComposeNavigation = experimentalComposeNavigation,
+    nfcAvailability = NfcAvailability.Device,
 )

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,5 @@ internal fun LauncherData.toIdCheckSdkActivityParameters() =`
`11`	`11`	`bioToken = this.biometricToken,`
`12`	`12`	`backendMode = this.backendMode,`
`13`	`13`	`experimentalComposeNavigation = this.experimentalComposeNavigation,`
	`14`	`+ nfcAvailability = this.nfcAvailability,`
`14`	`15`	`)`