Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(connector): [Worldpay] use 4 digit expiry year #6543

Merged
merged 2 commits into from
Nov 19, 2024
Merged

fix(connector): [Worldpay] use 4 digit expiry year #6543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56fa3b8
fix(connector): [Worldpay] use 4 digit expiry year
kashif-m Nov 12, 2024
6320a93
chore: update cypress test case to use 2 digit expiry year
kashif-m Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/hyperswitch_connectors/src/connectors/worldpay/transformers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use super::{requests::*, response::*};
use crate::{
types::ResponseRouterData,
utils::{
self, AddressData, ForeignTryFrom, PaymentsAuthorizeRequestData,
self, AddressData, CardData, ForeignTryFrom, PaymentsAuthorizeRequestData,
PaymentsSetupMandateRequestData, RouterData as RouterDataTrait,
},
};
Expand Down Expand Up @@ -77,8 +77,8 @@ fn fetch_payment_instrument(
PaymentMethodData::Card(card) => Ok(PaymentInstrument::Card(CardPayment {
payment_type: PaymentType::Plain,
expiry_date: ExpiryDate {
month: utils::CardData::get_expiry_month_as_i8(&card)?,
year: utils::CardData::get_expiry_year_as_i32(&card)?,
month: card.get_expiry_month_as_i8()?,
year: card.get_expiry_year_as_4_digit_i32()?,
},
card_number: card.card_number,
cvc: card.card_cvc,
Expand Down
9 changes: 9 additions & 0 deletions crates/hyperswitch_connectors/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,7 @@ pub trait CardData {
fn get_expiry_date_as_mmyy(&self) -> Result<Secret<String>, errors::ConnectorError>;
fn get_expiry_month_as_i8(&self) -> Result<Secret<i8>, Error>;
fn get_expiry_year_as_i32(&self) -> Result<Secret<i32>, Error>;
fn get_expiry_year_as_4_digit_i32(&self) -> Result<Secret<i32>, Error>;
}

impl CardData for Card {
Expand Down Expand Up @@ -922,6 +923,14 @@ impl CardData for Card {
.change_context(errors::ConnectorError::ResponseDeserializationFailed)
.map(Secret::new)
}
fn get_expiry_year_as_4_digit_i32(&self) -> Result<Secret<i32>, Error> {
self.get_expiry_year_4_digit()
.peek()
.clone()
.parse::<i32>()
.change_context(errors::ConnectorError::ResponseDeserializationFailed)
.map(Secret::new)
}
}

#[track_caller]
Expand Down
40 changes: 20 additions & 20 deletions cypress-tests/cypress/e2e/PaymentUtils/WorldPay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@ const browser_info = {
"ip_address": "127.0.0.1"
};

const successfulNo3DSCardDetails = {
const successfulNoThreeDsCardDetailsRequest = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A quick question: is the name verified with <test>.cy.js?

card_number: "4242424242424242",
card_exp_month: "10",
card_exp_year: "2030",
card_exp_year: "30",
card_holder_name: "morino",
card_cvc: "737",
};

const successfulThreeDSTestCardDetails = {
const successfulThreeDsTestCardDetailsRequest = {
card_number: "4000000000001091",
card_exp_month: "10",
card_exp_year: "2030",
card_exp_year: "30",
card_holder_name: "morino",
card_cvc: "737",
};

const payment_method_data_no3ds = {
const paymentMethodDataNoThreeDsResponse = {
card: {
last4: "4242",
card_type: "CREDIT",
Expand All @@ -52,7 +52,7 @@ const payment_method_data_no3ds = {
card_isin: "424242",
card_extended_bin: null,
card_exp_month: "10",
card_exp_year: "2030",
card_exp_year: "30",
card_holder_name: null,
payment_checks: null,
authentication_data: null
Expand All @@ -70,7 +70,7 @@ const payment_method_data_3ds = {
card_isin: "400000",
card_extended_bin: null,
card_exp_month: "10",
card_exp_year: "2030",
card_exp_year: "30",
card_holder_name: null,
payment_checks: null,
authentication_data: null
Expand Down Expand Up @@ -115,7 +115,7 @@ export const connectorDetails = {
payment_method: "card",
payment_method_type: "debit",
payment_method_data: {
card: successfulNo3DSCardDetails,
card: successfulNoThreeDsCardDetailsRequest,
},
currency: "USD",
customer_acceptance: null,
Expand All @@ -129,7 +129,7 @@ export const connectorDetails = {
payment_method: "card",
payment_method_type: "debit",
attempt_count: 1,
payment_method_data: payment_method_data_no3ds,
payment_method_data: paymentMethodDataNoThreeDsResponse,
},
},
},
Expand All @@ -138,7 +138,7 @@ export const connectorDetails = {
payment_method: "card",
payment_method_type: "debit",
payment_method_data: {
card: successfulNo3DSCardDetails,
card: successfulNoThreeDsCardDetailsRequest,
},
currency: "USD",
customer_acceptance: null,
Expand All @@ -151,7 +151,7 @@ export const connectorDetails = {
payment_method: "card",
payment_method_type: "debit",
attempt_count: 1,
payment_method_data: payment_method_data_no3ds,
payment_method_data: paymentMethodDataNoThreeDsResponse,
},
},
},
Expand All @@ -160,7 +160,7 @@ export const connectorDetails = {
payment_method: "card",
payment_method_type: "debit",
payment_method_data: {
card: successfulNo3DSCardDetails,
card: successfulNoThreeDsCardDetailsRequest,
},
currency: "USD",
customer_acceptance: null,
Expand All @@ -179,7 +179,7 @@ export const connectorDetails = {
payment_method: "card",
payment_method_type: "debit",
payment_method_data: {
card: successfulNo3DSCardDetails,
card: successfulNoThreeDsCardDetailsRequest,
},
currency: "USD",
customer_acceptance: null,
Expand Down Expand Up @@ -222,7 +222,7 @@ export const connectorDetails = {
Request: {
payment_method: "card",
payment_method_data: {
card: successfulNo3DSCardDetails,
card: successfulNoThreeDsCardDetailsRequest,
},
currency: "USD",
setup_future_usage: "on_session",
Expand Down Expand Up @@ -250,7 +250,7 @@ export const connectorDetails = {
Request: {
payment_method: "card",
payment_method_data: {
card: successfulNo3DSCardDetails,
card: successfulNoThreeDsCardDetailsRequest,
},
currency: "USD",
setup_future_usage: "on_session",
Expand All @@ -276,7 +276,7 @@ export const connectorDetails = {
payment_method: "card",
payment_method_type: "debit",
payment_method_data: {
card: successfulThreeDSTestCardDetails,
card: successfulThreeDsTestCardDetailsRequest,
},
currency: "USD",
customer_acceptance: null,
Expand All @@ -297,7 +297,7 @@ export const connectorDetails = {
payment_method: "card",
payment_method_type: "debit",
payment_method_data: {
card: successfulThreeDSTestCardDetails,
card: successfulThreeDsTestCardDetailsRequest,
},
currency: "USD",
customer_acceptance: null,
Expand All @@ -322,7 +322,7 @@ export const connectorDetails = {
Request: {
payment_method: "card",
payment_method_data: {
card: successfulNo3DSCardDetails,
card: successfulNoThreeDsCardDetailsRequest,
},
currency: "EUR",
customer_acceptance: null,
Expand All @@ -344,7 +344,7 @@ export const connectorDetails = {
Request: {
payment_method: "card",
payment_method_data: {
card: successfulNo3DSCardDetails,
card: successfulNoThreeDsCardDetailsRequest,
},
currency: "USD",
customer_acceptance: null,
Expand Down Expand Up @@ -417,7 +417,7 @@ export const connectorDetails = {
Request: {
payment_method: "card",
payment_method_data: {
card: successfulNo3DSCardDetails,
card: successfulNoThreeDsCardDetailsRequest,
},
currency: "USD",
mandate_data: singleUseMandateData,
Expand Down
Loading