Merge branch 'main' into globalpay-grace-implementation

Author: shuklatushar226

.github/test/template_creds.json

@@ -0,0 +1,45 @@
+{
+    "bluecode": {
+      "connector_account_details": {
+        "auth_type": "HeaderKey",
+        "api_key": "test_bluecode_api_key"
+      },
+      "metadata": {
+        "shop_name": "test_shop_name"
+      }
+    },
+    "authorizedotnet": {
+      "connector_account_details": {
+        "auth_type": "BodyKey",
+        "api_key": "test_authorizedotnet_api_key",
+        "key1": "test_authorizedotnet_key1"
+      },
+      "metadata": {
+        "webhook_secret": "test_webhook_secret",
+        "transaction_key": "test_transaction_key"
+      }
+    },
+    "fiserv": {
+      "connector_account_details": {
+        "auth_type": "SignatureKey",
+        "api_key": "test_fiserv_api_key",
+        "key1": "test_fiserv_key1", 
+        "api_secret": "test_fiserv_api_secret"
+      },
+      "metadata": {
+        "terminal_id": "test_terminal_id"
+      }
+    },
+    "cashtocode": {
+      "connector_account_details": {
+        "auth_type": "CurrencyAuthKey",
+        "auth_key_map": {
+          "USD": {
+            "password_evoucher": "test_usd_password_evoucher",
+            "username_evoucher": "test_usd_username_evoucher",
+            "merchant_id_evoucher": "test_usd_merchant_id_evoucher"
+          }
+        }
+      }
+    }
+}

.github/workflows/ci.yml

@@ -108,7 +108,7 @@ jobs:
           CONNECTOR_AUTH_PASSPHRASE: ${{ secrets.CONNECTOR_AUTH_PASSPHRASE }}
           CONNECTOR_CREDS_S3_BUCKET_URI: ${{ secrets.CONNECTOR_CREDS_S3_BUCKET_URI}}
           DESTINATION_FILE_NAME: "creds.json.gpg"
-          S3_SOURCE_FILE_NAME: "9f00461f-5a48-4f9c-aa8c-3510e4cb7d9c.json.gpg"
+          S3_SOURCE_FILE_NAME: "1a2fe2af-cfdf-477d-8d32-3e64a46d3d85.json.gpg"
         shell: bash
         run: |
           mkdir -p ".github/secrets" ".github/test"

.gitignore

@@ -406,6 +406,9 @@ $RECYCLE.BIN/
 **/*.swo
 **/.env.local
 
+# Credentials files
+.github/test/creds.json
+
 # DrawIO files
 **/*.drawio.bkp
 gen/**

CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to Connector Service will be documented here.
 
 - - -
 
+## 2025.11.10.0
+
+### Features
+
+- **connector:** [payload] implement core flows, card payment method and webhooks ([#249](https://github.com/juspay/connector-service/pull/249)) ([`aacf887`](https://github.com/juspay/connector-service/commit/aacf8878e790af265bab32c2653bd78956044951))
+
+### Refactors
+
+- Use typed connector response with masking for events ([#256](https://github.com/juspay/connector-service/pull/256)) ([`58e4b93`](https://github.com/juspay/connector-service/commit/58e4b93c3ea3d68fa8d3bed332eae98ec6e61afd))
+
+**Full Changelog:** [`2025.11.05.0...2025.11.10.0`](https://github.com/juspay/connector-service/compare/2025.11.05.0...2025.11.10.0)
+
+- - -
+
 ## 2025.11.05.0
 
 ### Documentation

backend/common_utils/src/events.rs

@@ -256,6 +256,10 @@ impl Event {
         self.response_data =
             MaskedSerdeValue::from_masked_optional(response, "grpc_success_response");
     }
+
+    pub fn set_connector_response<R: Serialize>(&mut self, response: &R) {
+        self.response_data = MaskedSerdeValue::from_masked_optional(response, "connector_response");
+    }
 }
 
 #[derive(strum::Display)]

backend/connector-integration/src/connectors.rs

@@ -94,3 +94,6 @@ pub use self::worldpayvantiv::Worldpayvantiv;
 
 pub mod globalpay;
 pub use self::globalpay::Globalpay;
+
+pub mod payload;
+pub use self::payload::Payload;

backend/connector-integration/src/connectors/aci.rs

@@ -1,7 +1,7 @@
 pub mod aci_result_codes;
 pub mod transformers;
 
-use common_utils::{errors::CustomResult, ext_traits::ByteSliceExt, StringMajorUnit};
+use common_utils::{errors::CustomResult, events, ext_traits::ByteSliceExt, StringMajorUnit};
 use domain_types::{
     connector_flow::{
         Accept, Authenticate, Authorize, Capture, CreateAccessToken, CreateConnectorCustomer,
@@ -31,7 +31,6 @@ use error_stack::ResultExt;
 use hyperswitch_masking::{Mask, Maskable, PeekInterface};
 use interfaces::{
     api::ConnectorCommon, connector_integration_v2::ConnectorIntegrationV2, connector_types,
-    events::connector_api_logs::ConnectorEvent,
 };
 
 use common_enums::CurrencyUnit;
@@ -191,7 +190,7 @@ impl<T: PaymentMethodDataTypes + Debug + Sync + Send + 'static + Serialize> Conn
     fn build_error_response(
         &self,
         res: Response,
-        event_builder: Option<&mut ConnectorEvent>,
+        event_builder: Option<&mut events::Event>,
     ) -> CustomResult<ErrorResponse, errors::ConnectorError> {
         let response: aci::AciErrorResponse = res
             .response

backend/connector-integration/src/connectors/adyen.rs

@@ -10,7 +10,8 @@ use common_enums::{
     AttemptStatus, CaptureMethod, CardNetwork, EventClass, PaymentMethod, PaymentMethodType,
 };
 use common_utils::{
-    errors::CustomResult, ext_traits::ByteSliceExt, pii::SecretSerdeValue, types::StringMinorUnit,
+    errors::CustomResult, events, ext_traits::ByteSliceExt, pii::SecretSerdeValue,
+    types::StringMinorUnit,
 };
 use domain_types::{
     connector_flow::{
@@ -50,7 +51,6 @@ use interfaces::{
     api::ConnectorCommon,
     connector_integration_v2::ConnectorIntegrationV2,
     connector_types::{self, is_mandate_supported, ConnectorValidation},
-    events::connector_api_logs::ConnectorEvent,
 };
 use serde::Serialize;
 use transformers::{
@@ -297,7 +297,7 @@ impl<T: PaymentMethodDataTypes + Debug + Sync + Send + 'static + Serialize> Conn
     fn build_error_response(
         &self,
         res: Response,
-        event_builder: Option<&mut ConnectorEvent>,
+        event_builder: Option<&mut events::Event>,
     ) -> CustomResult<ErrorResponse, errors::ConnectorError> {
         let response: adyen::AdyenErrorResponse = res
             .response

backend/connector-integration/src/connectors/adyen/transformers.rs

@@ -272,7 +272,7 @@ pub struct RiskData {
     #[serde(rename = "riskdata.promotionName")]
     promotion_name: Option<String>,
     #[serde(rename = "riskdata.secondaryPhoneNumber")]
-    secondary_phone_number: Option<String>,
+    secondary_phone_number: Option<Secret<String>>,
     #[serde(rename = "riskdata.timefromLogintoOrder")]
     timefrom_loginto_order: Option<String>,
     #[serde(rename = "riskdata.totalSessionTime")]
@@ -1935,7 +1935,7 @@ pub fn get_risk_data(metadata: serde_json::Value) -> Option<RiskData> {
         merchant_reference,
         payment_method,
         promotion_name,
-        secondary_phone_number,
+        secondary_phone_number: secondary_phone_number.map(Secret::new),
         timefrom_loginto_order,
         total_session_time,
         total_authorized_amount_in_last30_days,

backend/connector-integration/src/connectors/authorizedotnet.rs

@@ -2,7 +2,7 @@ pub mod transformers;
 
 use common_enums;
 use common_utils::{
-    consts, errors::CustomResult, ext_traits::ByteSliceExt, request::RequestContent,
+    consts, errors::CustomResult, events, ext_traits::ByteSliceExt, request::RequestContent,
     types::FloatMajorUnit,
 };
 use domain_types::{
@@ -44,7 +44,6 @@ use interfaces::{
         PaymentVoidV2, RefundSyncV2, RefundV2, RepeatPaymentV2, SetupMandateV2, SubmitEvidenceV2,
         ValidationTrait,
     },
-    events::connector_api_logs::ConnectorEvent,
     verification::SourceVerification,
 };
 use serde::Serialize;
@@ -531,7 +530,7 @@ impl<
     fn build_error_response(
         &self,
         res: Response,
-        event_builder: Option<&mut ConnectorEvent>,
+        event_builder: Option<&mut events::Event>,
     ) -> CustomResult<ErrorResponse, errors::ConnectorError> {
         let response: transformers::ResponseMessages = res
             .response