refactor: resolve comments(part2)

juspay · Feb 3, 2025 · f6145db · f6145db
1 parent 20386bd
commit f6145db
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 88 deletions.
diff --git a/crates/cards/src/lib.rs b/crates/cards/src/lib.rs
@@ -35,7 +35,7 @@ impl<'de> Deserialize<'de> for CardSecurityCode {
     }
 }
 
-#[derive(Serialize)]
+#[derive(Clone, Debug, Serialize)]
 pub struct CardExpirationMonth(StrongSecret<u8>);
 
 impl CardExpirationMonth {
@@ -67,7 +67,7 @@ impl<'de> Deserialize<'de> for CardExpirationMonth {
     }
 }
 
-#[derive(Serialize)]
+#[derive(Clone, Debug, Serialize)]
 pub struct CardExpirationYear(StrongSecret<u16>);
 
 impl CardExpirationYear {

diff --git a/crates/hyperswitch_connectors/src/connectors/cybersource/transformers.rs b/crates/hyperswitch_connectors/src/connectors/cybersource/transformers.rs
@@ -1775,22 +1775,25 @@ impl
         let payment_information =
             PaymentInformation::GooglePay(Box::new(GooglePayPaymentInformation {
                 tokenized_card: TokenizedCard {
-                    number: google_pay_decrypted_data.payment_method_details.pan,
+                    number: Secret::new(
+                        google_pay_decrypted_data
+                            .payment_method_details
+                            .pan
+                            .get_card_no(),
+                    ),
                     cryptogram: google_pay_decrypted_data.payment_method_details.cryptogram,
                     transaction_type: TransactionType::GooglePay,
                     expiration_year: Secret::new(
                         google_pay_decrypted_data
                             .payment_method_details
                             .expiration_year
-                            .expose()
-                            .to_string(),
+                            .four_digits(),
                     ),
                     expiration_month: Secret::new(
                         google_pay_decrypted_data
                             .payment_method_details
                             .expiration_month
-                            .expose()
-                            .to_string(),
+                            .two_digits(),
                     ),
                 },
             }));

diff --git a/crates/hyperswitch_domain_models/src/router_data.rs b/crates/hyperswitch_domain_models/src/router_data.rs
@@ -262,9 +262,9 @@ pub struct GooglePayDecryptedData {
 #[serde(rename_all = "camelCase")]
 pub struct GooglePayPaymentMethodDetails {
     pub auth_method: common_enums::enums::GooglePayAuthMethod,
-    pub expiration_month: Secret<u16>,
-    pub expiration_year: Secret<u16>,
-    pub pan: Secret<String>,
+    pub expiration_month: cards::CardExpirationMonth,
+    pub expiration_year: cards::CardExpirationYear,
+    pub pan: cards::CardNumber,
     pub cryptogram: Option<Secret<String>>,
     pub eci_indicator: Option<String>,
 }

diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml
@@ -68,7 +68,7 @@ encoding_rs = "0.8.33"
 error-stack = "0.4.1"
 futures = "0.3.30"
 hex = "0.4.3"
-rust_hkdf = { package = "hkdf", version = "0.12.4" }
+hkdf = "0.12.4"
 http = "0.2.12"
 hyper = "0.14.28"
 infer = "0.15.0"

diff --git a/crates/router/src/core/payments.rs b/crates/router/src/core/payments.rs
@@ -3106,13 +3106,8 @@ where
             };
 
             let google_pay_predecrypt = google_pay_data
-                .parse_value::<hyperswitch_domain_models::router_data::GooglePayDecryptedData>(
-                    "GooglePayDecryptedData",
-                )
-                .change_context(errors::ApiErrorResponse::InternalServerError)
-                .attach_printable(
-                    "failed to parse decrypted google pay response to GooglePayDecryptedData",
-                )?;
+                .ok_or(errors::ApiErrorResponse::InternalServerError)
+                .attach_printable("failed to get GooglePayDecryptedData in response")?;
 
             Ok(Some(PaymentMethodToken::GooglePayDecrypt(Box::new(
                 google_pay_predecrypt,