CustomResult<\n- RouterData<\n- api::AuthorizeSessionToken,\n- types::AuthorizeSessionTokenData,\n- types::PaymentsResponseData,\n- >,\n- errors::ConnectorError,\n- >\n- where\n- api::AuthorizeSessionToken: Clone,\n- types::AuthorizeSessionTokenData: Clone,\n- types::PaymentsResponseData: Clone,\n- {\n- let response: nuvei::NuveiSessionResponse = res\n- .response\n- .parse_struct(\"nuvei NuveiSessionResponse\")\n- .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;\n- logger::debug!(nuvei_session_response=?response);\n-\n- types::ResponseRouterData {\n+ ) -> CustomResult {\n+ let response: nuvei::NuveiSessionResponse =\n+ res.response.parse_struct(\"NuveiSessionResponse\").switch()?;\n+ types::RouterData::try_from(types::ResponseRouterData {\n response,\n data: data.clone(),\n http_code: res.status_code,\n- }\n- .try_into()\n- .change_context(errors::ConnectorError::ResponseHandlingFailed)\n+ })\n }\n \n fn get_error_response(\n@@ -552,9 +641,99 @@ impl\n }\n }\n \n-impl api::Refund for Nuvei {}\n-impl api::RefundExecute for Nuvei {}\n-impl api::RefundSync for Nuvei {}\n+impl ConnectorIntegration\n+ for Nuvei\n+{\n+ fn get_headers(\n+ &self,\n+ req: &types::PaymentsInitRouterData,\n+ connectors: &settings::Connectors,\n+ ) -> CustomResult, errors::ConnectorError> {\n+ self.build_headers(req, connectors)\n+ }\n+\n+ fn get_content_type(&self) -> &'static str {\n+ self.common_get_content_type()\n+ }\n+\n+ fn get_url(\n+ &self,\n+ _req: &types::PaymentsInitRouterData,\n+ connectors: &settings::Connectors,\n+ ) -> CustomResult {\n+ Ok(format!(\n+ \"{}ppp/api/v1/initPayment.do\",\n+ api::ConnectorCommon::base_url(self, connectors)\n+ ))\n+ }\n+\n+ fn get_request_body(\n+ &self,\n+ req: &types::PaymentsInitRouterData,\n+ ) -> CustomResult, errors::ConnectorError> {\n+ let req_obj = nuvei::NuveiPaymentsRequest::try_from((req, req.get_session_token()?))?;\n+ let req =\n+ common_utils::Encode::::encode_to_string_of_json(&req_obj)\n+ .change_context(errors::ConnectorError::RequestEncodingFailed)?;\n+\n+ Ok(Some(req))\n+ }\n+\n+ fn build_request(\n+ &self,\n+ req: &types::PaymentsInitRouterData,\n+ connectors: &settings::Connectors,\n+ ) -> CustomResult, errors::ConnectorError> {\n+ Ok(Some(\n+ services::RequestBuilder::new()\n+ .method(services::Method::Post)\n+ .url(&types::PaymentsInitType::get_url(self, req, connectors)?)\n+ .headers(types::PaymentsInitType::get_headers(self, req, connectors)?)\n+ .body(types::PaymentsInitType::get_request_body(self, req)?)\n+ .build(),\n+ ))\n+ }\n+\n+ fn handle_response(\n+ &self,\n+ data: &types::PaymentsInitRouterData,\n+ res: Response,\n+ ) -> CustomResult {\n+ let response: nuvei::NuveiPaymentsResponse = res\n+ .response\n+ .parse_struct(\"NuveiPaymentsResponse\")\n+ .switch()?;\n+ let response_data = types::RouterData::try_from(types::ResponseRouterData {\n+ response: response.clone(),\n+ data: data.clone(),\n+ http_code: res.status_code,\n+ })\n+ .change_context(errors::ConnectorError::ResponseHandlingFailed)?;\n+ let is_enrolled_for_3ds = response\n+ .clone()\n+ .payment_option\n+ .and_then(|po| po.card)\n+ .and_then(|c| c.three_d)\n+ .and_then(|t| t.v2supported)\n+ .map(to_boolean)\n+ .unwrap_or_default();\n+ Ok(types::RouterData {\n+ request: types::PaymentsAuthorizeData {\n+ enrolled_for_3ds: is_enrolled_for_3ds,\n+ related_transaction_id: response.transaction_id,\n+ ..response_data.request\n+ },\n+ ..response_data\n+ })\n+ }\n+\n+ fn get_error_response(\n+ &self,\n+ res: Response,\n+ ) -> CustomResult {\n+ self.build_error_response(res)\n+ }\n+}\n \n impl ConnectorIntegration for Nuvei {\n fn get_headers(\n@@ -585,9 +764,10 @@ impl ConnectorIntegration,\n ) -> CustomResult, errors::ConnectorError> {\n let req_obj = nuvei::NuveiPaymentFlowRequest::try_from(req)?;\n- let req =\n- utils::Encode::::encode_to_string_of_json(&req_obj)\n- .change_context(errors::ConnectorError::RequestEncodingFailed)?;\n+ let req = common_utils::Encode::::encode_to_string_of_json(\n+ &req_obj,\n+ )\n+ .change_context(errors::ConnectorError::RequestEncodingFailed)?;\n Ok(Some(req))\n }\n \n@@ -612,17 +792,15 @@ impl ConnectorIntegration,\n res: Response,\n ) -> CustomResult, errors::ConnectorError> {\n- logger::debug!(target: \"router::connector::nuvei\", response=?res);\n let response: nuvei::NuveiPaymentsResponse = res\n .response\n- .parse_struct(\"nuvei NuveiPaymentsResponse\")\n- .change_context(errors::ConnectorError::RequestEncodingFailed)?;\n- types::ResponseRouterData {\n+ .parse_struct(\"NuveiPaymentsResponse\")\n+ .switch()?;\n+ types::RouterData::try_from(types::ResponseRouterData {\n response,\n data: data.clone(),\n http_code: res.status_code,\n- }\n- .try_into()\n+ })\n .change_context(errors::ConnectorError::ResponseHandlingFailed)\n }\n \n@@ -664,7 +842,31 @@ impl services::ConnectorRedirectResponse for Nuvei {\n fn get_flow_type(\n &self,\n _query_params: &str,\n+ json_payload: Option,\n+ action: services::PaymentAction,\n ) -> CustomResult {\n- Ok(payments::CallConnectorAction::Trigger)\n+ match action {\n+ services::PaymentAction::PSync => Ok(payments::CallConnectorAction::Trigger),\n+ services::PaymentAction::CompleteAuthorize => {\n+ if let Some(payload) = json_payload {\n+ let redirect_response: nuvei::NuveiRedirectionResponse =\n+ payload.parse_value(\"NuveiRedirectionResponse\").switch()?;\n+ let acs_response: nuvei::NuveiACSResponse = redirect_response\n+ .cres\n+ .parse_struct(\"NuveiACSResponse\")\n+ .switch()?;\n+ match acs_response.trans_status {\n+ None | Some(nuvei::LiabilityShift::Failed) => {\n+ Ok(payments::CallConnectorAction::StatusUpdate(\n+ enums::AttemptStatus::AuthenticationFailed,\n+ ))\n+ }\n+ _ => Ok(payments::CallConnectorAction::Trigger),\n+ }\n+ } else {\n+ Ok(payments::CallConnectorAction::Trigger)\n+ }\n+ }\n+ }\n }\n }\ndiff --git a/crates/router/src/connector/nuvei/transformers.rs b/crates/router/src/connector/nuvei/transformers.rs\nindex 50cf95e13ce..b4bceacfbe3 100644\n--- a/crates/router/src/connector/nuvei/transformers.rs\n+++ b/crates/router/src/connector/nuvei/transformers.rs\n@@ -1,15 +1,18 @@\n use common_utils::{\n crypto::{self, GenerateDigest},\n date_time,\n+ pii::Email,\n };\n use error_stack::{IntoReport, ResultExt};\n use masking::Secret;\n+use reqwest::Url;\n use serde::{Deserialize, Serialize};\n \n use crate::{\n- connector::utils::{PaymentsCancelRequestData, RouterData},\n+ connector::utils::{self, PaymentsAuthorizeRequestData, PaymentsCancelRequestData, RouterData},\n consts,\n core::errors,\n+ services,\n types::{self, api, storage::enums},\n };\n \n@@ -28,7 +31,7 @@ pub struct NuveiSessionRequest {\n pub checksum: String,\n }\n \n-#[derive(Debug, Serialize, Default, Deserialize)]\n+#[derive(Debug, Serialize, Default, Clone, Deserialize)]\n #[serde(rename_all = \"camelCase\")]\n pub struct NuveiSessionResponse {\n pub session_token: String,\n@@ -42,7 +45,7 @@ pub struct NuveiSessionResponse {\n pub client_request_id: String,\n }\n \n-#[derive(Debug, Serialize, Default, Deserialize)]\n+#[derive(Debug, Serialize, Default)]\n #[serde(rename_all = \"camelCase\")]\n pub struct NuveiPaymentsRequest {\n pub time_stamp: String,\n@@ -57,9 +60,23 @@ pub struct NuveiPaymentsRequest {\n pub transaction_type: TransactionType,\n pub payment_option: PaymentOption,\n pub checksum: String,\n+ pub billing_address: Option,\n+ pub related_transaction_id: Option,\n }\n \n-#[derive(Debug, Serialize, Default, Deserialize)]\n+#[derive(Debug, Serialize, Default)]\n+pub struct NuveiInitPaymentRequest {\n+ pub session_token: String,\n+ pub merchant_id: String,\n+ pub merchant_site_id: String,\n+ pub client_request_id: String,\n+ pub amount: String,\n+ pub currency: String,\n+ pub payment_option: PaymentOption,\n+ pub checksum: String,\n+}\n+\n+#[derive(Debug, Serialize, Default)]\n #[serde(rename_all = \"camelCase\")]\n pub struct NuveiPaymentFlowRequest {\n pub time_stamp: String,\n@@ -72,7 +89,7 @@ pub struct NuveiPaymentFlowRequest {\n pub checksum: String,\n }\n \n-#[derive(Debug, Serialize, Default, Deserialize)]\n+#[derive(Debug, Serialize, Default)]\n #[serde(rename_all = \"camelCase\")]\n pub struct NuveiPaymentSyncRequest {\n pub session_token: String,\n@@ -85,22 +102,37 @@ pub enum TransactionType {\n Sale,\n }\n \n-#[derive(Debug, Default, Serialize, Deserialize)]\n+#[derive(Debug, Clone, Default, Serialize, Deserialize)]\n #[serde(rename_all = \"camelCase\")]\n pub struct PaymentOption {\n- pub card: Card,\n+ pub card: Option,\n+ pub redirect_url: Option,\n pub user_payment_option_id: Option,\n pub device_details: Option,\n+ pub alternative_payment_method: Option,\n pub billing_address: Option,\n }\n \n-#[derive(Debug, Default, Serialize, Deserialize)]\n+#[derive(Debug, Clone, Default, Serialize, Deserialize)]\n+#[serde(rename_all = \"camelCase\")]\n+pub struct AlternativePaymentMethod {\n+ pub payment_method: AlternativePaymentMethodType,\n+}\n+\n+#[derive(Debug, Clone, Default, Serialize, Deserialize)]\n+#[serde(rename_all = \"snake_case\")]\n+pub enum AlternativePaymentMethodType {\n+ #[default]\n+ ApmgwExpresscheckout,\n+}\n+\n+#[derive(Debug, Clone, Default, Serialize, Deserialize)]\n pub struct BillingAddress {\n- pub email: String,\n+ pub email: Secret,\n pub country: String,\n }\n \n-#[derive(Debug, Default, Serialize, Deserialize)]\n+#[derive(Debug, Clone, Default, Serialize, Deserialize)]\n #[serde(rename_all = \"camelCase\")]\n pub struct Card {\n pub card_number: Option>,\n@@ -123,41 +155,84 @@ pub struct Card {\n pub issuer_bank_name: Option,\n pub issuer_country: Option,\n pub is_prepaid: Option,\n+ pub external_token: Option,\n }\n \n-#[derive(Debug, Default, Serialize, Deserialize)]\n+#[derive(Debug, Clone, Default, Serialize, Deserialize)]\n+#[serde(rename_all = \"camelCase\")]\n+pub struct ExternalToken {\n+ pub external_token_provider: ExternalTokenProvider,\n+ pub mobile_token: String,\n+}\n+\n+#[derive(Debug, Clone, Default, Serialize, Deserialize)]\n+#[serde(rename_all = \"PascalCase\")]\n+pub enum ExternalTokenProvider {\n+ #[default]\n+ GooglePay,\n+ ApplePay,\n+}\n+\n+#[derive(Debug, Clone, Default, Serialize, Deserialize)]\n #[serde(rename_all = \"camelCase\")]\n pub struct ThreeD {\n+ pub method_completion_ind: Option,\n pub browser_details: Option,\n pub version: Option,\n+ #[serde(rename = \"notificationURL\")]\n pub notification_url: Option,\n+ #[serde(rename = \"merchantURL\")]\n pub merchant_url: Option,\n- pub platform_type: Option,\n+ pub acs_url: Option,\n+ pub c_req: Option,\n+ pub platform_type: Option,\n+ pub v2supported: Option,\n pub v2_additional_params: Option,\n+ pub is_liability_on_issuer: Option,\n }\n \n-#[derive(Debug, Default, Serialize, Deserialize)]\n+#[derive(Debug, Clone, Default, Serialize, Deserialize)]\n+pub enum MethodCompletion {\n+ #[serde(rename = \"Y\")]\n+ Success,\n+ #[serde(rename = \"N\")]\n+ Failure,\n+ #[serde(rename = \"U\")]\n+ #[default]\n+ Unavailable,\n+}\n+\n+#[derive(Debug, Clone, Default, Serialize, Deserialize)]\n+pub enum PlatformType {\n+ #[serde(rename = \"01\")]\n+ App,\n+ #[serde(rename = \"02\")]\n+ #[default]\n+ Browser,\n+}\n+\n+#[derive(Debug, Clone, Default, Serialize, Deserialize)]\n #[serde(rename_all = \"camelCase\")]\n pub struct BrowserDetails {\n pub accept_header: String,\n- pub ip: String,\n+ pub ip: Option,\n pub java_enabled: String,\n pub java_script_enabled: String,\n pub language: String,\n- pub color_depth: String,\n- pub screen_height: String,\n- pub screen_width: String,\n- pub time_zone: String,\n+ pub color_depth: u8,\n+ pub screen_height: u32,\n+ pub screen_width: u32,\n+ pub time_zone: i32,\n pub user_agent: String,\n }\n \n-#[derive(Debug, Default, Serialize, Deserialize)]\n+#[derive(Debug, Clone, Default, Serialize, Deserialize)]\n #[serde(rename_all = \"camelCase\")]\n pub struct V2AdditionalParams {\n pub challenge_window_size: String,\n }\n \n-#[derive(Debug, Default, Serialize, Deserialize)]\n+#[derive(Debug, Clone, Default, Serialize, Deserialize)]\n #[serde(rename_all = \"camelCase\")]\n pub struct DeviceDetails {\n pub ip_address: String,\n@@ -172,6 +247,48 @@ impl From for TransactionType {\n }\n }\n \n+#[derive(Debug, Serialize, Deserialize)]\n+pub struct NuveiRedirectionResponse {\n+ pub cres: String,\n+}\n+#[derive(Debug, Serialize, Deserialize)]\n+#[serde(rename_all = \"camelCase\")]\n+pub struct NuveiACSResponse {\n+ #[serde(rename = \"threeDSServerTransID\")]\n+ pub three_ds_server_trans_id: String,\n+ #[serde(rename = \"acsTransID\")]\n+ pub acs_trans_id: String,\n+ pub message_type: String,\n+ pub message_version: String,\n+ pub trans_status: Option,\n+ pub message_extension: Vec,\n+ pub acs_signed_content: Option,\n+}\n+\n+#[derive(Debug, Serialize, Deserialize)]\n+#[serde(rename_all = \"camelCase\")]\n+pub struct MessageExtension {\n+ pub name: String,\n+ pub id: String,\n+ pub criticality_indicator: bool,\n+ pub data: MessageExtensionData,\n+}\n+\n+#[derive(Debug, Serialize, Deserialize)]\n+#[serde(rename_all = \"camelCase\")]\n+pub struct MessageExtensionData {\n+ pub value_one: String,\n+ pub value_two: String,\n+}\n+\n+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]\n+pub enum LiabilityShift {\n+ #[serde(rename = \"Y\", alias = \"1\")]\n+ Success,\n+ #[serde(rename = \"N\", alias = \"0\")]\n+ Failed,\n+}\n+\n fn encode_payload(\n payload: Vec,\n ) -> Result> {\n@@ -192,7 +309,9 @@ impl TryFrom<&types::PaymentsAuthorizeSessionTokenRouterData> for NuveiSessionRe\n let merchant_id = connector_meta.merchant_id;\n let merchant_site_id = connector_meta.merchant_site_id;\n let client_request_id = item.attempt_id.clone();\n- let time_stamp = date_time::date_as_yyyymmddhhmmss();\n+ let time_stamp = date_time::date_as_yyyymmddhhmmss()\n+ .into_report()\n+ .change_context(errors::ConnectorError::RequestEncodingFailed)?;\n let merchant_secret = connector_meta.merchant_secret;\n Ok(Self {\n merchant_id: merchant_id.clone(),\n@@ -214,7 +333,7 @@ impl\n TryFrom>\n for types::RouterData\n {\n- type Error = error_stack::Report;\n+ type Error = error_stack::Report;\n fn try_from(\n item: types::ResponseRouterData,\n ) -> Result {\n@@ -229,53 +348,237 @@ impl\n }\n }\n \n-impl TryFrom<&types::PaymentsAuthorizeRouterData> for NuveiPaymentsRequest {\n+impl\n+ TryFrom<(\n+ &types::RouterData,\n+ String,\n+ )> for NuveiPaymentsRequest\n+{\n type Error = error_stack::Report;\n- fn try_from(item: &types::PaymentsAuthorizeRouterData) -> Result {\n+ fn try_from(\n+ data: (\n+ &types::RouterData,\n+ String,\n+ ),\n+ ) -> Result {\n+ let item = data.0;\n+ let session_token = data.1;\n+ if session_token.is_empty() {\n+ return Err(errors::ConnectorError::MissingRequiredField {\n+ field_name: \"session_token\",\n+ }\n+ .into());\n+ }\n let connector_meta: NuveiAuthType = NuveiAuthType::try_from(&item.connector_auth_type)?;\n let merchant_id = connector_meta.merchant_id;\n let merchant_site_id = connector_meta.merchant_site_id;\n let client_request_id = item.attempt_id.clone();\n- let time_stamp = date_time::date_as_yyyymmddhhmmss();\n+ let time_stamp = date_time::date_as_yyyymmddhhmmss()\n+ .into_report()\n+ .change_context(errors::ConnectorError::RequestEncodingFailed)?;\n let merchant_secret = connector_meta.merchant_secret;\n- match item.request.payment_method_data.clone() {\n- api::PaymentMethodData::Card(card) => Ok(Self {\n- merchant_id: merchant_id.clone(),\n- merchant_site_id: merchant_site_id.clone(),\n- client_request_id: client_request_id.clone(),\n- amount: item.request.amount.clone().to_string(),\n- currency: item.request.currency.clone().to_string(),\n- transaction_type: item\n- .request\n- .capture_method\n- .map(TransactionType::from)\n- .unwrap_or_default(),\n+ let request_data = match item.request.payment_method_data.clone() {\n+ api::PaymentMethodData::Card(card) => get_card_info(item, &card),\n+ api::PaymentMethodData::Wallet(wallet) => match wallet {\n+ api_models::payments::WalletData::GooglePay(gpay_data) => Ok(Self {\n+ payment_option: PaymentOption {\n+ card: Some(Card {\n+ external_token: Some(ExternalToken {\n+ external_token_provider: ExternalTokenProvider::GooglePay,\n+ mobile_token: gpay_data.tokenization_data.token,\n+ }),\n+ ..Default::default()\n+ }),\n+ ..Default::default()\n+ },\n+ ..Default::default()\n+ }),\n+ api_models::payments::WalletData::ApplePay(apple_data) => Ok(Self {\n+ payment_option: PaymentOption {\n+ card: Some(Card {\n+ external_token: Some(ExternalToken {\n+ external_token_provider: ExternalTokenProvider::ApplePay,\n+ mobile_token: apple_data.payment_data,\n+ }),\n+ ..Default::default()\n+ }),\n+ ..Default::default()\n+ },\n+ ..Default::default()\n+ }),\n+ api_models::payments::WalletData::PaypalRedirect(_) => Ok(Self {\n+ payment_option: PaymentOption {\n+ alternative_payment_method: Some(AlternativePaymentMethod {\n+ payment_method: AlternativePaymentMethodType::ApmgwExpresscheckout,\n+ }),\n+ ..Default::default()\n+ },\n+ billing_address: Some(BillingAddress {\n+ email: item.request.get_email()?,\n+ country: item.get_billing_country()?,\n+ }),\n+ ..Default::default()\n+ }),\n+ _ => Err(errors::ConnectorError::NotSupported {\n+ payment_method: \"Wallet\".to_string(),\n+ connector: \"Nuvei\",\n+ payment_experience: \"RedirectToUrl\".to_string(),\n+ }\n+ .into()),\n+ },\n+ _ => Err(errors::ConnectorError::NotImplemented(\"Payment methods\".to_string()).into()),\n+ }?;\n+ Ok(Self {\n+ merchant_id: merchant_id.clone(),\n+ merchant_site_id: merchant_site_id.clone(),\n+ client_request_id: client_request_id.clone(),\n+ amount: item.request.amount.clone().to_string(),\n+ currency: item.request.currency.clone().to_string(),\n+ transaction_type: item\n+ .request\n+ .capture_method\n+ .map(TransactionType::from)\n+ .unwrap_or_default(),\n+ time_stamp: time_stamp.clone(),\n+ session_token,\n+ checksum: encode_payload(vec![\n+ merchant_id,\n+ merchant_site_id,\n+ client_request_id,\n+ item.request.amount.to_string(),\n+ item.request.currency.to_string(),\n+ time_stamp,\n+ merchant_secret,\n+ ])?,\n+ ..request_data\n+ })\n+ }\n+}\n+fn get_card_info(\n+ item: &types::RouterData,\n+ card_details: &api_models::payments::Card,\n+) -> Result> {\n+ let browser_info = item.request.get_browser_info()?;\n+ let related_transaction_id = if item.request.enrolled_for_3ds {\n+ item.request.related_transaction_id.clone()\n+ } else {\n+ None\n+ };\n+ let three_d = if item.request.enrolled_for_3ds {\n+ Some(ThreeD {\n+ browser_details: Some(BrowserDetails {\n+ accept_header: browser_info.accept_header,\n+ ip: browser_info.ip_address,\n+ java_enabled: browser_info.java_enabled.to_string().to_uppercase(),\n+ java_script_enabled: browser_info.java_script_enabled.to_string().to_uppercase(),\n+ language: browser_info.language,\n+ color_depth: browser_info.color_depth,\n+ screen_height: browser_info.screen_height,\n+ screen_width: browser_info.screen_width,\n+ time_zone: browser_info.time_zone,\n+ user_agent: browser_info.user_agent,\n+ }),\n+ notification_url: item.complete_authorize_url.clone(),\n+ merchant_url: item.return_url.clone(),\n+ platform_type: Some(PlatformType::Browser),\n+ method_completion_ind: Some(MethodCompletion::Unavailable),\n+ ..Default::default()\n+ })\n+ } else {\n+ None\n+ };\n+ let card = card_details.clone();\n+ Ok(NuveiPaymentsRequest {\n+ related_transaction_id,\n+ payment_option: PaymentOption {\n+ card: Some(Card {\n+ card_number: Some(card.card_number),\n+ card_holder_name: Some(card.card_holder_name),\n+ expiration_month: Some(card.card_exp_month),\n+ expiration_year: Some(card.card_exp_year),\n+ three_d,\n+ cvv: Some(card.card_cvc),\n+ ..Default::default()\n+ }),\n+ ..Default::default()\n+ },\n+ ..Default::default()\n+ })\n+}\n+\n+impl\n+ TryFrom<(\n+ &types::RouterData,\n+ String,\n+ )> for NuveiPaymentsRequest\n+{\n+ type Error = error_stack::Report;\n+ fn try_from(\n+ data: (\n+ &types::RouterData,\n+ String,\n+ ),\n+ ) -> Result {\n+ let item = data.0;\n+ let session_token = data.1;\n+ if session_token.is_empty() {\n+ return Err(errors::ConnectorError::MissingRequiredField {\n+ field_name: \"session_token\",\n+ }\n+ .into());\n+ }\n+ let connector_meta: NuveiAuthType = NuveiAuthType::try_from(&item.connector_auth_type)?;\n+ let merchant_id = connector_meta.merchant_id;\n+ let merchant_site_id = connector_meta.merchant_site_id;\n+ let client_request_id = item.attempt_id.clone();\n+ let time_stamp = date_time::date_as_yyyymmddhhmmss()\n+ .into_report()\n+ .change_context(errors::ConnectorError::RequestEncodingFailed)?;\n+ let merchant_secret = connector_meta.merchant_secret;\n+ let request_data = match item.request.payment_method_data.clone() {\n+ Some(api::PaymentMethodData::Card(card)) => Ok(Self {\n+ related_transaction_id: item.request.connector_transaction_id.clone(),\n payment_option: PaymentOption {\n- card: Card {\n+ card: Some(Card {\n card_number: Some(card.card_number),\n card_holder_name: Some(card.card_holder_name),\n expiration_month: Some(card.card_exp_month),\n expiration_year: Some(card.card_exp_year),\n cvv: Some(card.card_cvc),\n ..Default::default()\n- },\n+ }),\n ..Default::default()\n },\n- time_stamp: time_stamp.clone(),\n- session_token: item.get_session_token()?,\n- checksum: encode_payload(vec![\n- merchant_id,\n- merchant_site_id,\n- client_request_id,\n- item.request.amount.to_string(),\n- item.request.currency.to_string(),\n- time_stamp,\n- merchant_secret,\n- ])?,\n ..Default::default()\n }),\n- _ => Err(errors::ConnectorError::NotImplemented(\"Payment methods\".to_string()).into()),\n- }\n+ _ => Err(errors::ConnectorError::NotImplemented(\n+ \"Payment methods\".to_string(),\n+ )),\n+ }?;\n+ Ok(Self {\n+ merchant_id: merchant_id.clone(),\n+ merchant_site_id: merchant_site_id.clone(),\n+ client_request_id: client_request_id.clone(),\n+ amount: item.request.amount.clone().to_string(),\n+ currency: item.request.currency.clone().to_string(),\n+ transaction_type: item\n+ .request\n+ .capture_method\n+ .map(TransactionType::from)\n+ .unwrap_or_default(),\n+ time_stamp: time_stamp.clone(),\n+ session_token,\n+ checksum: encode_payload(vec![\n+ merchant_id,\n+ merchant_site_id,\n+ client_request_id,\n+ item.request.amount.to_string(),\n+ item.request.currency.to_string(),\n+ time_stamp,\n+ merchant_secret,\n+ ])?,\n+ ..request_data\n+ })\n }\n }\n \n@@ -286,7 +589,9 @@ impl TryFrom<&types::PaymentsCaptureRouterData> for NuveiPaymentFlowRequest {\n let merchant_id = connector_meta.merchant_id;\n let merchant_site_id = connector_meta.merchant_site_id;\n let client_request_id = item.attempt_id.clone();\n- let time_stamp = date_time::date_as_yyyymmddhhmmss();\n+ let time_stamp = date_time::date_as_yyyymmddhhmmss()\n+ .into_report()\n+ .change_context(errors::ConnectorError::RequestEncodingFailed)?;\n let merchant_secret = connector_meta.merchant_secret;\n Ok(Self {\n merchant_id: merchant_id.clone(),\n@@ -317,7 +622,9 @@ impl TryFrom<&types::RefundExecuteRouterData> for NuveiPaymentFlowRequest {\n let merchant_id = connector_meta.merchant_id;\n let merchant_site_id = connector_meta.merchant_site_id;\n let client_request_id = item.attempt_id.clone();\n- let time_stamp = date_time::date_as_yyyymmddhhmmss();\n+ let time_stamp = date_time::date_as_yyyymmddhhmmss()\n+ .into_report()\n+ .change_context(errors::ConnectorError::RequestEncodingFailed)?;\n let merchant_secret = connector_meta.merchant_secret;\n Ok(Self {\n merchant_id: merchant_id.clone(),\n@@ -344,7 +651,7 @@ impl TryFrom<&types::RefundExecuteRouterData> for NuveiPaymentFlowRequest {\n impl TryFrom<&types::PaymentsSyncRouterData> for NuveiPaymentSyncRequest {\n type Error = error_stack::Report;\n fn try_from(value: &types::PaymentsSyncRouterData) -> Result {\n- let meta: NuveiMeta = value.to_connector_meta()?;\n+ let meta: NuveiMeta = utils::to_connector_meta(value.request.connector_meta.clone())?;\n Ok(Self {\n session_token: meta.session_token,\n })\n@@ -358,7 +665,9 @@ impl TryFrom<&types::PaymentsCancelRouterData> for NuveiPaymentFlowRequest {\n let merchant_id = connector_meta.merchant_id;\n let merchant_site_id = connector_meta.merchant_site_id;\n let client_request_id = item.attempt_id.clone();\n- let time_stamp = date_time::date_as_yyyymmddhhmmss();\n+ let time_stamp = date_time::date_as_yyyymmddhhmmss()\n+ .into_report()\n+ .change_context(errors::ConnectorError::RequestEncodingFailed)?;\n let merchant_secret = connector_meta.merchant_secret;\n let amount = item.request.get_amount()?.to_string();\n let currency = item.request.get_currency()?.to_string();\n@@ -427,6 +736,7 @@ pub enum NuveiTransactionStatus {\n Approved,\n Declined,\n Error,\n+ Redirect,\n #[default]\n Processing,\n }\n@@ -441,7 +751,7 @@ impl From for enums::AttemptStatus {\n }\n }\n \n-#[derive(Debug, Serialize, Deserialize)]\n+#[derive(Debug, Clone, Deserialize)]\n #[serde(rename_all = \"camelCase\")]\n pub struct NuveiPaymentsResponse {\n pub order_id: Option,\n@@ -472,16 +782,18 @@ pub struct NuveiPaymentsResponse {\n pub client_request_id: Option,\n }\n \n-#[derive(Debug, Serialize, Deserialize)]\n+#[derive(Debug, Clone, Serialize, Deserialize)]\n pub enum NuveiTransactionType {\n Auth,\n Sale,\n Credit,\n+ Auth3D,\n+ InitAuth3D,\n Settle,\n Void,\n }\n \n-#[derive(Debug, Serialize, Deserialize)]\n+#[derive(Debug, Clone, Serialize, Deserialize)]\n #[serde(rename_all = \"camelCase\")]\n pub struct FraudDetails {\n pub final_decision: String,\n@@ -505,10 +817,14 @@ fn get_payment_status(response: &NuveiPaymentsResponse) -> enums::AttemptStatus\n enums::AttemptStatus::Failure\n }\n Some(NuveiTransactionType::Void) => enums::AttemptStatus::VoidFailed,\n+ Some(NuveiTransactionType::Auth3D) => {\n+ enums::AttemptStatus::AuthenticationFailed\n+ }\n _ => enums::AttemptStatus::Pending,\n }\n }\n NuveiTransactionStatus::Processing => enums::AttemptStatus::Pending,\n+ NuveiTransactionStatus::Redirect => enums::AttemptStatus::AuthenticationPending,\n },\n None => match response.status {\n NuveiPaymentStatus::Failed | NuveiPaymentStatus::Error => enums::AttemptStatus::Failure,\n@@ -521,10 +837,22 @@ impl\n TryFrom>\n for types::RouterData\n {\n- type Error = error_stack::Report;\n+ type Error = error_stack::Report;\n fn try_from(\n item: types::ResponseRouterData,\n ) -> Result {\n+ let redirection_data = item\n+ .response\n+ .payment_option\n+ .as_ref()\n+ .and_then(|o| o.card.clone())\n+ .and_then(|card| card.three_d)\n+ .and_then(|three_ds| three_ds.acs_url.zip(three_ds.c_req))\n+ .map(|(base_url, creq)| services::RedirectForm {\n+ endpoint: base_url,\n+ method: services::Method::Post,\n+ form_fields: std::collections::HashMap::from([(\"creq\".to_string(), creq)]),\n+ });\n Ok(Self {\n status: get_payment_status(&item.response),\n response: match item.response.status {\n@@ -556,21 +884,24 @@ impl\n status_code: item.http_code,\n }),\n _ => Ok(types::PaymentsResponseData::TransactionResponse {\n- resource_id: types::ResponseId::ConnectorTransactionId(\n- item.response.transaction_id.ok_or(errors::ParsingError)?,\n+ resource_id: item.response.transaction_id.map_or_else(\n+ || types::ResponseId::NoResponseId,\n+ types::ResponseId::ConnectorTransactionId,\n ),\n- redirection_data: None,\n+ redirection_data,\n mandate_reference: None,\n- connector_metadata: Some(\n- serde_json::to_value(NuveiMeta {\n- session_token: item\n- .response\n- .session_token\n- .ok_or(errors::ParsingError)?,\n- })\n- .into_report()\n- .change_context(errors::ParsingError)?,\n- ),\n+ // we don't need to save session token for capture, void flow so ignoring if it is not present\n+ connector_metadata: if let Some(token) = item.response.session_token {\n+ Some(\n+ serde_json::to_value(NuveiMeta {\n+ session_token: token,\n+ })\n+ .into_report()\n+ .change_context(errors::ConnectorError::ResponseHandlingFailed)?,\n+ )\n+ } else {\n+ None\n+ },\n }),\n },\n },\n@@ -579,12 +910,32 @@ impl\n }\n }\n \n+impl TryFrom>\n+ for types::RouterData\n+{\n+ type Error = error_stack::Report;\n+ fn try_from(\n+ item: types::ResponseRouterData,\n+ ) -> Result {\n+ Ok(Self {\n+ status: enums::AttemptStatus::AuthenticationFailed,\n+ response: Err(types::ErrorResponse {\n+ code: consts::NO_ERROR_CODE.to_string(),\n+ message: \"Authentication Failed\".to_string(),\n+ reason: None,\n+ status_code: item.http_code,\n+ }),\n+ ..item.data\n+ })\n+ }\n+}\n+\n impl From for enums::RefundStatus {\n fn from(item: NuveiTransactionStatus) -> Self {\n match item {\n NuveiTransactionStatus::Approved => Self::Success,\n NuveiTransactionStatus::Declined | NuveiTransactionStatus::Error => Self::Failure,\n- NuveiTransactionStatus::Processing => Self::Pending,\n+ NuveiTransactionStatus::Processing | NuveiTransactionStatus::Redirect => Self::Pending,\n }\n }\n }\n@@ -592,49 +943,18 @@ impl From for enums::RefundStatus {\n impl TryFrom>\n for types::RefundsRouterData\n {\n- type Error = error_stack::Report;\n+ type Error = error_stack::Report;\n fn try_from(\n item: types::RefundsResponseRouterData,\n ) -> Result {\n- let response = item.response;\n- let http_code = item.http_code;\n- let refund_status = response\n- .transaction_status\n- .clone()\n- .map(|a| a.into())\n- .unwrap_or(enums::RefundStatus::Failure);\n- let refund_response = match response.status {\n- NuveiPaymentStatus::Error => Err(types::ErrorResponse {\n- code: response\n- .err_code\n- .map(|c| c.to_string())\n- .unwrap_or_else(|| consts::NO_ERROR_CODE.to_string()),\n- message: response\n- .reason\n- .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),\n- reason: None,\n- status_code: http_code,\n- }),\n- _ => match response.transaction_status {\n- Some(NuveiTransactionStatus::Error) => Err(types::ErrorResponse {\n- code: response\n- .gw_error_code\n- .map(|c| c.to_string())\n- .unwrap_or_else(|| consts::NO_ERROR_CODE.to_string()),\n- message: response\n- .gw_error_reason\n- .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),\n- reason: None,\n- status_code: http_code,\n- }),\n- _ => Ok(types::RefundsResponseData {\n- connector_refund_id: response.transaction_id.ok_or(errors::ParsingError)?,\n- refund_status,\n- }),\n- },\n- };\n Ok(Self {\n- response: refund_response,\n+ response: get_refund_response(\n+ item.response.clone(),\n+ item.http_code,\n+ item.response\n+ .transaction_id\n+ .ok_or(errors::ConnectorError::MissingConnectorTransactionID)?,\n+ ),\n ..item.data\n })\n }\n@@ -643,54 +963,61 @@ impl TryFrom>\n for types::RefundsRouterData\n {\n- type Error = error_stack::Report;\n+ type Error = error_stack::Report;\n fn try_from(\n item: types::RefundsResponseRouterData,\n ) -> Result {\n- let response = item.response;\n- let http_code = item.http_code;\n- let refund_status = response\n- .transaction_status\n- .clone()\n- .map(|a| a.into())\n- .unwrap_or(enums::RefundStatus::Failure);\n- let refund_response = match response.status {\n- NuveiPaymentStatus::Error => Err(types::ErrorResponse {\n+ Ok(Self {\n+ response: get_refund_response(\n+ item.response.clone(),\n+ item.http_code,\n+ item.response\n+ .transaction_id\n+ .ok_or(errors::ConnectorError::MissingConnectorTransactionID)?,\n+ ),\n+ ..item.data\n+ })\n+ }\n+}\n+\n+fn get_refund_response(\n+ response: NuveiPaymentsResponse,\n+ http_code: u16,\n+ txn_id: String,\n+) -> Result {\n+ let refund_status = response\n+ .transaction_status\n+ .clone()\n+ .map(enums::RefundStatus::from)\n+ .unwrap_or(enums::RefundStatus::Failure);\n+ match response.status {\n+ NuveiPaymentStatus::Error => Err(types::ErrorResponse {\n+ code: response\n+ .err_code\n+ .map(|c| c.to_string())\n+ .unwrap_or_else(|| consts::NO_ERROR_CODE.to_string()),\n+ message: response\n+ .reason\n+ .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),\n+ reason: None,\n+ status_code: http_code,\n+ }),\n+ _ => match response.transaction_status {\n+ Some(NuveiTransactionStatus::Error) => Err(types::ErrorResponse {\n code: response\n- .err_code\n+ .gw_error_code\n .map(|c| c.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_CODE.to_string()),\n message: response\n- .reason\n+ .gw_error_reason\n .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),\n reason: None,\n status_code: http_code,\n }),\n- _ => match response.transaction_status {\n- Some(NuveiTransactionStatus::Error) => Err(types::ErrorResponse {\n- code: response\n- .gw_error_code\n- .map(|c| c.to_string())\n- .unwrap_or_else(|| consts::NO_ERROR_CODE.to_string()),\n- message: response\n- .gw_error_reason\n- .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),\n- reason: None,\n- status_code: http_code,\n- }),\n- _ => Ok(types::RefundsResponseData {\n- connector_refund_id: response.transaction_id.ok_or(errors::ParsingError)?,\n- refund_status,\n- }),\n- },\n- };\n- Ok(Self {\n- response: refund_response,\n- ..item.data\n- })\n+ _ => Ok(types::RefundsResponseData {\n+ connector_refund_id: txn_id,\n+ refund_status,\n+ }),\n+ },\n }\n }\n-\n-//TODO: Fill the struct with respective fields\n-#[derive(Default, Debug, Serialize, Deserialize, PartialEq)]\n-pub struct NuveiErrorResponse {}\ndiff --git a/crates/router/src/connector/payu.rs b/crates/router/src/connector/payu.rs\nindex e29b55760e5..32cbfcb371b 100644\n--- a/crates/router/src/connector/payu.rs\n+++ b/crates/router/src/connector/payu.rs\n@@ -7,10 +7,7 @@ use transformers as payu;\n \n use crate::{\n configs::settings,\n- core::{\n- errors::{self, CustomResult},\n- payments,\n- },\n+ core::errors::{self, CustomResult},\n headers,\n services::{self, ConnectorIntegration},\n types::{\n@@ -692,12 +689,3 @@ impl api::IncomingWebhook for Payu {\n Err(errors::ConnectorError::WebhooksNotImplemented).into_report()\n }\n }\n-\n-impl services::ConnectorRedirectResponse for Payu {\n- fn get_flow_type(\n- &self,\n- _query_params: &str,\n- ) -> CustomResult {\n- Ok(payments::CallConnectorAction::Trigger)\n- }\n-}\ndiff --git a/crates/router/src/connector/rapyd.rs b/crates/router/src/connector/rapyd.rs\nindex 8c0c47409e3..0c1d6fa44ac 100644\n--- a/crates/router/src/connector/rapyd.rs\n+++ b/crates/router/src/connector/rapyd.rs\n@@ -12,10 +12,7 @@ use crate::{\n configs::settings,\n connector::utils as conn_utils,\n consts,\n- core::{\n- errors::{self, CustomResult},\n- payments,\n- },\n+ core::errors::{self, CustomResult},\n db::StorageInterface,\n headers, services,\n types::{\n@@ -806,12 +803,3 @@ impl api::IncomingWebhook for Rapyd {\n Ok(res_json)\n }\n }\n-\n-impl services::ConnectorRedirectResponse for Rapyd {\n- fn get_flow_type(\n- &self,\n- _query_params: &str,\n- ) -> CustomResult {\n- Ok(payments::CallConnectorAction::Trigger)\n- }\n-}\ndiff --git a/crates/router/src/connector/shift4.rs b/crates/router/src/connector/shift4.rs\nindex ee4386e2100..b70c660578c 100644\n--- a/crates/router/src/connector/shift4.rs\n+++ b/crates/router/src/connector/shift4.rs\n@@ -10,10 +10,7 @@ use super::utils::RefundsRequestData;\n use crate::{\n configs::settings,\n consts,\n- core::{\n- errors::{self, CustomResult},\n- payments,\n- },\n+ core::errors::{self, CustomResult},\n headers,\n services::{self, ConnectorIntegration},\n types::{\n@@ -530,12 +527,3 @@ impl api::IncomingWebhook for Shift4 {\n Ok(details.data)\n }\n }\n-\n-impl services::ConnectorRedirectResponse for Shift4 {\n- fn get_flow_type(\n- &self,\n- _query_params: &str,\n- ) -> CustomResult {\n- Ok(payments::CallConnectorAction::Trigger)\n- }\n-}\ndiff --git a/crates/router/src/connector/stripe.rs b/crates/router/src/connector/stripe.rs\nindex 1ae8722b677..12f50e7c148 100644\n--- a/crates/router/src/connector/stripe.rs\n+++ b/crates/router/src/connector/stripe.rs\n@@ -974,6 +974,8 @@ impl services::ConnectorRedirectResponse for Stripe {\n fn get_flow_type(\n &self,\n query_params: &str,\n+ _json_payload: Option,\n+ _action: services::PaymentAction,\n ) -> CustomResult {\n let query =\n serde_urlencoded::from_str::(query_params)\ndiff --git a/crates/router/src/connector/trustpay.rs b/crates/router/src/connector/trustpay.rs\nindex 902ebeee4e0..53e0f7b440e 100644\n--- a/crates/router/src/connector/trustpay.rs\n+++ b/crates/router/src/connector/trustpay.rs\n@@ -611,6 +611,8 @@ impl services::ConnectorRedirectResponse for Trustpay {\n fn get_flow_type(\n &self,\n query_params: &str,\n+ _json_payload: Option,\n+ _action: services::PaymentAction,\n ) -> CustomResult {\n let query =\n serde_urlencoded::from_str::(query_params)\ndiff --git a/crates/router/src/connector/trustpay/transformers.rs b/crates/router/src/connector/trustpay/transformers.rs\nindex de0e476d6c7..c20a9e27aa7 100644\n--- a/crates/router/src/connector/trustpay/transformers.rs\n+++ b/crates/router/src/connector/trustpay/transformers.rs\n@@ -264,7 +264,7 @@ fn get_bank_redirection_request_data(\n },\n },\n callback_urls: CallbackURLs {\n- success: format!(\"{}?status=SuccessOk\", return_url),\n+ success: format!(\"{return_url}?status=SuccessOk\"),\n cancel: return_url.clone(),\n error: return_url,\n },\n@@ -816,7 +816,7 @@ impl TryFrom<&types::RefundsRouterData> for TrustpayRefundRequest {\n },\n payment_information: BankPaymentInformation {\n amount: Amount {\n- amount: format!(\"{:.2}\", amount),\n+ amount: format!(\"{amount:.2}\"),\n currency: item.request.currency.to_string(),\n },\n references: References {\ndiff --git a/crates/router/src/connector/utils.rs b/crates/router/src/connector/utils.rs\nindex 752e8d9c8a4..861605a16d2 100644\n--- a/crates/router/src/connector/utils.rs\n+++ b/crates/router/src/connector/utils.rs\n@@ -1,6 +1,10 @@\n use std::collections::HashMap;\n \n-use common_utils::{ext_traits::ValueExt, pii};\n+use base64::Engine;\n+use common_utils::{\n+ errors::ReportSwitchExt,\n+ pii::{self, Email},\n+};\n use error_stack::{report, IntoReport, ResultExt};\n use masking::Secret;\n use once_cell::sync::Lazy;\n@@ -8,10 +12,11 @@ use regex::Regex;\n use serde::Serializer;\n \n use crate::{\n+ consts,\n core::errors::{self, CustomResult},\n pii::PeekInterface,\n types::{self, api, PaymentsCancelData, ResponseId},\n- utils::OptionExt,\n+ utils::{OptionExt, ValueExt},\n };\n \n pub fn missing_field_err(\n@@ -52,6 +57,7 @@ pub trait RouterData {\n where\n T: serde::de::DeserializeOwned;\n fn get_return_url(&self) -> Result;\n+ fn is_three_ds(&self) -> bool;\n }\n \n impl RouterData for types::RouterData {\n@@ -116,29 +122,40 @@ impl RouterData for types::RouterData Result;\n-}\n \n-impl PaymentsRequestData for types::PaymentsAuthorizeRouterData {\n- fn get_card(&self) -> Result {\n- match self.request.payment_method_data.clone() {\n- api::PaymentMethodData::Card(card) => Ok(card),\n- _ => Err(missing_field_err(\"card\")()),\n- }\n+ fn is_three_ds(&self) -> bool {\n+ matches!(\n+ self.auth_type,\n+ storage_models::enums::AuthenticationType::ThreeDs\n+ )\n }\n }\n \n pub trait PaymentsAuthorizeRequestData {\n fn is_auto_capture(&self) -> bool;\n+ fn get_email(&self) -> Result, Error>;\n+ fn get_browser_info(&self) -> Result;\n+ fn get_card(&self) -> Result;\n }\n \n impl PaymentsAuthorizeRequestData for types::PaymentsAuthorizeData {\n fn is_auto_capture(&self) -> bool {\n self.capture_method == Some(storage_models::enums::CaptureMethod::Automatic)\n }\n+ fn get_email(&self) -> Result, Error> {\n+ self.email.clone().ok_or_else(missing_field_err(\"email\"))\n+ }\n+ fn get_browser_info(&self) -> Result {\n+ self.browser_info\n+ .clone()\n+ .ok_or_else(missing_field_err(\"browser_info\"))\n+ }\n+ fn get_card(&self) -> Result {\n+ match self.payment_method_data.clone() {\n+ api::PaymentMethodData::Card(card) => Ok(card),\n+ _ => Err(missing_field_err(\"card\")()),\n+ }\n+ }\n }\n \n pub trait PaymentsSyncRequestData {\n@@ -352,6 +369,65 @@ pub fn get_header_key_value<'a>(\n ))?\n }\n \n+pub fn to_boolean(string: String) -> bool {\n+ let str = string.as_str();\n+ match str {\n+ \"true\" => true,\n+ \"false\" => false,\n+ \"yes\" => true,\n+ \"no\" => false,\n+ _ => false,\n+ }\n+}\n+\n+pub fn get_connector_meta(\n+ connector_meta: Option,\n+) -> Result {\n+ connector_meta.ok_or_else(missing_field_err(\"connector_meta_data\"))\n+}\n+\n+pub fn to_connector_meta(connector_meta: Option) -> Result\n+where\n+ T: serde::de::DeserializeOwned,\n+{\n+ let json = connector_meta.ok_or_else(missing_field_err(\"connector_meta_data\"))?;\n+ json.parse_value(std::any::type_name::()).switch()\n+}\n+\n+pub fn to_connector_meta_from_secret(\n+ connector_meta: Option>,\n+) -> Result\n+where\n+ T: serde::de::DeserializeOwned,\n+{\n+ let connector_meta_secret =\n+ connector_meta.ok_or_else(missing_field_err(\"connector_meta_data\"))?;\n+ let json = connector_meta_secret.peek().clone();\n+ json.parse_value(std::any::type_name::()).switch()\n+}\n+\n+impl common_utils::errors::ErrorSwitch for errors::ParsingError {\n+ fn switch(&self) -> errors::ConnectorError {\n+ errors::ConnectorError::ParsingFailed\n+ }\n+}\n+\n+pub fn to_string(data: &T) -> Result\n+where\n+ T: serde::Serialize,\n+{\n+ serde_json::to_string(data)\n+ .into_report()\n+ .change_context(errors::ConnectorError::ResponseHandlingFailed)\n+}\n+\n+pub fn base64_decode(data: String) -> Result, Error> {\n+ consts::BASE64_ENGINE\n+ .decode(data)\n+ .into_report()\n+ .change_context(errors::ConnectorError::ResponseDeserializationFailed)\n+}\n+\n pub fn to_currency_base_unit_from_optional_amount(\n amount: Option,\n currency: storage_models::enums::Currency,\ndiff --git a/crates/router/src/connector/worldline.rs b/crates/router/src/connector/worldline.rs\nindex b538fb46b70..8f452bda011 100644\n--- a/crates/router/src/connector/worldline.rs\n+++ b/crates/router/src/connector/worldline.rs\n@@ -773,5 +773,3 @@ impl api::IncomingWebhook for Worldline {\n Ok(response)\n }\n }\n-\n-impl services::ConnectorRedirectResponse for Worldline {}\ndiff --git a/crates/router/src/connector/worldpay.rs b/crates/router/src/connector/worldpay.rs\nindex c0a1897ef06..a6a33ef69c5 100644\n--- a/crates/router/src/connector/worldpay.rs\n+++ b/crates/router/src/connector/worldpay.rs\n@@ -12,10 +12,7 @@ use self::{requests::*, response::*};\n use super::utils::RefundsRequestData;\n use crate::{\n configs::settings,\n- core::{\n- errors::{self, CustomResult},\n- payments,\n- },\n+ core::errors::{self, CustomResult},\n headers,\n services::{self, ConnectorIntegration},\n types::{\n@@ -611,12 +608,3 @@ impl api::IncomingWebhook for Worldpay {\n Err(errors::ConnectorError::WebhooksNotImplemented).into_report()\n }\n }\n-\n-impl services::ConnectorRedirectResponse for Worldpay {\n- fn get_flow_type(\n- &self,\n- _query_params: &str,\n- ) -> CustomResult {\n- Ok(payments::CallConnectorAction::Trigger)\n- }\n-}\ndiff --git a/crates/router/src/core/errors.rs b/crates/router/src/core/errors.rs\nindex 52f93999a31..e72d87cf57f 100644\n--- a/crates/router/src/core/errors.rs\n+++ b/crates/router/src/core/errors.rs\n@@ -227,6 +227,8 @@ pub enum ConnectorError {\n RequestEncodingFailed,\n #[error(\"Request encoding failed : {0}\")]\n RequestEncodingFailedWithReason(String),\n+ #[error(\"Parsing failed\")]\n+ ParsingFailed,\n #[error(\"Failed to deserialize connector response\")]\n ResponseDeserializationFailed,\n #[error(\"Failed to execute a processing step: {0:?}\")]\ndiff --git a/crates/router/src/core/payments.rs b/crates/router/src/core/payments.rs\nindex 06f5d192f84..50dfca86ca7 100644\n--- a/crates/router/src/core/payments.rs\n+++ b/crates/router/src/core/payments.rs\n@@ -18,7 +18,7 @@ pub use self::operations::{\n };\n use self::{\n flows::{ConstructFlowSpecificData, Feature},\n- operations::{BoxedOperation, Operation},\n+ operations::{payment_complete_authorize, BoxedOperation, Operation},\n };\n use crate::{\n core::{\n@@ -193,7 +193,11 @@ where\n .await?\n }\n };\n- vault::Vault::delete_locker_payment_method_by_lookup_key(state, &payment_data.token).await\n+ if payment_data.payment_intent.status != storage_enums::IntentStatus::RequiresCustomerAction\n+ {\n+ vault::Vault::delete_locker_payment_method_by_lookup_key(state, &payment_data.token)\n+ .await\n+ }\n }\n Ok((payment_data, req, customer))\n }\n@@ -247,80 +251,149 @@ fn is_start_pay(operation: &Op) -> bool {\n format!(\"{operation:?}\").eq(\"PaymentStart\")\n }\n \n-#[allow(clippy::too_many_arguments)]\n-pub async fn handle_payments_redirect_response<'a, F>(\n- state: &AppState,\n- merchant_account: storage::MerchantAccount,\n- req: api::PaymentsRetrieveRequest,\n-) -> RouterResponse\n-where\n- F: Send + Clone + 'a,\n-{\n- let connector = req.connector.clone().get_required_value(\"connector\")?;\n-\n- let query_params = req.param.clone().get_required_value(\"param\")?;\n+#[derive(Clone, Debug)]\n+pub struct PaymentsRedirectResponseData {\n+ pub connector: Option,\n+ pub param: Option,\n+ pub merchant_id: Option,\n+ pub json_payload: Option,\n+ pub resource_id: api::PaymentIdType,\n+ pub force_sync: bool,\n+}\n \n- let resource_id = api::PaymentIdTypeExt::get_payment_intent_id(&req.resource_id)\n- .change_context(errors::ApiErrorResponse::MissingRequiredField {\n- field_name: \"payment_id\",\n- })?;\n+#[async_trait::async_trait]\n+pub trait PaymentRedirectFlow: Sync {\n+ async fn call_payment_flow(\n+ &self,\n+ state: &AppState,\n+ merchant_account: storage::MerchantAccount,\n+ req: PaymentsRedirectResponseData,\n+ connector_action: CallConnectorAction,\n+ ) -> RouterResponse;\n+\n+ fn get_payment_action(&self) -> services::PaymentAction;\n+\n+ #[allow(clippy::too_many_arguments)]\n+ async fn handle_payments_redirect_response(\n+ &self,\n+ state: &AppState,\n+ merchant_account: storage::MerchantAccount,\n+ req: PaymentsRedirectResponseData,\n+ ) -> RouterResponse {\n+ let connector = req.connector.clone().get_required_value(\"connector\")?;\n+\n+ let query_params = req.param.clone().get_required_value(\"param\")?;\n+\n+ let resource_id = api::PaymentIdTypeExt::get_payment_intent_id(&req.resource_id)\n+ .change_context(errors::ApiErrorResponse::MissingRequiredField {\n+ field_name: \"payment_id\",\n+ })?;\n \n- let connector_data = api::ConnectorData::get_connector_by_name(\n- &state.conf.connectors,\n- &connector,\n- api::GetToken::Connector,\n- )?;\n+ let connector_data = api::ConnectorData::get_connector_by_name(\n+ &state.conf.connectors,\n+ &connector,\n+ api::GetToken::Connector,\n+ )?;\n \n- let flow_type = connector_data\n- .connector\n- .get_flow_type(&query_params)\n- .change_context(errors::ApiErrorResponse::InternalServerError)\n- .attach_printable(\"Failed to decide the response flow\")?;\n+ let flow_type = connector_data\n+ .connector\n+ .get_flow_type(\n+ &query_params,\n+ req.json_payload.clone(),\n+ self.get_payment_action(),\n+ )\n+ .change_context(errors::ApiErrorResponse::InternalServerError)\n+ .attach_printable(\"Failed to decide the response flow\")?;\n \n- let response = payments_response_for_redirection_flows(\n- state,\n- merchant_account.clone(),\n- req.clone(),\n- flow_type,\n- )\n- .await;\n+ let response = self\n+ .call_payment_flow(state, merchant_account.clone(), req.clone(), flow_type)\n+ .await;\n \n- let payments_response =\n- match response.change_context(errors::ApiErrorResponse::NotImplemented {\n- message: errors::api_error_response::NotImplementedMessage::Default,\n- })? {\n+ let payments_response = match response? {\n services::ApplicationResponse::Json(response) => Ok(response),\n _ => Err(errors::ApiErrorResponse::InternalServerError)\n .into_report()\n .attach_printable(\"Failed to get the response in json\"),\n }?;\n \n- let result = helpers::get_handle_response_url(\n- resource_id,\n- &merchant_account,\n- payments_response,\n- connector,\n- )\n- .attach_printable(\"No redirection response\")?;\n+ let result = helpers::get_handle_response_url(\n+ resource_id,\n+ &merchant_account,\n+ payments_response,\n+ connector,\n+ )\n+ .attach_printable(\"No redirection response\")?;\n \n- Ok(services::ApplicationResponse::JsonForRedirection(result))\n+ Ok(services::ApplicationResponse::JsonForRedirection(result))\n+ }\n }\n \n-pub async fn payments_response_for_redirection_flows<'a>(\n- state: &AppState,\n- merchant_account: storage::MerchantAccount,\n- req: api::PaymentsRetrieveRequest,\n- flow_type: CallConnectorAction,\n-) -> RouterResponse {\n- payments_core::(\n- state,\n- merchant_account,\n- PaymentStatus,\n- req,\n- services::api::AuthFlow::Merchant,\n- flow_type,\n- )\n- .await\n+#[derive(Clone, Debug)]\n+pub struct PaymentRedirectCompleteAuthorize;\n+\n+#[async_trait::async_trait]\n+impl PaymentRedirectFlow for PaymentRedirectCompleteAuthorize {\n+ async fn call_payment_flow(\n+ &self,\n+ state: &AppState,\n+ merchant_account: storage::MerchantAccount,\n+ req: PaymentsRedirectResponseData,\n+ connector_action: CallConnectorAction,\n+ ) -> RouterResponse {\n+ let payment_confirm_req = api::PaymentsRequest {\n+ payment_id: Some(req.resource_id.clone()),\n+ merchant_id: req.merchant_id.clone(),\n+ ..Default::default()\n+ };\n+ payments_core::(\n+ state,\n+ merchant_account,\n+ payment_complete_authorize::CompleteAuthorize,\n+ payment_confirm_req,\n+ services::api::AuthFlow::Merchant,\n+ connector_action,\n+ )\n+ .await\n+ }\n+\n+ fn get_payment_action(&self) -> services::PaymentAction {\n+ services::PaymentAction::CompleteAuthorize\n+ }\n+}\n+\n+#[derive(Clone, Debug)]\n+pub struct PaymentRedirectSync;\n+\n+#[async_trait::async_trait]\n+impl PaymentRedirectFlow for PaymentRedirectSync {\n+ async fn call_payment_flow(\n+ &self,\n+ state: &AppState,\n+ merchant_account: storage::MerchantAccount,\n+ req: PaymentsRedirectResponseData,\n+ connector_action: CallConnectorAction,\n+ ) -> RouterResponse {\n+ let payment_sync_req = api::PaymentsRetrieveRequest {\n+ resource_id: req.resource_id,\n+ merchant_id: req.merchant_id,\n+ param: req.param,\n+ force_sync: req.force_sync,\n+ connector: req.connector,\n+ };\n+ payments_core::(\n+ state,\n+ merchant_account,\n+ PaymentStatus,\n+ payment_sync_req,\n+ services::api::AuthFlow::Merchant,\n+ connector_action,\n+ )\n+ .await\n+ }\n+\n+ fn get_payment_action(&self) -> services::PaymentAction {\n+ services::PaymentAction::PSync\n+ }\n }\n \n #[allow(clippy::too_many_arguments)]\n@@ -479,6 +552,7 @@ where\n Ok(payment_data)\n }\n \n+#[derive(Clone, Debug)]\n pub enum CallConnectorAction {\n Trigger,\n Avoid,\n@@ -598,6 +672,7 @@ pub fn should_call_connector(\n storage_enums::IntentStatus::RequiresCapture\n )\n }\n+ \"CompleteAuthorize\" => true,\n \"PaymentSession\" => true,\n _ => false,\n }\ndiff --git a/crates/router/src/core/payments/access_token.rs b/crates/router/src/core/payments/access_token.rs\nindex 38d8320d9d9..0ff7a1baeee 100644\n--- a/crates/router/src/core/payments/access_token.rs\n+++ b/crates/router/src/core/payments/access_token.rs\n@@ -38,6 +38,7 @@ pub fn router_data_type_conversion(\n connector_meta_data: router_data.connector_meta_data,\n description: router_data.description,\n router_return_url: router_data.router_return_url,\n+ complete_authorize_url: router_data.complete_authorize_url,\n payment_id: router_data.payment_id,\n payment_method: router_data.payment_method,\n payment_method_id: router_data.payment_method_id,\ndiff --git a/crates/router/src/core/payments/flows.rs b/crates/router/src/core/payments/flows.rs\nindex f46be7e07c9..75bd16a4f3a 100644\n--- a/crates/router/src/core/payments/flows.rs\n+++ b/crates/router/src/core/payments/flows.rs\n@@ -1,6 +1,7 @@\n pub mod authorize_flow;\n pub mod cancel_flow;\n pub mod capture_flow;\n+pub mod complete_authorize_flow;\n pub mod psync_flow;\n pub mod session_flow;\n pub mod verfiy_flow;\n@@ -8,7 +9,11 @@ pub mod verfiy_flow;\n use async_trait::async_trait;\n \n use crate::{\n- core::{errors::RouterResult, payments},\n+ connector,\n+ core::{\n+ errors::{ConnectorError, CustomResult, RouterResult},\n+ payments,\n+ },\n routes::AppState,\n services,\n types::{self, api, storage},\n@@ -50,3 +55,82 @@ pub trait Feature {\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration;\n }\n+\n+macro_rules! default_imp_for_complete_authorize{\n+ ($($path:ident::$connector:ident),*)=> {\n+ $(\n+ impl api::PaymentsCompleteAuthorize for $path::$connector {}\n+ impl\n+ services::ConnectorIntegration<\n+ api::CompleteAuthorize,\n+ types::CompleteAuthorizeData,\n+ types::PaymentsResponseData,\n+ > for $path::$connector\n+ {}\n+ )*\n+ };\n+}\n+\n+default_imp_for_complete_authorize!(\n+ connector::Aci,\n+ connector::Adyen,\n+ connector::Airwallex,\n+ connector::Applepay,\n+ connector::Authorizedotnet,\n+ connector::Bambora,\n+ connector::Bluesnap,\n+ connector::Braintree,\n+ connector::Checkout,\n+ connector::Cybersource,\n+ connector::Dlocal,\n+ connector::Fiserv,\n+ connector::Globalpay,\n+ connector::Klarna,\n+ connector::Multisafepay,\n+ connector::Payu,\n+ connector::Rapyd,\n+ connector::Shift4,\n+ connector::Stripe,\n+ connector::Trustpay,\n+ connector::Worldline,\n+ connector::Worldpay\n+);\n+\n+macro_rules! default_imp_for_connector_redirect_response{\n+ ($($path:ident::$connector:ident),*)=> {\n+ $(\n+ impl services::ConnectorRedirectResponse for $path::$connector {\n+ fn get_flow_type(\n+ &self,\n+ _query_params: &str,\n+ _json_payload: Option,\n+ _action: services::PaymentAction\n+ ) -> CustomResult {\n+ Ok(payments::CallConnectorAction::Trigger)\n+ }\n+ }\n+ )*\n+ };\n+}\n+\n+default_imp_for_connector_redirect_response!(\n+ connector::Aci,\n+ connector::Adyen,\n+ connector::Airwallex,\n+ connector::Applepay,\n+ connector::Authorizedotnet,\n+ connector::Bambora,\n+ connector::Bluesnap,\n+ connector::Braintree,\n+ connector::Cybersource,\n+ connector::Dlocal,\n+ connector::Fiserv,\n+ connector::Globalpay,\n+ connector::Klarna,\n+ connector::Multisafepay,\n+ connector::Payu,\n+ connector::Rapyd,\n+ connector::Shift4,\n+ connector::Worldline,\n+ connector::Worldpay\n+);\ndiff --git a/crates/router/src/core/payments/flows/authorize_flow.rs b/crates/router/src/core/payments/flows/authorize_flow.rs\nindex 215bcca82ab..a63508ac7a8 100644\n--- a/crates/router/src/core/payments/flows/authorize_flow.rs\n+++ b/crates/router/src/core/payments/flows/authorize_flow.rs\n@@ -101,6 +101,7 @@ impl types::PaymentsAuthorizeRouterData {\n .execute_pretasks(self, state)\n .await\n .map_err(|error| error.to_payment_failed_response())?;\n+ self.decide_authentication_type();\n let resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n@@ -118,6 +119,14 @@ impl types::PaymentsAuthorizeRouterData {\n _ => Ok(self.clone()),\n }\n }\n+\n+ fn decide_authentication_type(&mut self) {\n+ if self.auth_type == storage_models::enums::AuthenticationType::ThreeDs\n+ && !self.request.enrolled_for_3ds\n+ {\n+ self.auth_type = storage_models::enums::AuthenticationType::NoThreeDs\n+ }\n+ }\n }\n \n impl mandate::MandateBehaviour for types::PaymentsAuthorizeData {\ndiff --git a/crates/router/src/core/payments/flows/complete_authorize_flow.rs b/crates/router/src/core/payments/flows/complete_authorize_flow.rs\nnew file mode 100644\nindex 00000000000..0e5f360703b\n--- /dev/null\n+++ b/crates/router/src/core/payments/flows/complete_authorize_flow.rs\n@@ -0,0 +1,104 @@\n+use async_trait::async_trait;\n+\n+use super::{ConstructFlowSpecificData, Feature};\n+use crate::{\n+ core::{\n+ errors::{ConnectorErrorExt, RouterResult},\n+ payments::{self, access_token, transformers, PaymentData},\n+ },\n+ routes::AppState,\n+ services,\n+ types::{self, api, storage},\n+};\n+\n+#[async_trait]\n+impl\n+ ConstructFlowSpecificData<\n+ api::CompleteAuthorize,\n+ types::CompleteAuthorizeData,\n+ types::PaymentsResponseData,\n+ > for PaymentData\n+{\n+ async fn construct_router_data<'a>(\n+ &self,\n+ state: &AppState,\n+ connector_id: &str,\n+ merchant_account: &storage::MerchantAccount,\n+ ) -> RouterResult<\n+ types::RouterData<\n+ api::CompleteAuthorize,\n+ types::CompleteAuthorizeData,\n+ types::PaymentsResponseData,\n+ >,\n+ > {\n+ transformers::construct_payment_router_data::<\n+ api::CompleteAuthorize,\n+ types::CompleteAuthorizeData,\n+ >(state, self.clone(), connector_id, merchant_account)\n+ .await\n+ }\n+}\n+\n+#[async_trait]\n+impl Feature\n+ for types::RouterData<\n+ api::CompleteAuthorize,\n+ types::CompleteAuthorizeData,\n+ types::PaymentsResponseData,\n+ >\n+{\n+ async fn decide_flows<'a>(\n+ self,\n+ state: &AppState,\n+ connector: &api::ConnectorData,\n+ customer: &Option,\n+ call_connector_action: payments::CallConnectorAction,\n+ _merchant_account: &storage::MerchantAccount,\n+ ) -> RouterResult {\n+ self.decide_flow(\n+ state,\n+ connector,\n+ customer,\n+ Some(true),\n+ call_connector_action,\n+ )\n+ .await\n+ }\n+\n+ async fn add_access_token<'a>(\n+ &self,\n+ state: &AppState,\n+ connector: &api::ConnectorData,\n+ merchant_account: &storage::MerchantAccount,\n+ ) -> RouterResult {\n+ access_token::add_access_token(state, connector, merchant_account, self).await\n+ }\n+}\n+\n+impl types::PaymentsCompleteAuthorizeRouterData {\n+ pub async fn decide_flow<'a, 'b>(\n+ &'b self,\n+ state: &'a AppState,\n+ connector: &api::ConnectorData,\n+ _maybe_customer: &Option,\n+ _confirm: Option,\n+ call_connector_action: payments::CallConnectorAction,\n+ ) -> RouterResult {\n+ let connector_integration: services::BoxedConnectorIntegration<\n+ '_,\n+ api::CompleteAuthorize,\n+ types::CompleteAuthorizeData,\n+ types::PaymentsResponseData,\n+ > = connector.connector.get_connector_integration();\n+ let resp = services::execute_connector_processing_step(\n+ state,\n+ connector_integration,\n+ self,\n+ call_connector_action,\n+ )\n+ .await\n+ .map_err(|error| error.to_payment_failed_response())?;\n+\n+ Ok(resp)\n+ }\n+}\ndiff --git a/crates/router/src/core/payments/helpers.rs b/crates/router/src/core/payments/helpers.rs\nindex e46eb0781d4..c1d29377ae9 100644\n--- a/crates/router/src/core/payments/helpers.rs\n+++ b/crates/router/src/core/payments/helpers.rs\n@@ -351,6 +351,17 @@ pub fn create_redirect_url(\n server.base_url, payment_attempt.payment_id, payment_attempt.merchant_id, connector_name\n )\n }\n+pub fn create_complete_authorize_url(\n+ server: &Server,\n+ payment_attempt: &storage::PaymentAttempt,\n+ connector_name: &String,\n+) -> String {\n+ format!(\n+ \"{}/payments/{}/{}/complete/{}\",\n+ server.base_url, payment_attempt.payment_id, payment_attempt.merchant_id, connector_name\n+ )\n+}\n+\n fn validate_recurring_mandate(req: api::MandateValidationFields) -> RouterResult<()> {\n req.mandate_id.check_value_present(\"mandate_id\")?;\n \ndiff --git a/crates/router/src/core/payments/operations.rs b/crates/router/src/core/payments/operations.rs\nindex 688d08ba162..50e7648bb7b 100644\n--- a/crates/router/src/core/payments/operations.rs\n+++ b/crates/router/src/core/payments/operations.rs\n@@ -1,5 +1,6 @@\n pub mod payment_cancel;\n pub mod payment_capture;\n+pub mod payment_complete_authorize;\n pub mod payment_confirm;\n pub mod payment_create;\n pub mod payment_method_validate;\ndiff --git a/crates/router/src/core/payments/operations/payment_complete_authorize.rs b/crates/router/src/core/payments/operations/payment_complete_authorize.rs\nnew file mode 100644\nindex 00000000000..23de0ebdd40\n--- /dev/null\n+++ b/crates/router/src/core/payments/operations/payment_complete_authorize.rs\n@@ -0,0 +1,342 @@\n+use std::marker::PhantomData;\n+\n+use async_trait::async_trait;\n+use error_stack::ResultExt;\n+use router_derive::PaymentOperation;\n+use router_env::{instrument, tracing};\n+\n+use super::{BoxedOperation, Domain, GetTracker, Operation, UpdateTracker, ValidateRequest};\n+use crate::{\n+ core::{\n+ errors::{self, CustomResult, RouterResult, StorageErrorExt},\n+ payments::{helpers, operations, CustomerDetails, PaymentAddress, PaymentData},\n+ utils as core_utils,\n+ },\n+ db::StorageInterface,\n+ routes::AppState,\n+ types::{\n+ self,\n+ api::{self, PaymentIdTypeExt},\n+ storage::{self, enums as storage_enums},\n+ transformers::ForeignInto,\n+ },\n+ utils::{self, OptionExt},\n+};\n+\n+#[derive(Debug, Clone, Copy, PaymentOperation)]\n+#[operation(ops = \"all\", flow = \"authorize\")]\n+pub struct CompleteAuthorize;\n+\n+#[async_trait]\n+impl GetTracker, api::PaymentsRequest> for CompleteAuthorize {\n+ #[instrument(skip_all)]\n+ async fn get_trackers<'a>(\n+ &'a self,\n+ state: &'a AppState,\n+ payment_id: &api::PaymentIdType,\n+ request: &api::PaymentsRequest,\n+ mandate_type: Option,\n+ merchant_account: &storage::MerchantAccount,\n+ ) -> RouterResult<(\n+ BoxedOperation<'a, F, api::PaymentsRequest>,\n+ PaymentData,\n+ Option,\n+ )> {\n+ let db = &*state.store;\n+ let merchant_id = &merchant_account.merchant_id;\n+ let storage_scheme = merchant_account.storage_scheme;\n+ let (mut payment_intent, mut payment_attempt, currency, amount, connector_response);\n+\n+ let payment_id = payment_id\n+ .get_payment_intent_id()\n+ .change_context(errors::ApiErrorResponse::PaymentNotFound)?;\n+\n+ payment_intent = db\n+ .find_payment_intent_by_payment_id_merchant_id(&payment_id, merchant_id, storage_scheme)\n+ .await\n+ .map_err(|error| {\n+ error.to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)\n+ })?;\n+ payment_intent.setup_future_usage = request\n+ .setup_future_usage\n+ .map(ForeignInto::foreign_into)\n+ .or(payment_intent.setup_future_usage);\n+\n+ helpers::validate_payment_status_against_not_allowed_statuses(\n+ &payment_intent.status,\n+ &[\n+ storage_enums::IntentStatus::Failed,\n+ storage_enums::IntentStatus::Succeeded,\n+ ],\n+ \"confirm\",\n+ )?;\n+\n+ let (token, payment_method, setup_mandate) = helpers::get_token_pm_type_mandate_details(\n+ state,\n+ request,\n+ mandate_type.clone(),\n+ merchant_account,\n+ )\n+ .await?;\n+\n+ helpers::authenticate_client_secret(\n+ request.client_secret.as_ref(),\n+ payment_intent.client_secret.as_ref(),\n+ )?;\n+\n+ let browser_info = request\n+ .browser_info\n+ .clone()\n+ .map(|x| utils::Encode::::encode_to_value(&x))\n+ .transpose()\n+ .change_context(errors::ApiErrorResponse::InvalidDataValue {\n+ field_name: \"browser_info\",\n+ })?;\n+\n+ payment_attempt = db\n+ .find_payment_attempt_by_payment_id_merchant_id(\n+ &payment_id,\n+ merchant_id,\n+ storage_scheme,\n+ )\n+ .await\n+ .map_err(|error| {\n+ error.to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)\n+ })?;\n+\n+ let token = token.or_else(|| payment_attempt.payment_token.clone());\n+\n+ helpers::validate_pm_or_token_given(\n+ &request.payment_method,\n+ &request.payment_method_data,\n+ &request.payment_method_type,\n+ &mandate_type,\n+ &token,\n+ )?;\n+\n+ payment_attempt.payment_method = payment_method.or(payment_attempt.payment_method);\n+ payment_attempt.browser_info = browser_info;\n+ payment_attempt.payment_method_type = request\n+ .payment_method_type\n+ .map(|pmt| pmt.foreign_into())\n+ .or(payment_attempt.payment_method_type);\n+ payment_attempt.payment_experience = request\n+ .payment_experience\n+ .map(|experience| experience.foreign_into());\n+ currency = payment_attempt.currency.get_required_value(\"currency\")?;\n+ amount = payment_attempt.amount.into();\n+\n+ helpers::validate_customer_id_mandatory_cases(\n+ request.shipping.is_some(),\n+ request.billing.is_some(),\n+ request.setup_future_usage.is_some(),\n+ &payment_intent\n+ .customer_id\n+ .clone()\n+ .or_else(|| request.customer_id.clone()),\n+ )?;\n+\n+ let shipping_address = helpers::get_address_for_payment_request(\n+ db,\n+ request.shipping.as_ref(),\n+ payment_intent.shipping_address_id.as_deref(),\n+ merchant_id,\n+ &payment_intent.customer_id,\n+ )\n+ .await?;\n+ let billing_address = helpers::get_address_for_payment_request(\n+ db,\n+ request.billing.as_ref(),\n+ payment_intent.billing_address_id.as_deref(),\n+ merchant_id,\n+ &payment_intent.customer_id,\n+ )\n+ .await?;\n+\n+ connector_response = db\n+ .find_connector_response_by_payment_id_merchant_id_attempt_id(\n+ &payment_attempt.payment_id,\n+ &payment_attempt.merchant_id,\n+ &payment_attempt.attempt_id,\n+ storage_scheme,\n+ )\n+ .await\n+ .map_err(|error| {\n+ error.to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)\n+ })?;\n+\n+ payment_intent.shipping_address_id = shipping_address.clone().map(|i| i.address_id);\n+ payment_intent.billing_address_id = billing_address.clone().map(|i| i.address_id);\n+ payment_intent.return_url = request.return_url.as_ref().map(|a| a.to_string());\n+\n+ Ok((\n+ Box::new(self),\n+ PaymentData {\n+ flow: PhantomData,\n+ payment_intent,\n+ payment_attempt,\n+ currency,\n+ connector_response,\n+ amount,\n+ email: request.email.clone(),\n+ mandate_id: None,\n+ setup_mandate,\n+ token,\n+ address: PaymentAddress {\n+ shipping: shipping_address.as_ref().map(|a| a.foreign_into()),\n+ billing: billing_address.as_ref().map(|a| a.foreign_into()),\n+ },\n+ confirm: request.confirm,\n+ payment_method_data: request.payment_method_data.clone(),\n+ force_sync: None,\n+ refunds: vec![],\n+ sessions_token: vec![],\n+ card_cvc: request.card_cvc.clone(),\n+ },\n+ Some(CustomerDetails {\n+ customer_id: request.customer_id.clone(),\n+ name: request.name.clone(),\n+ email: request.email.clone(),\n+ phone: request.phone.clone(),\n+ phone_country_code: request.phone_country_code.clone(),\n+ }),\n+ ))\n+ }\n+}\n+\n+#[async_trait]\n+impl Domain for CompleteAuthorize {\n+ #[instrument(skip_all)]\n+ async fn get_or_create_customer_details<'a>(\n+ &'a self,\n+ db: &dyn StorageInterface,\n+ payment_data: &mut PaymentData,\n+ request: Option,\n+ merchant_id: &str,\n+ ) -> CustomResult<\n+ (\n+ BoxedOperation<'a, F, api::PaymentsRequest>,\n+ Option,\n+ ),\n+ errors::StorageError,\n+ > {\n+ helpers::create_customer_if_not_exist(\n+ Box::new(self),\n+ db,\n+ payment_data,\n+ request,\n+ merchant_id,\n+ )\n+ .await\n+ }\n+\n+ #[instrument(skip_all)]\n+ async fn make_pm_data<'a>(\n+ &'a self,\n+ state: &'a AppState,\n+ payment_data: &mut PaymentData,\n+ _storage_scheme: storage_enums::MerchantStorageScheme,\n+ ) -> RouterResult<(\n+ BoxedOperation<'a, F, api::PaymentsRequest>,\n+ Option,\n+ )> {\n+ let (op, payment_method_data) =\n+ helpers::make_pm_data(Box::new(self), state, payment_data).await?;\n+\n+ utils::when(payment_method_data.is_none(), || {\n+ Err(errors::ApiErrorResponse::PaymentMethodNotFound)\n+ })?;\n+\n+ Ok((op, payment_method_data))\n+ }\n+\n+ #[instrument(skip_all)]\n+ async fn add_task_to_process_tracker<'a>(\n+ &'a self,\n+ _state: &'a AppState,\n+ _payment_attempt: &storage::PaymentAttempt,\n+ ) -> CustomResult<(), errors::ApiErrorResponse> {\n+ Ok(())\n+ }\n+\n+ async fn get_connector<'a>(\n+ &'a self,\n+ _merchant_account: &storage::MerchantAccount,\n+ state: &AppState,\n+ request: &api::PaymentsRequest,\n+ previously_used_connector: Option<&String>,\n+ ) -> CustomResult {\n+ // Use a new connector in the confirm call or use the same one which was passed when\n+ // creating the payment or if none is passed then use the routing algorithm\n+ let request_connector = request\n+ .connector\n+ .as_ref()\n+ .and_then(|connector| connector.first().map(|c| c.to_string()));\n+ helpers::get_connector_default(\n+ state,\n+ request_connector.as_ref().or(previously_used_connector),\n+ )\n+ .await\n+ }\n+}\n+\n+#[async_trait]\n+impl UpdateTracker, api::PaymentsRequest> for CompleteAuthorize {\n+ #[instrument(skip_all)]\n+ async fn update_trackers<'b>(\n+ &'b self,\n+ _db: &dyn StorageInterface,\n+ _payment_id: &api::PaymentIdType,\n+ payment_data: PaymentData,\n+ _customer: Option,\n+ _storage_scheme: storage_enums::MerchantStorageScheme,\n+ ) -> RouterResult<(BoxedOperation<'b, F, api::PaymentsRequest>, PaymentData)>\n+ where\n+ F: 'b + Send,\n+ {\n+ Ok((Box::new(self), payment_data))\n+ }\n+}\n+\n+impl ValidateRequest for CompleteAuthorize {\n+ #[instrument(skip_all)]\n+ fn validate_request<'a, 'b>(\n+ &'b self,\n+ request: &api::PaymentsRequest,\n+ merchant_account: &'a storage::MerchantAccount,\n+ ) -> RouterResult<(\n+ BoxedOperation<'b, F, api::PaymentsRequest>,\n+ operations::ValidateResult<'a>,\n+ )> {\n+ let given_payment_id = match &request.payment_id {\n+ Some(id_type) => Some(\n+ id_type\n+ .get_payment_intent_id()\n+ .change_context(errors::ApiErrorResponse::PaymentNotFound)?,\n+ ),\n+ None => None,\n+ };\n+\n+ let request_merchant_id = request.merchant_id.as_deref();\n+ helpers::validate_merchant_id(&merchant_account.merchant_id, request_merchant_id)\n+ .change_context(errors::ApiErrorResponse::InvalidDataFormat {\n+ field_name: \"merchant_id\".to_string(),\n+ expected_format: \"merchant_id from merchant account\".to_string(),\n+ })?;\n+\n+ helpers::validate_payment_method_fields_present(request)?;\n+\n+ let mandate_type = helpers::validate_mandate(request)?;\n+ let payment_id = core_utils::get_or_generate_id(\"payment_id\", &given_payment_id, \"pay\")?;\n+\n+ Ok((\n+ Box::new(self),\n+ operations::ValidateResult {\n+ merchant_id: &merchant_account.merchant_id,\n+ payment_id: api::PaymentIdType::PaymentIntentId(payment_id),\n+ mandate_type,\n+ storage_scheme: merchant_account.storage_scheme,\n+ },\n+ ))\n+ }\n+}\ndiff --git a/crates/router/src/core/payments/operations/payment_response.rs b/crates/router/src/core/payments/operations/payment_response.rs\nindex 43f08b93917..1455c03883a 100644\n--- a/crates/router/src/core/payments/operations/payment_response.rs\n+++ b/crates/router/src/core/payments/operations/payment_response.rs\n@@ -22,7 +22,7 @@ use crate::{\n #[derive(Debug, Clone, Copy, router_derive::PaymentOperation)]\n #[operation(\n ops = \"post_tracker\",\n- flow = \"syncdata,authorizedata,canceldata,capturedata,verifydata,sessiondata\"\n+ flow = \"syncdata,authorizedata,canceldata,capturedata,completeauthorizedata,verifydata,sessiondata\"\n )]\n pub struct PaymentResponse;\n \n@@ -262,6 +262,26 @@ impl PostUpdateTracker, types::VerifyRequestData> fo\n }\n }\n \n+#[async_trait]\n+impl PostUpdateTracker, types::CompleteAuthorizeData>\n+ for PaymentResponse\n+{\n+ async fn update_tracker<'b>(\n+ &'b self,\n+ db: &dyn StorageInterface,\n+ payment_id: &api::PaymentIdType,\n+ payment_data: PaymentData,\n+ response: types::RouterData,\n+ storage_scheme: enums::MerchantStorageScheme,\n+ ) -> RouterResult>\n+ where\n+ F: 'b + Send,\n+ {\n+ payment_response_update_tracker(db, payment_id, payment_data, response, storage_scheme)\n+ .await\n+ }\n+}\n+\n async fn payment_response_update_tracker(\n db: &dyn StorageInterface,\n _payment_id: &api::PaymentIdType,\ndiff --git a/crates/router/src/core/payments/transformers.rs b/crates/router/src/core/payments/transformers.rs\nindex 9c0d3833cb8..1889ecabe89 100644\n--- a/crates/router/src/core/payments/transformers.rs\n+++ b/crates/router/src/core/payments/transformers.rs\n@@ -74,6 +74,11 @@ where\n &payment_data.payment_attempt,\n &merchant_connector_account.connector_name,\n ));\n+ let complete_authorize_url = Some(helpers::create_complete_authorize_url(\n+ &state.conf.server,\n+ &payment_data.payment_attempt,\n+ &merchant_connector_account.connector_name,\n+ ));\n \n router_data = types::RouterData {\n flow: PhantomData,\n@@ -87,6 +92,7 @@ where\n description: payment_data.payment_intent.description.clone(),\n return_url: payment_data.payment_intent.return_url.clone(),\n router_return_url,\n+ complete_authorize_url,\n payment_method_id: payment_data.payment_attempt.payment_method_id.clone(),\n address: payment_data.address.clone(),\n auth_type: payment_data\n@@ -440,6 +446,9 @@ impl TryFrom> for types::PaymentsAuthorizeData {\n email: payment_data.email,\n payment_experience: payment_data.payment_attempt.payment_experience,\n order_details,\n+ session_token: None,\n+ enrolled_for_3ds: false,\n+ related_transaction_id: None,\n payment_method_type: payment_data.payment_attempt.payment_method_type,\n })\n }\n@@ -458,6 +467,7 @@ impl TryFrom> for types::PaymentsSyncData {\n },\n encoded_data: payment_data.connector_response.encoded_data,\n capture_method: payment_data.payment_attempt.capture_method,\n+ connector_meta: payment_data.payment_attempt.connector_metadata,\n })\n }\n }\n@@ -547,3 +557,34 @@ impl TryFrom> for types::VerifyRequestData {\n })\n }\n }\n+\n+impl TryFrom> for types::CompleteAuthorizeData {\n+ type Error = error_stack::Report;\n+\n+ fn try_from(payment_data: PaymentData) -> Result {\n+ let browser_info: Option = payment_data\n+ .payment_attempt\n+ .browser_info\n+ .map(|b| b.parse_value(\"BrowserInformation\"))\n+ .transpose()\n+ .change_context(errors::ApiErrorResponse::InvalidDataValue {\n+ field_name: \"browser_info\",\n+ })?;\n+ Ok(Self {\n+ setup_future_usage: payment_data.payment_intent.setup_future_usage,\n+ mandate_id: payment_data.mandate_id.clone(),\n+ off_session: payment_data.mandate_id.as_ref().map(|_| true),\n+ setup_mandate_details: payment_data.setup_mandate.clone(),\n+ confirm: payment_data.payment_attempt.confirm,\n+ statement_descriptor_suffix: payment_data.payment_intent.statement_descriptor_suffix,\n+ capture_method: payment_data.payment_attempt.capture_method,\n+ amount: payment_data.amount.into(),\n+ currency: payment_data.currency,\n+ browser_info,\n+ email: payment_data.email,\n+ payment_method_data: payment_data.payment_method_data,\n+ connector_transaction_id: payment_data.connector_response.connector_transaction_id,\n+ connector_meta: payment_data.payment_attempt.connector_metadata,\n+ })\n+ }\n+}\ndiff --git a/crates/router/src/core/utils.rs b/crates/router/src/core/utils.rs\nindex ff5b59e3f97..f82b19bcc40 100644\n--- a/crates/router/src/core/utils.rs\n+++ b/crates/router/src/core/utils.rs\n@@ -60,6 +60,7 @@ pub async fn construct_refund_router_data<'a, F>(\n description: None,\n return_url: payment_intent.return_url.clone(),\n router_return_url: None,\n+ complete_authorize_url: None,\n payment_method_id: payment_attempt.payment_method_id.clone(),\n // Does refund need shipping/billing address ?\n address: PaymentAddress::default(),\ndiff --git a/crates/router/src/routes/app.rs b/crates/router/src/routes/app.rs\nindex 3adc51dad25..7f5c08133cd 100644\n--- a/crates/router/src/routes/app.rs\n+++ b/crates/router/src/routes/app.rs\n@@ -111,6 +111,11 @@ impl Payments {\n .service(\n web::resource(\"/{payment_id}/{merchant_id}/response/{connector}\")\n .route(web::get().to(payments_redirect_response)),\n+ )\n+ .service(\n+ web::resource(\"/{payment_id}/{merchant_id}/complete/{connector}\")\n+ // .route(web::get().to(payments_redirect_response))\n+ .route(web::post().to(payments_complete_authorize)),\n );\n }\n route\ndiff --git a/crates/router/src/routes/payments.rs b/crates/router/src/routes/payments.rs\nindex 88b8a754d62..ccfc18692ad 100644\n--- a/crates/router/src/routes/payments.rs\n+++ b/crates/router/src/routes/payments.rs\n@@ -4,7 +4,10 @@ use router_env::{instrument, tracing, Flow};\n \n use crate::{\n self as app,\n- core::{errors::http_not_implemented, payments},\n+ core::{\n+ errors::http_not_implemented,\n+ payments::{self, PaymentRedirectFlow},\n+ },\n services::{api, authentication as auth},\n types::api::{self as api_types, enums as api_enums, payments as payment_types},\n };\n@@ -405,11 +408,46 @@ pub async fn payments_redirect_response(\n let (payment_id, merchant_id, connector) = path.into_inner();\n let param_string = req.query_string();\n \n- let payload = payment_types::PaymentsRetrieveRequest {\n+ let payload = payments::PaymentsRedirectResponseData {\n resource_id: payment_types::PaymentIdType::PaymentIntentId(payment_id),\n merchant_id: Some(merchant_id.clone()),\n force_sync: true,\n+ json_payload: None,\n+ param: Some(param_string.to_string()),\n+ connector: Some(connector),\n+ };\n+ api::server_wrap(\n+ state.get_ref(),\n+ &req,\n+ payload,\n+ |state, merchant_account, req| {\n+ payments::PaymentRedirectSync {}.handle_payments_redirect_response(\n+ state,\n+ merchant_account,\n+ req,\n+ )\n+ },\n+ &auth::MerchantIdAuth(merchant_id),\n+ )\n+ .await\n+}\n+\n+#[instrument(skip_all)]\n+pub async fn payments_complete_authorize(\n+ state: web::Data,\n+ req: actix_web::HttpRequest,\n+ json_payload: web::Form,\n+ path: web::Path<(String, String, String)>,\n+) -> impl Responder {\n+ let (payment_id, merchant_id, connector) = path.into_inner();\n+ let param_string = req.query_string();\n+\n+ let payload = payments::PaymentsRedirectResponseData {\n+ resource_id: payment_types::PaymentIdType::PaymentIntentId(payment_id),\n+ merchant_id: Some(merchant_id.clone()),\n param: Some(param_string.to_string()),\n+ json_payload: Some(json_payload.0),\n+ force_sync: false,\n connector: Some(connector),\n };\n api::server_wrap(\n@@ -417,7 +455,7 @@ pub async fn payments_redirect_response(\n &req,\n payload,\n |state, merchant_account, req| {\n- payments::handle_payments_redirect_response::(\n+ payments::PaymentRedirectCompleteAuthorize {}.handle_payments_redirect_response(\n state,\n merchant_account,\n req,\ndiff --git a/crates/router/src/services/api.rs b/crates/router/src/services/api.rs\nindex 5c20ed3aad3..4a861d5e928 100644\n--- a/crates/router/src/services/api.rs\n+++ b/crates/router/src/services/api.rs\n@@ -369,6 +369,12 @@ pub enum ApplicationResponse {\n Form(RedirectForm),\n }\n \n+#[derive(Debug, Eq, PartialEq)]\n+pub enum PaymentAction {\n+ PSync,\n+ CompleteAuthorize,\n+}\n+\n #[derive(Debug, Eq, PartialEq, Serialize)]\n pub struct ApplicationRedirectResponse {\n pub url: String,\n@@ -574,6 +580,8 @@ pub trait ConnectorRedirectResponse {\n fn get_flow_type(\n &self,\n _query_params: &str,\n+ _json_payload: Option,\n+ _action: PaymentAction,\n ) -> CustomResult {\n Ok(payments::CallConnectorAction::Avoid)\n }\ndiff --git a/crates/router/src/types.rs b/crates/router/src/types.rs\nindex f98fe0666ff..cdaf00ad714 100644\n--- a/crates/router/src/types.rs\n+++ b/crates/router/src/types.rs\n@@ -24,6 +24,10 @@ pub type PaymentsAuthorizeRouterData =\n RouterData;\n pub type PaymentsAuthorizeSessionTokenRouterData =\n RouterData;\n+pub type PaymentsCompleteAuthorizeRouterData =\n+ RouterData;\n+pub type PaymentsInitRouterData =\n+ RouterData;\n pub type PaymentsSyncRouterData = RouterData;\n pub type PaymentsCaptureRouterData =\n RouterData;\n@@ -53,11 +57,21 @@ pub type RefundsResponseRouterData =\n \n pub type PaymentsAuthorizeType =\n dyn services::ConnectorIntegration;\n+pub type PaymentsComeplteAuthorizeType = dyn services::ConnectorIntegration<\n+ api::CompleteAuthorize,\n+ CompleteAuthorizeData,\n+ PaymentsResponseData,\n+>;\n pub type PaymentsPreAuthorizeType = dyn services::ConnectorIntegration<\n api::AuthorizeSessionToken,\n AuthorizeSessionTokenData,\n PaymentsResponseData,\n >;\n+pub type PaymentsInitType = dyn services::ConnectorIntegration<\n+ api::InitPayment,\n+ PaymentsAuthorizeData,\n+ PaymentsResponseData,\n+>;\n pub type PaymentsSyncType =\n dyn services::ConnectorIntegration;\n pub type PaymentsCaptureType =\n@@ -90,6 +104,7 @@ pub struct RouterData {\n pub description: Option,\n pub return_url: Option,\n pub router_return_url: Option,\n+ pub complete_authorize_url: Option,\n pub address: PaymentAddress,\n pub auth_type: storage_enums::AuthenticationType,\n pub connector_meta_data: Option,\n@@ -125,6 +140,9 @@ pub struct PaymentsAuthorizeData {\n pub setup_mandate_details: Option,\n pub browser_info: Option,\n pub order_details: Option,\n+ pub session_token: Option,\n+ pub enrolled_for_3ds: bool,\n+ pub related_transaction_id: Option,\n pub payment_experience: Option,\n pub payment_method_type: Option,\n }\n@@ -146,11 +164,31 @@ pub struct AuthorizeSessionTokenData {\n }\n \n #[derive(Debug, Clone)]\n+pub struct CompleteAuthorizeData {\n+ pub payment_method_data: Option,\n+ pub amount: i64,\n+ pub email: Option>,\n+ pub currency: storage_enums::Currency,\n+ pub confirm: bool,\n+ pub statement_descriptor_suffix: Option,\n+ pub capture_method: Option,\n+ // Mandates\n+ pub setup_future_usage: Option,\n+ pub mandate_id: Option,\n+ pub off_session: Option