From 0345f48d4d001ccfbb87c7a621a22cf85e114d4e Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Thu, 4 Jan 2024 05:34:19 +0400
Subject: [PATCH] Cleaned up encryption to use ? operator

---
 .../manager/cryptography/encrypt_symmetric.rs | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/crates/infisical/src/manager/cryptography/encrypt_symmetric.rs b/crates/infisical/src/manager/cryptography/encrypt_symmetric.rs
index f9d9ca9..d898752 100644
--- a/crates/infisical/src/manager/cryptography/encrypt_symmetric.rs
+++ b/crates/infisical/src/manager/cryptography/encrypt_symmetric.rs
@@ -39,34 +39,26 @@ pub fn encrypt_symmetric(input: &EncryptSymmetricOptions) -> Result<EncryptSymme
     let key = &input.key;
     let plaintext = &input.plaintext;
 
-    let decoded_key = b64_decode!(key);
-
     // Generate a random IV
     let mut iv = [0u8; 12];
     OsRng.fill_bytes(&mut iv);
 
-    if decoded_key.is_err() {
-        return Err(Error::EncryptSymmetricKeyError {
-            message: decoded_key.unwrap_err().to_string(),
-        });
-    }
+    let decoded_key = b64_decode!(key).map_err(|e| Error::EncryptSymmetricKeyError {
+        message: e.to_string(),
+    })?;
 
     // Create a new AES256-GCM instance
-    let cipher = Aes256Gcm::new_from_slice(decoded_key.unwrap().as_slice());
-
-    if cipher.is_err() {
-        return Err(Error::EncryptSymmetricKeyError {
-            message: "Failed to create cipher.".to_string(),
-        });
-    }
-
-    let ciphertext_r = &cipher.unwrap().encrypt(&iv.into(), plaintext.as_bytes());
-
-    if ciphertext_r.is_err() {
-        return Err(Error::EncryptSymmetricKeyError {
-            message: ciphertext_r.clone().unwrap_err().to_string(),
+    let cipher = Aes256Gcm::new_from_slice(decoded_key.as_slice()).map_err(|e| {
+        Error::EncryptSymmetricKeyError {
+            message: e.to_string(),
+        }
+    })?;
+
+    let ciphertext_r = &cipher
+        .encrypt(&iv.into(), plaintext.as_bytes())
+        .map_err(|e| Error::EncryptSymmetricKeyError {
+            message: e.to_string(),
         });
-    }
 
     let mut ciphertext = ciphertext_r.as_ref().unwrap().clone();