mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-10-31 15:15:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

Added key to sync response model and cipher sdk object (#201)

Browse source
This commit is contained in:
Ramsey Smith 2023-11-02 15:44:11 -06:00 committed by Álison Fernandes
parent 949bb4ad5a
commit fc36f95ab7
5 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseJson.kt
View file

@ -587,6 +587,9 @@ data class SyncResponseJson(
@SerialName("card") @SerialName("card")
val card: Card?, val card: Card?,
@SerialName("key")
val key: String?,
) { ) {
/** /**
* Represents an attachment in the vault response. * Represents an attachment in the vault response.

2
app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt
View file

@ -40,7 +40,7 @@ fun SyncResponseJson.Cipher.toEncryptedSdkCipher(): Cipher =
organizationId = organizationId, organizationId = organizationId,
folderId = folderId, folderId = folderId,
collectionIds = collectionIds.orEmpty(), collectionIds = collectionIds.orEmpty(),
key = null, key = key,
name = name.orEmpty(), name = name.orEmpty(),
notes = notes, notes = notes,
type = type.toSdkCipherType(), type = type.toSdkCipherType(),

1
app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseCipherUtil.kt
View file

@ -29,6 +29,7 @@ fun createMockCipher(number: Int): SyncResponseJson.Cipher =
shouldEdit = false, shouldEdit = false,
shouldOrganizationUseTotp = false, shouldOrganizationUseTotp = false,
shouldViewPassword = false, shouldViewPassword = false,
key = "mockKey-$number",
) )
/** /**

3
app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceTest.kt
View file

@ -299,7 +299,8 @@ private const val SYNC_SUCCESS_JSON = """
"expYear": "mockExpirationYear-1", "expYear": "mockExpirationYear-1",
"cardholderName": "mockCardholderName-1", "cardholderName": "mockCardholderName-1",
"brand": "mockBrand-1" "brand": "mockBrand-1"
} },
"key": "mockKey-1"
} }
], ],
"domains": { "domains": {

2
app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkCipherUtil.kt
View file

@ -26,7 +26,7 @@ fun createMockSdkCipher(number: Int): Cipher =
organizationId = "mockOrganizationId-$number", organizationId = "mockOrganizationId-$number",
folderId = "mockFolderId-$number", folderId = "mockFolderId-$number",
collectionIds = listOf("mockCollectionId-$number"), collectionIds = listOf("mockCollectionId-$number"),
key = null, key = "mockKey-$number",
name = "mockName-$number", name = "mockName-$number",
notes = "mockNotes-$number", notes = "mockNotes-$number",
type = CipherType.LOGIN, type = CipherType.LOGIN,