Add list and get

Author: Hinton

crates/bitwarden-vault/src/folder/edit.rs

@@ -7,19 +7,14 @@ use thiserror::Error;
 #[cfg(feature = "wasm")]
 use wasm_bindgen::prelude::*;
 
-use crate::{Folder, FolderAddEditRequest, FolderView, VaultParseError};
-
-/// Item does not already exist error.
-#[derive(Debug, thiserror::Error)]
-#[error("Item does not already exist")]
-pub struct ItemDoesNotExistError;
+use crate::{Folder, FolderAddEditRequest, FolderView, ItemNotFoundError, VaultParseError};
 
 #[allow(missing_docs)]
 #[bitwarden_error(flat)]
 #[derive(Debug, Error)]
 pub enum EditFolderError {
     #[error(transparent)]
-    ItemDoesNotExist(#[from] ItemDoesNotExistError),
+    ItemNotFound(#[from] ItemNotFoundError),
     #[error(transparent)]
     Crypto(#[from] CryptoError),
     #[error(transparent)]
@@ -45,7 +40,7 @@ pub(super) async fn edit_folder<R: Repository<Folder> + ?Sized>(
     repository
         .get(folder_id.to_owned())
         .await?
-        .ok_or(ItemDoesNotExistError)?;
+        .ok_or(ItemNotFoundError)?;
 
     let folder_request = key_store.encrypt(request)?;
 
@@ -172,7 +167,7 @@ mod tests {
         assert!(result.is_err());
         assert!(matches!(
             result.unwrap_err(),
-            EditFolderError::ItemDoesNotExist(_)
+            EditFolderError::ItemNotFound(_)
         ));
     }
 

crates/bitwarden-vault/src/folder/folder_client.rs

@@ -7,8 +7,8 @@ use wasm_bindgen::prelude::*;
 
 use crate::{
     error::{DecryptError, EncryptError},
-    folder::{create_folder, edit_folder},
-    CreateFolderError, EditFolderError, Folder, FolderAddEditRequest, FolderView,
+    folder::{create_folder, edit_folder, get_folder, list_folders},
+    CreateFolderError, EditFolderError, Folder, FolderAddEditRequest, FolderView, GetFolderError,
 };
 
 /// Wrapper for folder specific functionality.
@@ -40,6 +40,22 @@ impl FoldersClient {
         Ok(views)
     }
 
+    /// Get all folders from state and decrypt them to a list of [FolderView].
+    pub async fn list(&self) -> Result<Vec<FolderView>, GetFolderError> {
+        let key_store = self.client.internal.get_key_store();
+        let repository = self.get_repository()?;
+
+        list_folders(key_store, repository.as_ref()).await
+    }
+
+    /// Get a specific [Folder] by its ID from state and decrypt it to a [FolderView].
+    pub async fn get(&self, folder_id: &str) -> Result<FolderView, GetFolderError> {
+        let key_store = self.client.internal.get_key_store();
+        let repository = self.get_repository()?;
+
+        get_folder(key_store, repository.as_ref(), folder_id).await
+    }
+
     /// Create a new [Folder] and save it to the server.
     pub async fn create(
         &self,

crates/bitwarden-vault/src/folder/folder_models.rs

@@ -39,6 +39,14 @@ pub struct FolderView {
     pub revision_date: DateTime<Utc>,
 }
 
+impl wasm_bindgen::__rt::VectorIntoJsValue for FolderView {
+    fn vector_into_jsvalue(
+        vector: wasm_bindgen::__rt::std::boxed::Box<[Self]>,
+    ) -> wasm_bindgen::JsValue {
+        wasm_bindgen::__rt::js_value_vector_into_jsvalue(vector)
+    }
+}
+
 impl IdentifyKey<SymmetricKeyId> for Folder {
     fn key_identifier(&self) -> SymmetricKeyId {
         SymmetricKeyId::User

crates/bitwarden-vault/src/folder/get_list.rs

@@ -0,0 +1,41 @@
+use bitwarden_core::key_management::KeyIds;
+use bitwarden_crypto::{CryptoError, KeyStore};
+use bitwarden_error::bitwarden_error;
+use bitwarden_state::repository::{Repository, RepositoryError};
+use thiserror::Error;
+
+use crate::{Folder, FolderView, ItemNotFoundError};
+
+#[allow(missing_docs)]
+#[bitwarden_error(flat)]
+#[derive(Debug, Error)]
+pub enum GetFolderError {
+    #[error(transparent)]
+    ItemDoesNotExist(#[from] ItemNotFoundError),
+    #[error(transparent)]
+    Crypto(#[from] CryptoError),
+    #[error(transparent)]
+    RepositoryError(#[from] RepositoryError),
+}
+
+pub(super) async fn get_folder(
+    store: &KeyStore<KeyIds>,
+    repository: &dyn Repository<Folder>,
+    id: &str,
+) -> Result<FolderView, GetFolderError> {
+    let folder = repository
+        .get(id.to_string())
+        .await?
+        .ok_or(ItemNotFoundError)?;
+
+    Ok(store.decrypt(&folder)?)
+}
+
+pub(super) async fn list_folders(
+    store: &KeyStore<KeyIds>,
+    repository: &dyn Repository<Folder>,
+) -> Result<Vec<FolderView>, GetFolderError> {
+    let folders = repository.list().await?;
+    let views = store.decrypt_list(&folders)?;
+    Ok(views)
+}

crates/bitwarden-vault/src/folder/mod.rs

@@ -2,8 +2,15 @@ mod create;
 mod edit;
 mod folder_client;
 mod folder_models;
+mod get_list;
 
 pub use create::*;
 pub use edit::*;
 pub use folder_client::*;
 pub use folder_models::*;
+pub use get_list::*;
+
+/// Item does not exist error.
+#[derive(Debug, thiserror::Error)]
+#[error("Item does not exist")]
+pub struct ItemNotFoundError;