diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/sdk/statebridge/SdkStateBridge.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/sdk/statebridge/SdkStateBridge.kt index 85bf7d42237..6afbc5bd1b5 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/sdk/statebridge/SdkStateBridge.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/sdk/statebridge/SdkStateBridge.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.platform.manager.sdk.statebridge import com.bitwarden.core.MasterPasswordUnlockData import com.bitwarden.core.StateBridgeForeignImpl import com.bitwarden.core.V2UpgradeToken +import com.bitwarden.core.WebAuthnPrfUnlockData import com.bitwarden.core.WrappedAccountCryptographicState import com.bitwarden.crypto.EncString import com.bitwarden.crypto.Kdf @@ -155,4 +156,17 @@ internal class SdkStateBridge( kdf = null, ) } + + override suspend fun getWebauthnPrfUnlockData(): WebAuthnPrfUnlockData? { + // We do not support unlock with WebAuthn, so we can just return null + return null + } + + override suspend fun setWebauthnPrfUnlockData(value: WebAuthnPrfUnlockData) { + // We do not support unlock with WebAuthn, so this is a no-op + } + + override suspend fun clearWebauthnPrfUnlockData() { + // We do not support unlock with WebAuthn, so this is a no-op + } } diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/sdk/statebridge/SdkStateBridgeTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/sdk/statebridge/SdkStateBridgeTest.kt index 0e7b903a392..c6e7e4d6f83 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/sdk/statebridge/SdkStateBridgeTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/sdk/statebridge/SdkStateBridgeTest.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.platform.manager.sdk.statebridge import com.bitwarden.core.MasterPasswordUnlockData import com.bitwarden.core.V2UpgradeToken +import com.bitwarden.core.WebAuthnPrfUnlockData import com.bitwarden.crypto.Kdf import com.bitwarden.network.model.KdfJson import com.bitwarden.network.model.KdfTypeJson @@ -426,6 +427,33 @@ class SdkStateBridgeTest { assertNull(authDiskSource.userState) } + + @Test + fun `getWebauthnPrfUnlockData should return null since unlock is unsupported`() = runTest { + authDiskSource.userState = USER_STATE + + assertNull(stateBridge.getWebauthnPrfUnlockData()) + } + + @Test + fun `setWebauthnPrfUnlockData should do nothing since unlock is unsupported`() = runTest { + authDiskSource.userState = USER_STATE + + stateBridge.setWebauthnPrfUnlockData(value = WEBAUTHN_PRF_UNLOCK_DATA) + + assertNull(stateBridge.getWebauthnPrfUnlockData()) + assertEquals(USER_STATE, authDiskSource.userState) + } + + @Test + fun `clearWebauthnPrfUnlockData should do nothing since unlock is unsupported`() = runTest { + authDiskSource.userState = USER_STATE + + stateBridge.clearWebauthnPrfUnlockData() + + assertNull(stateBridge.getWebauthnPrfUnlockData()) + assertEquals(USER_STATE, authDiskSource.userState) + } } private const val USER_ID: String = "userId" @@ -458,6 +486,10 @@ private val MASTER_PASSWORD_UNLOCK_DATA_JSON: MasterPasswordUnlockDataJson = salt = "salt", ) +private val WEBAUTHN_PRF_UNLOCK_DATA: WebAuthnPrfUnlockData = WebAuthnPrfUnlockData( + options = emptyList(), +) + private val ACCOUNT: AccountJson = AccountJson( profile = AccountJson.Profile( userId = USER_ID, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e89ebfc9ce6..4a21b3b5a9a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,7 +29,7 @@ androidxRoom = "2.8.4" androidxSecurityCrypto = "1.1.0" androidxSplash = "1.2.0" androidxWork = "2.11.2" -bitwardenSdk = "3.0.0-8144-cf7ad654" +bitwardenSdk = "3.0.0-8157-eb825d59" crashlytics = "3.0.7" detekt = "1.23.8" firebaseBom = "34.15.0"