refactor: resolve comments (part1)

crates/common_enums/src/enums.rs

@@ -3651,21 +3651,7 @@ pub enum FeatureStatus {
     Supported,
 }
 
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    PartialEq,
-    Eq,
-    Hash,
-    strum::Display,
-    strum::VariantNames,
-    strum::EnumIter,
-    strum::EnumString,
-    Deserialize,
-    Serialize,
-)]
-#[strum(serialize_all = "SCREAMING_SNAKE_CASE")]
+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
 pub enum GooglePayAuthMethod {
     /// Contain pan data only

crates/common_utils/Cargo.toml

@@ -26,6 +26,7 @@ payment_methods_v2 = []
 [dependencies]
 async-trait = { version = "0.1.79", optional = true }
 base64 = "0.22.0"
+base64-serde = "0.8.0"
 blake3 = { version = "1.5.1", features = ["serde"] }
 bytes = "1.6.0"
 diesel = "2.2.3"

crates/common_utils/src/custom_serde.rs

@@ -203,8 +203,20 @@ pub mod timestamp {
 
 /// <https://github.com/serde-rs/serde/issues/994#issuecomment-316895860>
 pub mod json_string {
-    use serde::de::{self, Deserialize, DeserializeOwned, Deserializer};
-    use serde_json;
+    use serde::{
+        de::{self, Deserialize, DeserializeOwned, Deserializer},
+        ser::{self, Serialize, Serializer},
+    };
+
+    /// Serialize a type to json_string format
+    pub fn serialize<T, S>(value: &T, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        T: Serialize,
+        S: Serializer,
+    {
+        let j = serde_json::to_string(value).map_err(ser::Error::custom)?;
+        j.serialize(serializer)
+    }
 
     /// Deserialize a string which is in json format
     pub fn deserialize<'de, T, D>(deserializer: D) -> Result<T, D::Error>

crates/common_utils/src/lib.rs

@@ -35,6 +35,8 @@ pub mod hashing;
 #[cfg(feature = "metrics")]
 pub mod metrics;
 
+pub use base64_serializer::Base64Serializer;
+
 /// Date-time utilities.
 pub mod date_time {
     #[cfg(feature = "async_ext")]
@@ -296,6 +298,14 @@ pub trait DbConnectionParams {
     }
 }
 
+// Can't add doc comments for macro invocations, neither does the macro allow it.
+#[allow(missing_docs)]
+mod base64_serializer {
+    use base64_serde::base64_serde_type;
+
+    base64_serde_type!(pub Base64Serializer, crate::consts::BASE64_ENGINE);
+}
+
 #[cfg(test)]
 mod nanoid_tests {
     #![allow(clippy::unwrap_used)]

crates/masking/src/secret.rs

@@ -156,3 +156,10 @@ where
         SecretValue::default().into()
     }
 }
+
+// Required by base64-serde to serialize Secret
+impl<T> AsRef<[T]> for Secret<Vec<T>> {
+    fn as_ref(&self) -> &[T] {
+        self.peek().as_slice()
+    }
+}

crates/router/src/configs/settings.rs

@@ -759,7 +759,7 @@ pub struct PazeDecryptConfig {
     pub paze_private_key_passphrase: Secret<String>,
 }
 
-#[derive(Debug, Deserialize, Clone, Default)]
+#[derive(Debug, Deserialize, Clone)]
 pub struct GooglePayDecryptConfig {
     pub google_pay_root_signing_keys: Secret<String>,
 }
@@ -917,6 +917,11 @@ impl Settings<SecuredSecret> {
             .map(|x| x.get_inner().validate())
             .transpose()?;
 
+        self.google_pay_decrypt_keys
+            .as_ref()
+            .map(|x| x.get_inner().validate())
+            .transpose()?;
+
         self.key_manager.get_inner().validate()?;
         #[cfg(feature = "email")]
         self.email

crates/router/src/configs/validations.rs

@@ -257,6 +257,21 @@ impl super::settings::PazeDecryptConfig {
     }
 }
 
+impl super::settings::GooglePayDecryptConfig {
+    pub fn validate(&self) -> Result<(), ApplicationError> {
+        use common_utils::fp_utils::when;
+
+        when(
+            self.google_pay_root_signing_keys.is_default_or_empty(),
+            || {
+                Err(ApplicationError::InvalidConfigurationValueError(
+                    "google_pay_root_signing_keys must not be empty".into(),
+                ))
+            },
+        )
+    }
+}
+
 impl super::settings::KeyManagerConfig {
     pub fn validate(&self) -> Result<(), ApplicationError> {
         use common_utils::fp_utils::when;

crates/router/src/core/errors.rs

@@ -248,8 +248,8 @@ pub enum PazeDecryptionError {
 pub enum GooglePayDecryptionError {
     #[error("Recipient ID not found")]
     RecipientIdNotFound,
-    #[error("Failed to fetch time delta for expiration")]
-    SystemTimeError,
+    #[error("Invalid expiration time")]
+    InvalidExpirationTime,
     #[error("Failed to base64 decode input data")]
     Base64DecodingFailed,
     #[error("Failed to decrypt input data")]