Change to pass in encrypted data

bitwarden · Sep 4, 2023 · 2a62534 · 2a62534
1 parent 7e654b3
commit 2a62534
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/crates/bitwarden-uniffi/src/tool/mod.rs b/crates/bitwarden-uniffi/src/tool/mod.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use bitwarden::{
     tool::{ExportFormat, PassphraseGeneratorRequest, PasswordGeneratorRequest},
-    vault::{CipherView, CollectionView, FolderView},
+    vault::{Cipher, Collection, Folder},
 };
 
 use crate::{error::Result, Client};
@@ -45,8 +45,8 @@ impl ClientExporters {
     /// **API Draft:** Export user vault
     pub async fn export_vault(
         &self,
-        folders: Vec<FolderView>,
-        ciphers: Vec<CipherView>,
+        folders: Vec<Folder>,
+        ciphers: Vec<Cipher>,
         format: ExportFormat,
     ) -> Result<String> {
         Ok(self
@@ -62,8 +62,8 @@ impl ClientExporters {
     /// **API Draft:** Export organization vault
     pub async fn export_organization_vault(
         &self,
-        collections: Vec<CollectionView>,
-        ciphers: Vec<CipherView>,
+        collections: Vec<Collection>,
+        ciphers: Vec<Cipher>,
         format: ExportFormat,
     ) -> Result<String> {
         Ok(self

diff --git a/crates/bitwarden/src/crypto/mod.rs b/crates/bitwarden/src/crypto/mod.rs
@@ -2,7 +2,7 @@
 //!
 //! This module contains the cryptographic primitives used throughout the SDK. The module makes a
 //! best effort to abstract away cryptographic concepts into concepts such as
-//! [`EncString`][EncString] and [`SymmetricCryptoKey`][SymmetricCryptoKey].
+//! [`EncString`] and [`SymmetricCryptoKey`].
 //!
 //! ## Conventions:
 //!

diff --git a/crates/bitwarden/src/lib.rs b/crates/bitwarden/src/lib.rs
@@ -61,7 +61,7 @@ pub mod mobile;
 pub mod platform;
 #[cfg(feature = "secrets")]
 pub mod secrets_manager;
-#[cfg(feature = "internal")]
+#[cfg(feature = "mobile")]
 pub mod tool;
 #[cfg(feature = "mobile")]
 pub(crate) mod uniffi_support;

diff --git a/crates/bitwarden/src/tool/exporters/client_exporter.rs b/crates/bitwarden/src/tool/exporters/client_exporter.rs
@@ -1,7 +1,7 @@
 use crate::{
     error::Result,
     tool::exporters::{export_organization_vault, export_vault, ExportFormat},
-    vault::{CipherView, CollectionView, FolderView},
+    vault::{Cipher, Collection, Folder},
     Client,
 };
 
@@ -12,17 +12,17 @@ pub struct ClientExporters<'a> {
 impl<'a> ClientExporters<'a> {
     pub async fn export_vault(
         &self,
-        folders: Vec<FolderView>,
-        ciphers: Vec<CipherView>,
+        folders: Vec<Folder>,
+        ciphers: Vec<Cipher>,
         format: ExportFormat,
     ) -> Result<String> {
         export_vault(folders, ciphers, format)
     }
 
     pub async fn export_organization_vault(
         &self,
-        collections: Vec<CollectionView>,
-        ciphers: Vec<CipherView>,
+        collections: Vec<Collection>,
+        ciphers: Vec<Cipher>,
         format: ExportFormat,
     ) -> Result<String> {
         export_organization_vault(collections, ciphers, format)

diff --git a/crates/bitwarden/src/tool/exporters/mod.rs b/crates/bitwarden/src/tool/exporters/mod.rs
@@ -2,7 +2,7 @@ use schemars::JsonSchema;
 
 use crate::{
     error::Result,
-    vault::{CipherView, CollectionView, FolderView},
+    vault::{Cipher, Collection, Folder},
 };
 
 mod client_exporter;
@@ -17,16 +17,16 @@ pub enum ExportFormat {
 }
 
 pub(super) fn export_vault(
-    _folders: Vec<FolderView>,
-    _ciphers: Vec<CipherView>,
+    _folders: Vec<Folder>,
+    _ciphers: Vec<Cipher>,
     _format: ExportFormat,
 ) -> Result<String> {
     todo!();
 }
 
 pub(super) fn export_organization_vault(
-    _collections: Vec<CollectionView>,
-    _ciphers: Vec<CipherView>,
+    _collections: Vec<Collection>,
+    _ciphers: Vec<Cipher>,
     _format: ExportFormat,
 ) -> Result<String> {
     todo!();

diff --git a/languages/kotlin/doc.md b/languages/kotlin/doc.md
@@ -189,8 +189,8 @@ Initialization method for the crypto. Needs to be called before any other crypto
 **Arguments**:
 
 - self:
-- folders: Vec<FolderView>
-- ciphers: Vec<CipherView>
+- folders: Vec<Folder>
+- ciphers: Vec<Cipher>
 - format: [ExportFormat](#exportformat)
 
 **Output**: std::result::Result<String,BitwardenError>
@@ -202,8 +202,8 @@ Initialization method for the crypto. Needs to be called before any other crypto
 **Arguments**:
 
 - self:
-- collections: Vec<CollectionView>
-- ciphers: Vec<CipherView>
+- collections: Vec<Collection>
+- ciphers: Vec<Cipher>
 - format: [ExportFormat](#exportformat)
 
 **Output**: std::result::Result<String,BitwardenError>