rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-10-27 11:24:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: support for paypal in wallet (#304)

Browse Source
This commit is contained in:
Sangamesh Kulkarni
2023-01-09 17:39:47 +05:30
committed by GitHub
parent e87fdb752d
commit 097807cbe9
7 changed files with 49 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/api_models/src/payments.rs
View File

@ -253,10 +253,10 @@ pub enum PaymentMethod {
Paypal, Paypal,
} }
#[derive(Debug, Clone, Eq, PartialEq, serde::Deserialize, serde::Serialize)] #[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize)]
pub struct WalletData { pub struct WalletData {
pub issuer_name: api_enums::WalletIssuer, pub issuer_name: api_enums::WalletIssuer,
pub token: String, pub token: Option<String>,
} }
#[derive(Eq, PartialEq, Clone, Debug, serde::Serialize)] #[derive(Eq, PartialEq, Clone, Debug, serde::Serialize)]

33
crates/router/src/connector/adyen/transformers.rs
View File

@ -298,9 +298,8 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for AdyenPaymentRequest {
let payment_type = match item.payment_method { let payment_type = match item.payment_method {
storage_enums::PaymentMethodType::Card => "scheme".to_string(), storage_enums::PaymentMethodType::Card => "scheme".to_string(),
storage_enums::PaymentMethodType::Paypal => "paypal".to_string(),
storage_enums::PaymentMethodType::Wallet => wallet_data storage_enums::PaymentMethodType::Wallet => wallet_data
.get_required_value("issuer_name") .get_required_value("wallet_data")
.change_context(errors::ConnectorError::RequestEncodingFailed)? .change_context(errors::ConnectorError::RequestEncodingFailed)?
.issuer_name .issuer_name
.to_string(), .to_string(),
@ -321,7 +320,7 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for AdyenPaymentRequest {
} }
storage_enums::PaymentMethodType::Wallet => match wallet_data storage_enums::PaymentMethodType::Wallet => match wallet_data
.get_required_value("issuer_name") .get_required_value("wallet_data")
.change_context(errors::ConnectorError::RequestEncodingFailed)? .change_context(errors::ConnectorError::RequestEncodingFailed)?
.issuer_name .issuer_name
{ {
@ -329,10 +328,13 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for AdyenPaymentRequest {
let gpay_data = AdyenGPay { let gpay_data = AdyenGPay {
payment_type, payment_type,
google_pay_token: wallet_data google_pay_token: wallet_data
.get_required_value("token") .get_required_value("wallet_data")
.change_context(errors::ConnectorError::RequestEncodingFailed)? .change_context(errors::ConnectorError::RequestEncodingFailed)?
.token .token
.to_string(), .to_owned()
.get_required_value("token")
.change_context(errors::ConnectorError::RequestEncodingFailed)
.attach_printable("No token passed")?,
}; };
Ok(AdyenPaymentMethod::Gpay(gpay_data)) Ok(AdyenPaymentMethod::Gpay(gpay_data))
} }
@ -341,24 +343,21 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for AdyenPaymentRequest {
let apple_pay_data = AdyenApplePay { let apple_pay_data = AdyenApplePay {
payment_type, payment_type,
apple_pay_token: wallet_data apple_pay_token: wallet_data
.get_required_value("token") .get_required_value("wallet_data")
.change_context(errors::ConnectorError::RequestEncodingFailed)? .change_context(errors::ConnectorError::RequestEncodingFailed)?
.token .token
.to_string(), .to_owned()
.get_required_value("token")
.change_context(errors::ConnectorError::RequestEncodingFailed)
.attach_printable("No token passed")?,
}; };
Ok(AdyenPaymentMethod::ApplePay(apple_pay_data)) Ok(AdyenPaymentMethod::ApplePay(apple_pay_data))
} }
api_enums::WalletIssuer::Paypal => {
api_enums::WalletIssuer::Paypal => Err(errors::ConnectorError::NotImplemented( let wallet = AdyenPaypal { payment_type };
"Adyen - Paypal".to_string(), Ok(AdyenPaymentMethod::AdyenPaypal(wallet))
)), }
}, },
storage_enums::PaymentMethodType::Paypal => {
let wallet = AdyenPaypal { payment_type };
Ok(AdyenPaymentMethod::AdyenPaypal(wallet))
}
_ => Err(errors::ConnectorError::MissingRequiredField { _ => Err(errors::ConnectorError::MissingRequiredField {
field_name: "payment_method".to_string(), field_name: "payment_method".to_string(),
}), }),

9
crates/router/src/connector/braintree/transformers.rs
View File

@ -1,9 +1,11 @@
use error_stack::ResultExt;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::{ use crate::{
core::errors, core::errors,
pii::PeekInterface, pii::PeekInterface,
types::{self, api, storage::enums}, types::{self, api, storage::enums},
utils::OptionExt,
}; };
#[derive(Default, Debug, Serialize, Eq, PartialEq)] #[derive(Default, Debug, Serialize, Eq, PartialEq)]
@ -106,7 +108,12 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for BraintreePaymentsRequest {
})), })),
api::PaymentMethod::Wallet(ref wallet_data) => { api::PaymentMethod::Wallet(ref wallet_data) => {
Ok(PaymentMethodType::PaymentMethodNonce(Nonce { Ok(PaymentMethodType::PaymentMethodNonce(Nonce {
payment_method_nonce: wallet_data.token.to_string(), payment_method_nonce: wallet_data
.token
.to_owned()
.get_required_value("token")
.change_context(errors::ConnectorError::RequestEncodingFailed)
.attach_printable("No token passed")?,
})) }))
} }
_ => Err(errors::ConnectorError::NotImplemented(format!( _ => Err(errors::ConnectorError::NotImplemented(format!(

14
crates/router/src/connector/worldpay/transformers.rs
View File

@ -1,6 +1,7 @@
use std::str::FromStr; use std::str::FromStr;
use common_utils::errors::CustomResult; use common_utils::errors::CustomResult;
use error_stack::ResultExt;
use masking::PeekInterface; use masking::PeekInterface;
use storage_models::enums; use storage_models::enums;
@ -8,6 +9,7 @@ use super::{requests::*, response::*};
use crate::{ use crate::{
core::errors, core::errors,
types::{self, api}, types::{self, api},
utils::OptionExt,
}; };
fn parse_int<T: FromStr>( fn parse_int<T: FromStr>(
@ -40,14 +42,22 @@ fn fetch_payment_instrument(
api_models::enums::WalletIssuer::ApplePay => { api_models::enums::WalletIssuer::ApplePay => {
Ok(PaymentInstrument::Applepay(WalletPayment { Ok(PaymentInstrument::Applepay(WalletPayment {
payment_type: PaymentType::Applepay, payment_type: PaymentType::Applepay,
wallet_token: wallet.token, wallet_token: wallet
.token
.get_required_value("token")
.change_context(errors::ConnectorError::RequestEncodingFailed)
.attach_printable("No token passed")?,
..WalletPayment::default() ..WalletPayment::default()
})) }))
} }
api_models::enums::WalletIssuer::GooglePay => { api_models::enums::WalletIssuer::GooglePay => {
Ok(PaymentInstrument::Googlepay(WalletPayment { Ok(PaymentInstrument::Googlepay(WalletPayment {
payment_type: PaymentType::Googlepay, payment_type: PaymentType::Googlepay,
wallet_token: wallet.token, wallet_token: wallet
.token
.get_required_value("token")
.change_context(errors::ConnectorError::RequestEncodingFailed)
.attach_printable("No token passed")?,
..WalletPayment::default() ..WalletPayment::default()
})) }))
} }

8
crates/router/src/core/payments/operations/payment_confirm.rs
View File

@ -233,11 +233,9 @@ impl<F: Clone + Send> Domain<F, api::PaymentsRequest> for PaymentConfirm {
let (op, payment_method_data) = let (op, payment_method_data) =
helpers::make_pm_data(Box::new(self), state, payment_data).await?; helpers::make_pm_data(Box::new(self), state, payment_data).await?;
if payment_data.payment_attempt.payment_method != Some(enums::PaymentMethodType::Paypal) { utils::when(payment_method_data.is_none(), || {
utils::when(payment_method_data.is_none(), || { Err(errors::ApiErrorResponse::PaymentMethodNotFound)
Err(errors::ApiErrorResponse::PaymentMethodNotFound) })?;
})?;
}
Ok((op, payment_method_data)) Ok((op, payment_method_data))
} }

32
crates/router/src/core/payments/transformers.rs
View File

@ -411,19 +411,9 @@ impl<F: Clone> TryFrom<PaymentData<F>> for types::PaymentsAuthorizeData {
let order_details = parsed_metadata.and_then(|data| data.order_details); let order_details = parsed_metadata.and_then(|data| data.order_details);
Ok(Self { Ok(Self {
payment_method_data: { payment_method_data: payment_data
let payment_method_type = payment_data .payment_method_data
.payment_attempt .get_required_value("payment_method_data")?,
.payment_method
.get_required_value("payment_method_type")?;
match payment_method_type {
enums::PaymentMethodType::Paypal => api::PaymentMethod::Paypal,
_ => payment_data
.payment_method_data
.get_required_value("payment_method_data")?,
}
},
setup_future_usage: payment_data.payment_intent.setup_future_usage, setup_future_usage: payment_data.payment_intent.setup_future_usage,
mandate_id: payment_data.mandate_id.clone(), mandate_id: payment_data.mandate_id.clone(),
off_session: payment_data.mandate_id.as_ref().map(|_| true), off_session: payment_data.mandate_id.as_ref().map(|_| true),
@ -527,19 +517,9 @@ impl<F: Clone> TryFrom<PaymentData<F>> for types::VerifyRequestData {
fn try_from(payment_data: PaymentData<F>) -> Result<Self, Self::Error> { fn try_from(payment_data: PaymentData<F>) -> Result<Self, Self::Error> {
Ok(Self { Ok(Self {
confirm: true, confirm: true,
payment_method_data: { payment_method_data: payment_data
let payment_method_type = payment_data .payment_method_data
.payment_attempt .get_required_value("payment_method_data")?,
.payment_method
.get_required_value("payment_method_type")?;
match payment_method_type {
enums::PaymentMethodType::Paypal => api::PaymentMethod::Paypal,
_ => payment_data
.payment_method_data
.get_required_value("payment_method_data")?,
}
},
statement_descriptor_suffix: payment_data.payment_intent.statement_descriptor_suffix, statement_descriptor_suffix: payment_data.payment_intent.statement_descriptor_suffix,
setup_future_usage: payment_data.payment_intent.setup_future_usage, setup_future_usage: payment_data.payment_intent.setup_future_usage,
off_session: payment_data.mandate_id.as_ref().map(|_| true), off_session: payment_data.mandate_id.as_ref().map(|_| true),

4
crates/router/tests/connectors/worldpay.rs
View File

@ -65,7 +65,7 @@ async fn should_authorize_gpay_payment() {
.authorize_payment(Some(types::PaymentsAuthorizeData { .authorize_payment(Some(types::PaymentsAuthorizeData {
payment_method_data: types::api::PaymentMethod::Wallet(api::WalletData { payment_method_data: types::api::PaymentMethod::Wallet(api::WalletData {
issuer_name: api_enums::WalletIssuer::GooglePay, issuer_name: api_enums::WalletIssuer::GooglePay,
token: "someToken".to_string(), token: Some("someToken".to_string()),
}), }),
..utils::PaymentAuthorizeType::default().0 ..utils::PaymentAuthorizeType::default().0
})) }))
@ -86,7 +86,7 @@ async fn should_authorize_applepay_payment() {
.authorize_payment(Some(types::PaymentsAuthorizeData { .authorize_payment(Some(types::PaymentsAuthorizeData {
payment_method_data: types::api::PaymentMethod::Wallet(api::WalletData { payment_method_data: types::api::PaymentMethod::Wallet(api::WalletData {
issuer_name: api_enums::WalletIssuer::ApplePay, issuer_name: api_enums::WalletIssuer::ApplePay,
token: "someToken".to_string(), token: Some("someToken".to_string()),
}), }),
..utils::PaymentAuthorizeType::default().0 ..utils::PaymentAuthorizeType::default().0
})) }))