Accept AttachmentView in AttachmentFile (#255)

## 🎟️ Tracking

<!-- Paste the link to the Jira or GitHub issue or otherwise describe /
point to where this change is coming from. -->

## 📔 Objective
Previously, decrypting attachment content in clients required fetching
the cipher, filtering to find the relevant attachment, and then passing
the full encrypted attachment to the `decrypt_buffer` function, even
when the decrypted `AttachmentView` was already available. This change
reafctors `AttachmentFile` to uses the `AttachmentView` directly.
<!-- Describe what the purpose of this PR is, for example what bug
you're fixing or new feature you're adding. -->

## ⏰ Reminders before review

- Contributor guidelines followed
- All formatters and local linters executed and passed
- Written new unit and / or integration tests where applicable
- Protected functional changes with optionality (feature flags)
- Used internationalization (i18n) for all UI strings
- CI builds passed
- Communicated to DevOps any deployment requirements
- Updated any necessary documentation (Confluence, contributing docs) or
informed the documentation
  team

## 🦮 Reviewer guidelines

<!-- Suggested interactions but feel free to use (or not) as you desire!
-->

- 👍 (`:+1:`) or similar for great changes
- 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info
- ❓ (`:question:`) for questions
- 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry
that's not quite a confirmed
  issue and could potentially benefit from discussion
- 🎨 (`:art:`) for suggestions / improvements
- ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or
concerns needing attention
- 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or
indications of technical debt
- ⛏ (`:pick:`) for minor or nitpick changes

Author: gbubemismith

crates/bitwarden-uniffi/src/vault/attachments.rs

@@ -44,7 +44,7 @@ impl AttachmentsClient {
     pub fn decrypt_buffer(
         &self,
         cipher: Cipher,
-        attachment: Attachment,
+        attachment: AttachmentView,
         buffer: Vec<u8>,
     ) -> Result<Vec<u8>> {
         Ok(self
@@ -57,7 +57,7 @@ impl AttachmentsClient {
     pub fn decrypt_file(
         &self,
         cipher: Cipher,
-        attachment: Attachment,
+        attachment: AttachmentView,
         encrypted_file_path: String,
         decrypted_file_path: String,
     ) -> Result<()> {

crates/bitwarden-vault/src/cipher/attachment.rs

@@ -46,7 +46,7 @@ pub struct AttachmentEncryptResult {
 
 pub struct AttachmentFile {
     pub cipher: Cipher,
-    pub attachment: Attachment,
+    pub attachment: AttachmentView,
 
     /// There are three different ways attachments are encrypted.
     /// 1. UserKey / OrgKey (Contents) - Legacy
@@ -195,7 +195,7 @@ mod tests {
 
     use crate::{
         cipher::cipher::{CipherRepromptType, CipherType},
-        Attachment, AttachmentFile, AttachmentFileView, AttachmentView, Cipher,
+        AttachmentFile, AttachmentFileView, AttachmentView, Cipher,
     };
 
     #[test]
@@ -271,13 +271,13 @@ mod tests {
         let user_key: SymmetricCryptoKey = "w2LO+nwV4oxwswVYCxlOfRUseXfvU03VzvKQHrqeklPgiMZrspUe6sOBToCnDn9Ay0tuCBn8ykVVRb7PWhub2Q==".to_string().try_into().unwrap();
         let key_store = create_test_crypto_with_user_key(user_key);
 
-        let attachment = Attachment {
+        let attachment = AttachmentView {
             id: None,
             url: None,
             size: Some("161".into()),
             size_name: Some("161 Bytes".into()),
-            file_name: Some("2.M3z1MOO9eBG9BWRTEUbPog==|jPw0By1AakHDfoaY8UOwOQ==|eP9/J1583OJpHsSM4ZnXZzdBHfqVTXnOXGlkkmAKSfA=".parse().unwrap()),
-            key: Some("2.r288/AOSPiaLFkW07EBGBw==|SAmnnCbOLFjX5lnURvoualOetQwuyPc54PAmHDTRrhT0gwO9ailna9U09q9bmBfI5XrjNNEsuXssgzNygRkezoVQvZQggZddOwHB6KQW5EQ=|erIMUJp8j+aTcmhdE50zEX+ipv/eR1sZ7EwULJm/6DY=".parse().unwrap())
+            file_name: Some("Test.txt".into()),
+            key: Some("2.r288/AOSPiaLFkW07EBGBw==|SAmnnCbOLFjX5lnURvoualOetQwuyPc54PAmHDTRrhT0gwO9ailna9U09q9bmBfI5XrjNNEsuXssgzNygRkezoVQvZQggZddOwHB6KQW5EQ=|erIMUJp8j+aTcmhdE50zEX+ipv/eR1sZ7EwULJm/6DY=".parse().unwrap()),
         };
 
         let cipher  = Cipher {
@@ -328,12 +328,12 @@ mod tests {
         let user_key: SymmetricCryptoKey = "w2LO+nwV4oxwswVYCxlOfRUseXfvU03VzvKQHrqeklPgiMZrspUe6sOBToCnDn9Ay0tuCBn8ykVVRb7PWhub2Q==".to_string().try_into().unwrap();
         let key_store = create_test_crypto_with_user_key(user_key);
 
-        let attachment = Attachment {
+        let attachment = AttachmentView {
             id: None,
             url: None,
             size: Some("161".into()),
             size_name: Some("161 Bytes".into()),
-            file_name: Some("2.qTJdrgQe+tLCHTlPHMJXLw==|0we9+uYJPEY3FU5SblX2hg==|+fL/wTF/WgpoV+BNzmsmi284O0QNdVBUYmfqqs0CG1E=".parse().unwrap()),
+            file_name: Some("Test.txt".into()),
             key: None,
         };
 

crates/bitwarden-vault/src/cipher/attachment_client.rs

@@ -68,7 +68,7 @@ impl AttachmentsClient {
     pub fn decrypt_buffer(
         &self,
         cipher: Cipher,
-        attachment: Attachment,
+        attachment: AttachmentView,
         encrypted_buffer: &[u8],
     ) -> Result<Vec<u8>, DecryptError> {
         let key_store = self.client.internal.get_key_store();
@@ -82,7 +82,7 @@ impl AttachmentsClient {
     pub fn decrypt_file(
         &self,
         cipher: Cipher,
-        attachment: Attachment,
+        attachment: AttachmentView,
         encrypted_file_path: &Path,
         decrypted_file_path: &Path,
     ) -> Result<(), DecryptFileError> {

crates/bitwarden-vault/src/cipher/cipher_client.rs

@@ -233,7 +233,7 @@ mod tests {
         let attachment_view = attachments.first().unwrap().clone();
         assert!(attachment_view.key.is_none());
 
-        assert_eq!(attachment_view.file_name.unwrap(), "h.txt");
+        assert_eq!(attachment_view.file_name.as_deref(), Some("h.txt"));
 
         let buf = vec![
             2, 100, 205, 148, 152, 77, 184, 77, 53, 80, 38, 240, 83, 217, 251, 118, 254, 27, 117,
@@ -245,7 +245,7 @@ mod tests {
         let content = client
             .vault()
             .attachments()
-            .decrypt_buffer(cipher, attachment, buf.as_slice())
+            .decrypt_buffer(cipher, attachment_view.clone(), buf.as_slice())
             .unwrap();
 
         assert_eq!(content, b"Hello");
@@ -267,7 +267,11 @@ mod tests {
         let new_cipher = client.vault().ciphers().encrypt(view).unwrap();
         assert!(new_cipher.key.is_some());
 
-        let view = client.vault().ciphers().decrypt(new_cipher).unwrap();
+        let view = client
+            .vault()
+            .ciphers()
+            .decrypt(new_cipher.clone())
+            .unwrap();
         let attachments = view.clone().attachments.unwrap();
         let attachment_view = attachments.first().unwrap().clone();
         assert!(attachment_view.key.is_some());
@@ -278,7 +282,7 @@ mod tests {
             attachment_view.clone().key.unwrap().to_string()
         );
 
-        assert_eq!(attachment_view.file_name.unwrap(), "h.txt");
+        assert_eq!(attachment_view.file_name.as_deref(), Some("h.txt"));
 
         let buf = vec![
             2, 114, 53, 72, 20, 82, 18, 46, 48, 137, 97, 1, 100, 142, 120, 187, 28, 36, 180, 46,
@@ -290,7 +294,7 @@ mod tests {
         let content = client
             .vault()
             .attachments()
-            .decrypt_buffer(cipher, attachment, buf.as_slice())
+            .decrypt_buffer(new_cipher.clone(), attachment_view.clone(), buf.as_slice())
             .unwrap();
 
         assert_eq!(content, b"Hello");
@@ -316,14 +320,14 @@ mod tests {
 
         // Ensure attachment key is still the same since it's protected by the cipher key
         assert_eq!(
-            attachment.clone().key.unwrap().to_string(),
-            attachment_view.key.unwrap().to_string()
+            attachment.clone().key.as_ref().unwrap().to_string(),
+            attachment_view.key.as_ref().unwrap().to_string()
         );
 
         let content = client
             .vault()
             .attachments()
-            .decrypt_buffer(new_cipher, attachment, buf.as_slice())
+            .decrypt_buffer(new_cipher, attachment_view, buf.as_slice())
             .unwrap();
 
         assert_eq!(content, b"Hello");

crates/bitwarden-wasm-internal/src/vault/attachments.rs

@@ -1,4 +1,4 @@
-use bitwarden_vault::{Attachment, Cipher, DecryptError};
+use bitwarden_vault::{AttachmentView, Cipher, DecryptError};
 use wasm_bindgen::prelude::wasm_bindgen;
 
 #[wasm_bindgen]
@@ -16,7 +16,7 @@ impl AttachmentsClient {
     pub fn decrypt_buffer(
         &self,
         cipher: Cipher,
-        attachment: Attachment,
+        attachment: AttachmentView,
         encrypted_buffer: &[u8],
     ) -> Result<Vec<u8>, DecryptError> {
         self.0.decrypt_buffer(cipher, attachment, encrypted_buffer)