refactor(connector): [WorldPay] migrate from modular to standard payment APIs

crates/connector_configs/toml/development.toml

@@ -3416,6 +3416,12 @@ key1="Password"
 api_secret="Merchant Identifier"
 [worldpay.connector_webhook_details]
 merchant_secret="Source verification key"
+[worldpay.metadata.merchant_name]
+name="merchant_name"
+label="Name of the merchant to de displayed during 3DS challenge"
+placeholder="Enter Name of the merchant"
+required=true
+type="Text"
 
 [[worldpay.metadata.apple_pay]]
 name="certificate"

crates/connector_configs/toml/production.toml

@@ -2473,6 +2473,12 @@ merchant_secret="Source verification key"
 api_key="Username"
 key1="Password"
 api_secret="Merchant Identifier"
+[worldpay.metadata.merchant_name]
+name="merchant_name"
+label="Name of the merchant to de displayed during 3DS challenge"
+placeholder="Enter Name of the merchant"
+required=true
+type="Text"
 
 [[worldpay.metadata.apple_pay]]
 name="certificate"

crates/connector_configs/toml/sandbox.toml

@@ -3406,6 +3406,12 @@ key1="Password"
 api_secret="Merchant Identifier"
 [worldpay.connector_webhook_details]
 merchant_secret="Source verification key"
+[worldpay.metadata.merchant_name]
+name="merchant_name"
+label="Name of the merchant to de displayed during 3DS challenge"
+placeholder="Enter Name of the merchant"
+required=true
+type="Text"
 
 [[worldpay.metadata.apple_pay]]
 name="certificate"

crates/router/Cargo.toml

@@ -115,6 +115,7 @@ tracing-futures = { version = "0.2.5", features = ["tokio"] }
 unicode-segmentation = "1.11.0"
 unidecode = "0.3.0"
 url = { version = "2.5.0", features = ["serde"] }
+urlencoding = "2.1.3"
 utoipa = { version = "4.2.0", features = ["preserve_order", "preserve_path_order", "time"] }
 uuid = { version = "1.8.0", features = ["v4"] }
 validator = "0.17.0"

crates/router/src/connector/utils.rs

@@ -725,6 +725,7 @@ impl PaymentsPreProcessingData for types::PaymentsPreProcessingData {
 pub trait PaymentsCaptureRequestData {
     fn is_multiple_capture(&self) -> bool;
     fn get_browser_info(&self) -> Result<BrowserInformation, Error>;
+    fn get_capture_method(&self) -> Option<enums::CaptureMethod>;
 }
 
 impl PaymentsCaptureRequestData for types::PaymentsCaptureData {
@@ -736,6 +737,9 @@ impl PaymentsCaptureRequestData for types::PaymentsCaptureData {
             .clone()
             .ok_or_else(missing_field_err("browser_info"))
     }
+    fn get_capture_method(&self) -> Option<enums::CaptureMethod> {
+        self.capture_method.to_owned()
+    }
 }
 
 pub trait RevokeMandateRequestData {

crates/router/src/connector/worldpay.rs

@@ -16,6 +16,7 @@ use self::{requests::*, response::*};
 use super::utils::{self as connector_utils, RefundsRequestData};
 use crate::{
     configs::settings,
+    consts,
     core::errors::{self, CustomResult},
     events::connector_api_logs::ConnectorEvent,
     headers,
@@ -64,6 +65,7 @@ where
                 headers::CONTENT_TYPE.to_string(),
                 self.get_content_type().to_string().into(),
             ),
+            (headers::X_WP_API_VERSION.to_string(), "2024-06-01".into()),
         ];
         let mut api_key = self.get_auth_header(&req.connector_auth_type)?;
         headers.append(&mut api_key);
@@ -81,7 +83,7 @@ impl ConnectorCommon for Worldpay {
     }
 
     fn common_get_content_type(&self) -> &'static str {
-        "application/vnd.worldpay.payments-v7+json"
+        "application/json"
     }
 
     fn base_url<'a>(&self, connectors: &'a settings::Connectors) -> &'a str {
@@ -205,8 +207,9 @@ impl ConnectorIntegration<api::Void, types::PaymentsCancelData, types::PaymentsR
     ) -> CustomResult<String, errors::ConnectorError> {
         let connector_payment_id = req.request.connector_transaction_id.clone();
         Ok(format!(
-            "{}payments/authorizations/cancellations/{connector_payment_id}",
+            "{}api/payments/{}/cancellations",
             self.base_url(connectors),
+            urlencoding::encode(&connector_payment_id),
         ))
     }
 
@@ -244,15 +247,24 @@ impl ConnectorIntegration<api::Void, types::PaymentsCancelData, types::PaymentsR
                     .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
                 event_builder.map(|i| i.set_response_body(&response));
                 router_env::logger::info!(connector_response=?response);
+                let optional_correlation_id = res.headers.and_then(|headers| {
+                    headers
+                        .get(consts::WP_CORRELATION_ID)
+                        .and_then(|header_value| header_value.to_str().ok())
+                        .map(|id| id.to_string())
+                });
                 Ok(types::PaymentsCancelRouterData {
-                    status: enums::AttemptStatus::Voided,
+                    status: enums::AttemptStatus::from(response.outcome.clone()),
                     response: Ok(types::PaymentsResponseData::TransactionResponse {
-                        resource_id: types::ResponseId::foreign_try_from(response.links)?,
+                        resource_id: types::ResponseId::foreign_try_from((
+                            response,
+                            Some(data.request.connector_transaction_id.clone()),
+                        ))?,
                         redirection_data: None,
                         mandate_reference: None,
                         connector_metadata: None,
                         network_txn_id: None,
-                        connector_response_reference_id: None,
+                        connector_response_reference_id: optional_correlation_id,
                         incremental_authorization_allowed: None,
                         charge_id: None,
                     }),
@@ -306,9 +318,9 @@ impl ConnectorIntegration<api::PSync, types::PaymentsSyncData, types::PaymentsRe
             .get_connector_transaction_id()
             .change_context(errors::ConnectorError::MissingConnectorTransactionID)?;
         Ok(format!(
-            "{}payments/events/{}",
+            "{}api/payments/{}",
             self.base_url(connectors),
-            connector_payment_id
+            urlencoding::encode(&connector_payment_id),
         ))
     }
 
@@ -349,6 +361,12 @@ impl ConnectorIntegration<api::PSync, types::PaymentsSyncData, types::PaymentsRe
         event_builder.map(|i| i.set_response_body(&response));
         router_env::logger::info!(connector_response=?response);
 
+        let optional_correlation_id = res.headers.and_then(|headers| {
+            headers
+                .get(consts::WP_CORRELATION_ID)
+                .and_then(|header_value| header_value.to_str().ok())
+                .map(|id| id.to_string())
+        });
         let attempt_status = data.status;
         let worldpay_status = response.last_event;
         let status = match (attempt_status, worldpay_status.clone()) {
@@ -371,7 +389,7 @@ impl ConnectorIntegration<api::PSync, types::PaymentsSyncData, types::PaymentsRe
                 mandate_reference: None,
                 connector_metadata: None,
                 network_txn_id: None,
-                connector_response_reference_id: None,
+                connector_response_reference_id: optional_correlation_id,
                 incremental_authorization_allowed: None,
                 charge_id: None,
             }),
@@ -403,9 +421,9 @@ impl ConnectorIntegration<api::Capture, types::PaymentsCaptureData, types::Payme
     ) -> CustomResult<String, errors::ConnectorError> {
         let connector_payment_id = req.request.connector_transaction_id.clone();
         Ok(format!(
-            "{}payments/settlements/partials/{}",
+            "{}api/payments/{}/partialSettlements",
             self.base_url(connectors),
-            connector_payment_id
+            urlencoding::encode(&connector_payment_id),
         ))
     }
 
@@ -457,15 +475,24 @@ impl ConnectorIntegration<api::Capture, types::PaymentsCaptureData, types::Payme
                     .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
                 event_builder.map(|i| i.set_response_body(&response));
                 router_env::logger::info!(connector_response=?response);
+                let optional_correlation_id = res.headers.and_then(|headers| {
+                    headers
+                        .get(consts::WP_CORRELATION_ID)
+                        .and_then(|header_value| header_value.to_str().ok())
+                        .map(|id| id.to_string())
+                });
                 Ok(types::PaymentsCaptureRouterData {
                     status: enums::AttemptStatus::Pending,
                     response: Ok(types::PaymentsResponseData::TransactionResponse {
-                        resource_id: types::ResponseId::foreign_try_from(response.links)?,
+                        resource_id: types::ResponseId::foreign_try_from((
+                            response,
+                            Some(data.request.connector_transaction_id.clone()),
+                        ))?,
                         redirection_data: None,
                         mandate_reference: None,
                         connector_metadata: None,
                         network_txn_id: None,
-                        connector_response_reference_id: None,
+                        connector_response_reference_id: optional_correlation_id,
                         incremental_authorization_allowed: None,
                         charge_id: None,
                     }),
@@ -514,10 +541,7 @@ impl ConnectorIntegration<api::Authorize, types::PaymentsAuthorizeData, types::P
         _req: &types::PaymentsAuthorizeRouterData,
         connectors: &settings::Connectors,
     ) -> CustomResult<String, errors::ConnectorError> {
-        Ok(format!(
-            "{}cardPayments/customerInitiatedTransactions",
-            self.base_url(connectors)
-        ))
+        Ok(format!("{}api/payments", self.base_url(connectors)))
     }
 
     fn get_request_body(
@@ -573,12 +597,21 @@ impl ConnectorIntegration<api::Authorize, types::PaymentsAuthorizeData, types::P
 
         event_builder.map(|i| i.set_response_body(&response));
         router_env::logger::info!(connector_response=?response);
-
-        types::RouterData::try_from(types::ResponseRouterData {
-            response,
-            data: data.clone(),
-            http_code: res.status_code,
-        })
+        let optional_correlation_id = res.headers.and_then(|headers| {
+            headers
+                .get(consts::WP_CORRELATION_ID)
+                .and_then(|header_value| header_value.to_str().ok())
+                .map(|id| id.to_string())
+        });
+
+        types::RouterData::foreign_try_from((
+            types::ResponseRouterData {
+                response,
+                data: data.clone(),
+                http_code: res.status_code,
+            },
+            optional_correlation_id,
+        ))
         .change_context(errors::ConnectorError::ResponseHandlingFailed)
     }
 
@@ -631,9 +664,9 @@ impl ConnectorIntegration<api::Execute, types::RefundsData, types::RefundsRespon
     ) -> CustomResult<String, errors::ConnectorError> {
         let connector_payment_id = req.request.connector_transaction_id.clone();
         Ok(format!(
-            "{}payments/settlements/refunds/partials/{}",
+            "{}api/payments/{}/partialRefunds",
             self.base_url(connectors),
-            connector_payment_id
+            urlencoding::encode(&connector_payment_id),
         ))
     }
 
@@ -670,9 +703,19 @@ impl ConnectorIntegration<api::Execute, types::RefundsData, types::RefundsRespon
                     .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
                 event_builder.map(|i| i.set_response_body(&response));
                 router_env::logger::info!(connector_response=?response);
+                let optional_correlation_id = res.headers.and_then(|headers| {
+                    headers
+                        .get(consts::WP_CORRELATION_ID)
+                        .and_then(|header_value| header_value.to_str().ok())
+                        .map(|id| id.to_string())
+                });
                 Ok(types::RefundExecuteRouterData {
                     response: Ok(types::RefundsResponseData {
-                        connector_refund_id: ResponseIdStr::try_from(response.links)?.id,
+                        connector_refund_id: ResponseIdStr::foreign_try_from((
+                            response,
+                            optional_correlation_id,
+                        ))?
+                        .id,
                         refund_status: enums::RefundStatus::Pending,
                     }),
                     ..data.clone()
@@ -710,9 +753,9 @@ impl ConnectorIntegration<api::RSync, types::RefundsData, types::RefundsResponse
         connectors: &settings::Connectors,
     ) -> CustomResult<String, errors::ConnectorError> {
         Ok(format!(
-            "{}payments/events/{}",
+            "{}api/payments/{}",
             self.base_url(connectors),
-            req.request.get_connector_refund_id()?
+            urlencoding::encode(&req.request.get_connector_refund_id()?),
         ))
     }
 
@@ -813,7 +856,7 @@ impl api::IncomingWebhook for Worldpay {
             .parse_struct("WorldpayWebhookTransactionId")
             .change_context(errors::ConnectorError::WebhookReferenceIdNotFound)?;
         Ok(api_models::webhooks::ObjectReferenceId::PaymentId(
-            api::PaymentIdType::ConnectorTransactionId(body.event_details.transaction_reference),
+            api::PaymentIdType::PaymentAttemptId(body.event_details.transaction_reference),
         ))
     }
 
@@ -829,13 +872,14 @@ impl api::IncomingWebhook for Worldpay {
             EventType::Authorized => {
                 Ok(api::IncomingWebhookEvent::PaymentIntentAuthorizationSuccess)
             }
-            EventType::SentForSettlement => Ok(api::IncomingWebhookEvent::PaymentIntentProcessing),
             EventType::Settled => Ok(api::IncomingWebhookEvent::PaymentIntentSuccess),
+            EventType::SentForSettlement | EventType::SentForAuthorization => {
+                Ok(api::IncomingWebhookEvent::PaymentIntentProcessing)
+            }
             EventType::Error | EventType::Expired | EventType::SettlementFailed => {
                 Ok(api::IncomingWebhookEvent::PaymentIntentFailure)
             }
             EventType::Unknown
-            | EventType::SentForAuthorization
             | EventType::Cancelled
             | EventType::Refused
             | EventType::Refunded