File tree Expand file tree Collapse file tree 5 files changed +4
-47
lines changed
bitwarden-wasm-internal/src Expand file tree Collapse file tree 5 files changed +4
-47
lines changed Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ use std::{borrow::Cow, fmt::Debug};
44
55use bitwarden_api_api:: apis:: Error as ApiError ;
66use bitwarden_api_identity:: apis:: Error as IdentityError ;
7+ use bitwarden_error:: prelude:: * ;
78use log:: debug;
89use reqwest:: StatusCode ;
910use thiserror:: Error ;
@@ -12,6 +13,7 @@ use validator::ValidationErrors;
1213#[ cfg( feature = "internal" ) ]
1314use crate :: client:: encryption_settings:: EncryptionSettingsError ;
1415
16+ #[ bitwarden_error( flat) ]
1517#[ derive( Debug , Error ) ]
1618pub enum Error {
1719 #[ error( transparent) ]
Original file line number Diff line number Diff line change @@ -7,8 +7,6 @@ use bitwarden_core::{
77} ;
88use wasm_bindgen:: prelude:: * ;
99
10- use crate :: error:: Result ;
11-
1210#[ wasm_bindgen]
1311pub struct ClientCrypto ( Rc < Client > ) ;
1412
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 11mod client;
22mod crypto;
33mod custom_types;
4- mod error;
54mod vault;
65
76pub use client:: BitwardenClient ;
Original file line number Diff line number Diff line change @@ -4,8 +4,6 @@ use bitwarden_core::Client;
44use bitwarden_vault:: { ClientVaultExt , Folder , FolderView } ;
55use wasm_bindgen:: prelude:: * ;
66
7- use crate :: error:: Result ;
8-
97#[ wasm_bindgen]
108pub struct ClientFolders ( Rc < Client > ) ;
119
@@ -18,7 +16,7 @@ impl ClientFolders {
1816#[ wasm_bindgen]
1917impl ClientFolders {
2018 /// Decrypt folder
21- pub fn decrypt ( & self , folder : Folder ) -> Result < FolderView > {
22- Ok ( self . 0 . vault ( ) . folders ( ) . decrypt ( folder) ? )
19+ pub fn decrypt ( & self , folder : Folder ) -> Result < FolderView , bitwarden_core :: Error > {
20+ self . 0 . vault ( ) . folders ( ) . decrypt ( folder)
2321 }
2422}
You can’t perform that action at this time.
0 commit comments