github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-08-01 18:53:39 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

PM-39902: feat: Add data field for updating a cipher with Blob encryption (#7198)

Browse Source
This commit is contained in:
David Perez
2026-07-23 16:41:14 +00:00
committed by GitHub
parent b5e9657fc9
commit f64a08d116
9 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt
+1
View File
@@ -74,6 +74,7 @@ fun Cipher.toEncryptedNetworkCipher(
driversLicense = driversLicense?.toEncryptedNetworkDriversLicense(),
passport = passport?.toEncryptedNetworkPassport(),
archivedDate = archivedDate,
data = data,
encryptedFor = encryptedFor,
)
app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt
+1
View File
@@ -631,6 +631,7 @@ private const val CIPHER_JSON = """
"issueDate": "mockIssueDate-1",
"expirationDate": "mockExpirationDate-1",
},
"data": "mockData-1",
"encryptedFor": "mockEncryptedFor-1"
}
"""
app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCipherUtil.kt
+1 -1
View File
@@ -70,7 +70,7 @@ fun createMockSdkCipher(
organizationUseTotp = false,
viewPassword = false,
localData = null,
data = null,
data = "mockData-$number",
)
/**
network/src/main/kotlin/com/bitwarden/network/model/CipherJsonRequest.kt
+3
View File
@@ -93,6 +93,9 @@ data class CipherJsonRequest(
@Contextual
val archivedDate: Instant?,
@SerialName("data")
val data: String?,
@SerialName("encryptedFor")
val encryptedFor: String?,
)
network/src/main/kotlin/com/bitwarden/network/model/CipherWithIdJsonRequest.kt
+4
View File
@@ -69,6 +69,9 @@ data class CipherWithIdJsonRequest(
@SerialName("key")
val key: String?,
@SerialName("data")
val data: String?,
@SerialName("encryptedFor")
val encryptedFor: String?,
)
@@ -96,5 +99,6 @@ fun CipherJsonRequest.toCipherWithIdJsonRequest(id: String): CipherWithIdJsonReq
isFavorite = isFavorite,
card = card,
key = key,
data = data,
encryptedFor = encryptedFor,
)
network/src/test/kotlin/com/bitwarden/network/service/CiphersServiceTest.kt
+3
View File
@@ -684,6 +684,7 @@ private const val CREATE_ATTACHMENT_SUCCESS_JSON = """
"issueDate": "mockIssueDate-1",
"expirationDate": "mockExpirationDate-1"
},
"data": "mockData-1",
"encryptedFor": "mockEncryptedFor-1",
"archivedDate": "2023-10-27T12:00:00.00Z"
}
@@ -853,6 +854,7 @@ private const val CREATE_RESTORE_UPDATE_CIPHER_SUCCESS_JSON = """
"issueDate": "mockIssueDate-1",
"expirationDate": "mockExpirationDate-1"
},
"data": "mockData-1",
"encryptedFor": "mockEncryptedFor-1",
"archivedDate": "2023-10-27T12:00:00.00Z"
}
@@ -1039,6 +1041,7 @@ private const val UPDATE_CIPHER_COLLECTION_SUCCESS_JSON = """
"issueDate": "mockIssueDate-1",
"expirationDate": "mockExpirationDate-1"
},
"data": "mockData-1",
"encryptedFor": "mockEncryptedFor-1",
"archivedDate": "2023-10-27T12:00:00.00Z"
}
network/src/test/kotlin/com/bitwarden/network/service/SyncServiceTest.kt
+1
View File
@@ -522,6 +522,7 @@ private const val SYNC_SUCCESS_JSON = """
"expirationDate": "mockExpirationDate-1",
},
"encryptedFor": "mockEncryptedFor-1",
"data": "mockData-1",
"archivedDate": "2023-10-27T12:00:00.00Z"
}
],
network/src/testFixtures/kotlin/com/bitwarden/network/model/CipherJsonRequestUtil.kt
+2
View File
@@ -35,6 +35,7 @@ fun createMockCipherJsonRequest(
lastKnownRevisionDate: Instant? = Instant.parse("2023-10-27T12:00:00Z"),
key: String? = "mockKey-$number",
archivedDate: Instant? = Instant.parse("2023-10-27T12:00:00Z"),
data: String? = "mockData-$number",
encryptedFor: String? = "mockEncryptedFor-$number",
): CipherJsonRequest =
CipherJsonRequest(
@@ -59,5 +60,6 @@ fun createMockCipherJsonRequest(
lastKnownRevisionDate = lastKnownRevisionDate,
key = key,
archivedDate = archivedDate,
data = data,
encryptedFor = encryptedFor,
)
network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseCipherUtil.kt
+1 -1
View File
@@ -50,7 +50,7 @@ fun createMockCipher(
shouldViewPassword: Boolean = false,
key: String? = "mockKey-$number",
encryptedFor: String? = "mockEncryptedFor-$number",
data: String? = null,
data: String? = "mockData-$number",
): SyncResponseJson.Cipher =
SyncResponseJson.Cipher(
id = id,