Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4939107
SDK Update - com.bitwarden:sdk-android 3.0.0-8017-a91e4062
bw-ghapp[bot] Jul 28, 2026
7233ee8
SDK Update - com.bitwarden:sdk-android 3.0.0-8035-e7c88b81
bw-ghapp[bot] Jul 29, 2026
8ad6148
SDK Update - com.bitwarden:sdk-android 3.0.0-8038-e0ee759d
bw-ghapp[bot] Jul 29, 2026
7e0a474
SDK Update - com.bitwarden:sdk-android 3.0.0-8055-4bf6b5b5
bw-ghapp[bot] Jul 30, 2026
6a132a0
SDK Update - com.bitwarden:sdk-android 3.0.0-8066-b2c68b46
bw-ghapp[bot] Jul 31, 2026
4413a42
SDK Update - com.bitwarden:sdk-android 3.0.0-8101-25817040
bw-ghapp[bot] Aug 3, 2026
56df0bf
SDK Update - com.bitwarden:sdk-android 3.0.0-8102-4f4764eb
bw-ghapp[bot] Aug 3, 2026
9c97b16
SDK Update - com.bitwarden:sdk-android 3.0.0-8103-7a2b9da0
bw-ghapp[bot] Aug 3, 2026
c49cb0a
SDK Update - com.bitwarden:sdk-android 3.0.0-8104-732a3504
bw-ghapp[bot] Aug 3, 2026
bba46bc
SDK Update - com.bitwarden:sdk-android 3.0.0-8120-fc9d69b8
bw-ghapp[bot] Aug 3, 2026
0e43e42
SDK Update - com.bitwarden:sdk-android 3.0.0-8125-93bb0f45
bw-ghapp[bot] Aug 3, 2026
f41ffa9
SDK Update - com.bitwarden:sdk-android 3.0.0-8129-f1af3b6e
bw-ghapp[bot] Aug 3, 2026
a1e6856
SDK Update - com.bitwarden:sdk-android 3.0.0-8132-085b0133
bw-ghapp[bot] Aug 3, 2026
3ca9f26
SDK Update - com.bitwarden:sdk-android 3.0.0-8134-999d5e3c
bw-ghapp[bot] Aug 3, 2026
479cd60
SDK Update - com.bitwarden:sdk-android 3.0.0-8138-5fb7e4ce
bw-ghapp[bot] Aug 3, 2026
a6895aa
SDK Update - com.bitwarden:sdk-android 3.0.0-8139-ca039e0a
bw-ghapp[bot] Aug 3, 2026
486f62d
SDK Update - com.bitwarden:sdk-android 3.0.0-8140-168617ea
bw-ghapp[bot] Aug 3, 2026
5df3889
SDK Update - com.bitwarden:sdk-android 3.0.0-8142-45bb0413
bw-ghapp[bot] Aug 3, 2026
f95b316
SDK Update - com.bitwarden:sdk-android 3.0.0-8144-cf7ad654
bw-ghapp[bot] Aug 3, 2026
c6ee9fb
SDK Update - com.bitwarden:sdk-android 3.0.0-8149-f7f3ebae
bw-ghapp[bot] Aug 4, 2026
6e6954f
SDK Update - com.bitwarden:sdk-android 3.0.0-8150-de66de96
bw-ghapp[bot] Aug 4, 2026
e6e54ce
SDK Update - com.bitwarden:sdk-android 3.0.0-8155-0c2bbc2b
bw-ghapp[bot] Aug 4, 2026
6bf2927
SDK Update - com.bitwarden:sdk-android 3.0.0-8157-eb825d59
bw-ghapp[bot] Aug 4, 2026
577e897
Update SdkStateBridge with WebAuthn callbacks
david-livefront Aug 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading