github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-12 05:04:17 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PM-20977] Handle new sdk exception type. (#5937)

Browse Source
This commit is contained in:
André Bispo
2025-09-26 15:47:21 +01:00
committed by GitHub
parent d2645863ea
commit 2694138aa1
2 changed files with 60 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt
View File

@@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk
import com.bitwarden.collections.Collection
import com.bitwarden.collections.CollectionView
import com.bitwarden.core.DeriveKeyConnectorException
import com.bitwarden.core.DeriveKeyConnectorRequest
import com.bitwarden.core.DerivePinKeyResponse
import com.bitwarden.core.InitOrgCryptoRequest
@@ -93,14 +94,17 @@ class VaultSdkSourceImpl(
),
)
DeriveKeyConnectorResult.Success(key)
} catch (exception: BitwardenException) {
when {
exception.message == "Wrong password" -> {
} catch (ex: BitwardenException.DeriveKeyConnector) {
when (ex.v1) {
is DeriveKeyConnectorException.WrongPassword -> {
DeriveKeyConnectorResult.WrongPasswordError
}
else -> DeriveKeyConnectorResult.Error(exception)
is DeriveKeyConnectorException.Crypto -> {
DeriveKeyConnectorResult.Error(error = ex)
}
}
} catch (exception: BitwardenException) {
DeriveKeyConnectorResult.Error(error = exception)
}
}

55
app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt
View File

@@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk
import com.bitwarden.collections.Collection
import com.bitwarden.collections.CollectionView
import com.bitwarden.core.DeriveKeyConnectorException
import com.bitwarden.core.DeriveKeyConnectorRequest
import com.bitwarden.core.DerivePinKeyResponse
import com.bitwarden.core.InitOrgCryptoRequest
@@ -199,15 +200,61 @@ class VaultSdkSourceTest {
}
@Test
fun `deriveKeyConnector should call SDK and return a Result with wrong password`() =
@Suppress("MaxLineLength")
fun `deriveKeyConnector should call SDK with WrongPassword exception and return a Result with wrong password`() =
runBlocking {
val userId = "userId"
val userKeyEncrypted = "userKeyEncrypted"
val email = "email"
val password = "password"
val error = mockk<BitwardenException> {
every { message } returns "Wrong password"
val kdf = mockk<Kdf>()
coEvery {
clientCrypto.deriveKeyConnector(
request = DeriveKeyConnectorRequest(
userKeyEncrypted = userKeyEncrypted,
email = email,
password = password,
kdf = kdf,
),
)
} throws BitwardenException.DeriveKeyConnector(
v1 = DeriveKeyConnectorException.WrongPassword(message = "mock message"),
)
val result = vaultSdkSource.deriveKeyConnector(
userId = userId,
userKeyEncrypted = userKeyEncrypted,
email = email,
password = password,
kdf = kdf,
)
assertEquals(
DeriveKeyConnectorResult.WrongPasswordError,
result.getOrNull(),
)
coVerify(exactly = 1) {
sdkClientManager.getOrCreateClient(userId = userId)
clientCrypto.deriveKeyConnector(
request = DeriveKeyConnectorRequest(
userKeyEncrypted = userKeyEncrypted,
email = email,
password = password,
kdf = kdf,
),
)
}
}
@Test
@Suppress("MaxLineLength")
fun `deriveKeyConnector should call SDK with Crypto exception return and return a Result with error`() =
runBlocking {
val userId = "userId"
val userKeyEncrypted = "userKeyEncrypted"
val email = "email"
val password = "password"
val error = BitwardenException.DeriveKeyConnector(
v1 = DeriveKeyConnectorException.Crypto(message = "mock message"),
)
val kdf = mockk<Kdf>()
coEvery {
clientCrypto.deriveKeyConnector(
@@ -227,7 +274,7 @@ class VaultSdkSourceTest {
kdf = kdf,
)
assertEquals(
DeriveKeyConnectorResult.WrongPasswordError,
DeriveKeyConnectorResult.Error(error = error),
result.getOrNull(),
)
coVerify(exactly = 1) {