SM-837: Removed redundant to_string

bitwarden · Jun 24, 2024 · b9b0c61 · b9b0c61
1 parent b1651e3
commit b9b0c61
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 42 deletions.
diff --git a/crates/bitwarden-crypto/src/enc_string/symmetric.rs b/crates/bitwarden-crypto/src/enc_string/symmetric.rs
@@ -266,6 +266,12 @@ impl KeyEncryptable<SymmetricCryptoKey, EncString> for String {
     }
 }
 
+impl KeyEncryptable<SymmetricCryptoKey, EncString> for &str {
+    fn encrypt_with_key(self, key: &SymmetricCryptoKey) -> Result<EncString> {
+        self.as_bytes().encrypt_with_key(key)
+    }
+}
+
 impl KeyDecryptable<SymmetricCryptoKey, String> for EncString {
     fn decrypt_with_key(&self, key: &SymmetricCryptoKey) -> Result<String> {
         let dec: Vec<u8> = self.decrypt_with_key(key)?;

diff --git a/crates/bitwarden/src/secrets_manager/projects/create.rs b/crates/bitwarden/src/secrets_manager/projects/create.rs
@@ -33,13 +33,7 @@ pub(crate) async fn create_project(
         .ok_or(VaultLocked)?;
 
     let project = Some(ProjectCreateRequestModel {
-        name: input
-            .name
-            .trim()
-            .to_string()
-            .clone()
-            .encrypt_with_key(key)?
-            .to_string(),
+        name: input.name.clone().trim().encrypt_with_key(key)?.to_string(),
     });
 
     let config = client.get_api_configurations().await;

diff --git a/crates/bitwarden/src/secrets_manager/projects/update.rs b/crates/bitwarden/src/secrets_manager/projects/update.rs
@@ -35,13 +35,7 @@ pub(crate) async fn update_project(
         .ok_or(VaultLocked)?;
 
     let project = Some(ProjectUpdateRequestModel {
-        name: input
-            .name
-            .trim()
-            .to_string()
-            .clone()
-            .encrypt_with_key(key)?
-            .to_string(),
+        name: input.name.clone().trim().encrypt_with_key(key)?.to_string(),
     });
 
     let config = client.get_api_configurations().await;

diff --git a/crates/bitwarden/src/secrets_manager/secrets/create.rs b/crates/bitwarden/src/secrets_manager/secrets/create.rs
@@ -41,21 +41,9 @@ pub(crate) async fn create_secret(
         .ok_or(VaultLocked)?;
 
     let secret = Some(SecretCreateRequestModel {
-        key: input
-            .key
-            .trim()
-            .to_string()
-            .clone()
-            .encrypt_with_key(key)?
-            .to_string(),
+        key: input.key.clone().trim().encrypt_with_key(key)?.to_string(),
         value: input.value.clone().encrypt_with_key(key)?.to_string(),
-        note: input
-            .note
-            .trim()
-            .to_string()
-            .clone()
-            .encrypt_with_key(key)?
-            .to_string(),
+        note: input.note.clone().trim().encrypt_with_key(key)?.to_string(),
         project_ids: input.project_ids.clone(),
     });
 

diff --git a/crates/bitwarden/src/secrets_manager/secrets/update.rs b/crates/bitwarden/src/secrets_manager/secrets/update.rs
@@ -40,21 +40,9 @@ pub(crate) async fn update_secret(
         .ok_or(VaultLocked)?;
 
     let secret = Some(SecretUpdateRequestModel {
-        key: input
-            .key
-            .trim()
-            .to_string()
-            .clone()
-            .encrypt_with_key(key)?
-            .to_string(),
+        key: input.key.clone().trim().encrypt_with_key(key)?.to_string(),
         value: input.value.clone().encrypt_with_key(key)?.to_string(),
-        note: input
-            .note
-            .trim()
-            .to_string()
-            .clone()
-            .encrypt_with_key(key)?
-            .to_string(),
+        note: input.note.clone().trim().encrypt_with_key(key)?.to_string(),
         project_ids: input.project_ids.clone(),
     });