summaryrefslogtreecommitdiff
path: root/src/api/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/api/core')
-rw-r--r--src/api/core/accounts.rs2
-rw-r--r--src/api/core/ciphers.rs4
-rw-r--r--src/api/core/organizations.rs2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/api/core/accounts.rs b/src/api/core/accounts.rs
index 187b9096..cc9cd6ce 100644
--- a/src/api/core/accounts.rs
+++ b/src/api/core/accounts.rs
@@ -490,7 +490,7 @@ async fn post_rotatekey(data: Json<KeyData>, headers: Headers, mut conn: DbConn,
// Bitwarden does not process the import if there is one item invalid.
// Since we check for the size of the encrypted note length, we need to do that here to pre-validate it.
// TODO: See if we can optimize the whole cipher adding/importing and prevent duplicate code and checks.
- Cipher::validate_notes(&data.ciphers)?;
+ Cipher::validate_cipher_data(&data.ciphers)?;
let user_uuid = &headers.user.uuid;
diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs
index 6fcde07c..13bf701f 100644
--- a/src/api/core/ciphers.rs
+++ b/src/api/core/ciphers.rs
@@ -233,7 +233,7 @@ pub struct CipherData {
favorite: Option<bool>,
reprompt: Option<i32>,
- password_history: Option<Value>,
+ pub password_history: Option<Value>,
// These are used during key rotation
// 'Attachments' is unused, contains map of {id: filename}
@@ -563,7 +563,7 @@ async fn post_ciphers_import(
// Bitwarden does not process the import if there is one item invalid.
// Since we check for the size of the encrypted note length, we need to do that here to pre-validate it.
// TODO: See if we can optimize the whole cipher adding/importing and prevent duplicate code and checks.
- Cipher::validate_notes(&data.ciphers)?;
+ Cipher::validate_cipher_data(&data.ciphers)?;
// Read and create the folders
let existing_folders: Vec<String> =
diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs
index e0c3f081..6d9f055a 100644
--- a/src/api/core/organizations.rs
+++ b/src/api/core/organizations.rs
@@ -1596,7 +1596,7 @@ async fn post_org_import(
// Bitwarden does not process the import if there is one item invalid.
// Since we check for the size of the encrypted note length, we need to do that here to pre-validate it.
// TODO: See if we can optimize the whole cipher adding/importing and prevent duplicate code and checks.
- Cipher::validate_notes(&data.ciphers)?;
+ Cipher::validate_cipher_data(&data.ciphers)?;
let mut collections = Vec::new();
for coll in data.collections {