feat: rename encryption and decryption class for aes algorithm

Author: selfmadecode

src/Encryption/AesEncryption/Decrypting.cs

@@ -1,23 +1,103 @@
 using SafeCrypt.AesEncryption;
 using SafeCrypt.Helpers;
+using SafeCrypt.Models;
+using SafeCrypt.src.Encryption.AesEncryption.Models;
 using System;
 
-namespace SafeCrypt.Decrypt
+namespace SafeCrypt.AESDecryption
 {
-    public class Decrypting : BaseAesEncryption
+    public class AesDecryption : BaseAesEncryption
     {
-        public byte[] AesDecrypt(string data, string secretKey, string iv)
+        public DecryptionData DeEncryptFromHexString(DecryptionParameters param)
         {
-            NullChecks(data, secretKey, iv);
+            var responseData = new DecryptionData();
 
-            var (aesKey, aesIv) = ConvertKeysToBytesAndGetKeys(secretKey, iv);
+            Validators.ValidateNotNull(param);
 
-            var aesData = data.HexadecimalStringToByteArray();
-            return DecryptAES(aesData, aesKey, aesIv);
+            // validate is base64
+            if (!Validators.IsBase64String(param.SecretKey))
+            {
+                AddError(responseData, $"SecretKey: {param.SecretKey} is not a base64 string");
+                return responseData;
+            }
+
+            if (!Validators.IsBase64String(param.IV))
+            {
+                AddError(responseData, $"IV: {param.IV} is not a base64 string");
+                return responseData;
+            }
+            // Convert input string to bytes
+            byte[] dataBytes = param.IV.ConvertKeysToBytes();
+
+            // Validate block size based on AES algorithm's requirements
+            if (!Validators.IsValidBlockSize(dataBytes.Length))
+            {
+                AddError(responseData, $"IV: {param.IV} is not a valid block size for this algorithm");
+                return responseData;
+            }
+
+            // Delegate the encryption to the underlying AES encryption method
+            var byteEncryptionParameters = new ByteDecryptionParameters
+            {
+                SecretKey = Convert.FromBase64String(param.SecretKey),
+                IV = dataBytes,
+                Data = param.DataToDecrypt.HexadecimalStringToByteArray()
+            };
+
+            var response = DecryptAES(byteEncryptionParameters);
+
+            return new DecryptionData
+            {
+                DecryptedData = response.BytesToString(),
+                Iv = param.IV,
+                SecretKey = param.SecretKey
+            };
         }
 
-        public byte[] Decrypt(byte[] data, byte[] secretKey, byte[] iv)
-            => DecryptAES(data, secretKey, iv);
+        public DecryptionData DecryptFromBase64String(DecryptionParameters param)
+        {
+            var responseData = new DecryptionData();
+
+            Validators.ValidateNotNull(param);
+            
+
+            if (!Validators.IsBase64String(param.SecretKey))
+            {
+                AddError(responseData, $"SecretKey: {param.SecretKey} is not a base64 string");
+                return responseData;
+            }
+
+            if (!Validators.IsBase64String(param.IV))
+            {
+                AddError(responseData, $"IV: {param.IV} is not a base64 string");
+                return responseData;
+            }
+
+            try
+            {
+                var byteDecryptionParameters = new ByteDecryptionParameters
+                {
+                    SecretKey = Convert.FromBase64String(param.SecretKey),
+                    IV = Convert.FromBase64String(param.IV),
+                    Data = Convert.FromBase64String(param.DataToDecrypt)
+                };
+
+                var response = DecryptAES(byteDecryptionParameters);
+
+                return new DecryptionData
+                {
+                    DecryptedData = response.BytesToString(),
+                    Iv = param.IV,
+                    SecretKey = param.SecretKey
+                };
+            }
+            catch (Exception ex)
+            {
+                // Handle decryption failure or padding errors
+                AddError(responseData, $"Decryption error: {ex.Message}");
+                return responseData;
+            }
+        }
 
 
         private void NullChecks(string data, string secretKey, string iv)
@@ -37,5 +117,11 @@ private void NullChecks(string data, string secretKey, string iv)
 
             return (secretKey.ConvertKeysToBytes(), iv.ConvertKeysToBytes());
         }
+
+        private void AddError(DecryptionData responseData, string error)
+        {
+            responseData.HasError = true;
+            responseData.Errors.Add(error);
+        }
     }
 }

src/Encryption/AesEncryption/Encrypting.cs

@@ -4,9 +4,9 @@
 using SafeCrypt.Models;
 using SafeCrypt.src.Encryption.AesEncryption.Models;
 
-namespace SafeCrypt.Encrypt
+namespace SafeCrypt.AESEncryption
 {
-    public class Encrypting : BaseAesEncryption
+    public class AesEncryption : BaseAesEncryption
     {
         /// <summary>
         /// Encrypts the provided data using the specified secret key and initialization vector (IV).