feat(core): [Network Tokenization] pre network tokenization #6873

ImSagnik007 · 2024-12-18T06:19:09Z

Type of Change

Description

Introduced a new field in business_profile (is_pre_network_tokenization_enabled).
Based on that field the card will be tokenized before first payment.
If the payment get succeeded the card and network token data will be stored in the locker afterwards.

Additional Changes

This PR modifies the API contract
This PR modifies the database schema
This PR modifies application configuration/environment variables

Motivation and Context

How did you test it?

Checklist

I formatted the code cargo +nightly fmt --all
I addressed lints thrown by cargo clippy
I reviewed the submitted code
I added unit tests for my changes where possible

semanticdiff-com · 2024-12-18T06:19:12Z

Review changes with

Changed Files

File	Status
crates/router/src/core/payments/helpers.rs	64% smaller
crates/router/src/core/payments/tokenization.rs	39% smaller
api-reference-v2/openapi_spec.json	19% smaller
api-reference/openapi_spec.json	19% smaller
crates/router/src/core/payments/transformers.rs	1% smaller
crates/router/src/core/payments.rs	1% smaller
crates/api_models/src/admin.rs	0% smaller
crates/diesel_models/src/business_profile.rs	0% smaller
crates/diesel_models/src/schema.rs	0% smaller
crates/diesel_models/src/schema_v2.rs	0% smaller
crates/hyperswitch_domain_models/src/business_profile.rs	0% smaller
crates/hyperswitch_domain_models/src/payment_method_data.rs	0% smaller
crates/hyperswitch_domain_models/src/payments.rs	0% smaller
crates/router/src/core/admin.rs	0% smaller
crates/router/src/core/payments/operations/payment_response.rs	0% smaller
crates/router/src/core/payments/retry.rs	0% smaller
crates/router/src/types/api/admin.rs	0% smaller
migrations/2025-04-25-102551_add_is_pre_network_tokenization_enabled_in_business_profile/down.sql	Unsupported file format
migrations/2025-04-25-102551_add_is_pre_network_tokenization_enabled_in_business_profile/up.sql	Unsupported file format

prasunna09

also when constructing router data, if pre-tokenization enabled, we need to pass network token data as payment method data. Could you point me to that change?

prasunna09 · 2024-12-27T10:56:46Z

crates/router/src/core/payments.rs

+                    if is_pre_tokenization_enabled && is_nt_supported_connector_available {
+                        let pre_tokenization_response = tokenization::pre_payment_tokenization(


can this validation for pre-network tokenization move to a a function?

prasunna09 · 2024-12-27T10:58:27Z

crates/router/src/core/payments.rs

+                        .await?;
+                        let pm_data = payment_data.get_payment_method_data();
+                        match pre_tokenization_response {
+                            (Some(token_response), Some(_token_ref)) => {


why are we ignoring this token_ref? this should be set in payment method info right?

prasunna09 · 2024-12-27T11:04:12Z

crates/router/src/core/payments.rs

+                    let filtered_nt_supported_connectors =
+                        get_filtered_nt_supported_connectors(&state, [connector.clone()].to_vec());
+
+                    let is_nt_supported_connector_available =
+                        filtered_nt_supported_connectors.first().is_some();


do no filter out. check only if the connector decided by routing is in the network tokenization supported connectors. this is because routing should always be prioritized over any feature. please remove this.

prasunna09 · 2024-12-27T11:06:43Z

crates/router/src/core/payments.rs

+                        match pre_tokenization_response {
+                            (Some(token_response), Some(_token_ref)) => {
+                                let token_data = domain::NetworkTokenData {


since this is same logic, can you write this to a common function?

prasunna09 · 2025-01-13T07:21:44Z

crates/api_models/src/admin.rs

+
+    /// Indicates if network tokenization before first payment is enabled or not
+    #[serde(default)]
+    pub is_tokenize_before_payment_enabled: bool,


is_tokenize_before_payment_enabled is bit ambiguous when 'before payment' is mentioned in variable name.

is_pre_network_tokenization_enabled can be used ig. We can add clear doc comment

prasunna09 · 2025-01-13T07:40:49Z

crates/router/src/core/payments.rs

+
+                    let is_nt_supported_connector = ntid_supported_connectors.contains(&connector_data.connector_name);
+
+                    println!("{:?}<<>>10",is_nt_supported_connector);


remove the loggers.

prasunna09 · 2025-01-13T07:41:11Z

crates/router/src/core/payments.rs

+                    println!("{:?}<<>>10",is_nt_supported_connector);
+
+                    if is_pre_tokenization_enabled && is_nt_supported_connector {
+                        println!("{:?}<<>>14",is_nt_supported_connector);


prasunna09 · 2025-01-13T07:41:28Z

crates/router/src/core/payments.rs

+                    if is_pre_tokenization_enabled && is_nt_supported_connector {
+                        println!("{:?}<<>>14",is_nt_supported_connector);
+                        save_card_and_network_token_data(state, &mut payment_data).await;
+                        println!("{:?}<<>>15",payment_data.get_payment_method_data());


remove this too^

prasunna09 · 2025-01-13T07:42:45Z

crates/router/src/core/payments.rs

+                network_token_data: token_data.clone(),
+                ref_id: token_ref
+            };
+            println!("{:?}<<>>17", network_token_data_for_vault);


remove logger here^

prasunna09 · 2025-01-13T08:39:52Z

crates/router/src/core/payments.rs

+#[derive(Default, Clone, serde::Serialize, Debug)]
+pub struct NetworkTokenDataForVault {
+    pub network_token_data: hyperswitch_domain_models::payment_method_data::NetworkTokenData,
+    pub ref_id: String,


this is network_token_req_ref id right?
Can you rename it?

prasunna09 · 2025-01-13T08:51:15Z

crates/router/src/core/payments.rs

+
+                    if is_pre_tokenization_enabled && is_nt_supported_connector {
+                        println!("{:?}<<>>14",is_nt_supported_connector);
+                        save_card_and_network_token_data(state, &mut payment_data).await;


Can you modify save_card_and_network_token_data fn name? because, the fn is trying to pre tokenize and update payment data.payment method data. but not saving card flow.

prasunna09 · 2025-01-13T08:56:10Z

crates/router/src/core/payments.rs

+}
+
+#[derive(Default, Clone, serde::Serialize, Debug)]
+pub struct CardDataForVault {


seems like this struct has never been used. if this is not needed, can you remove this?

prasunna09 · 2025-01-13T08:57:43Z

crates/router/src/core/payments.rs

+    .await.ok();
+    match pre_tokenization_response {
+        Some((Some(token_response), Some(token_ref))) => {
+            let token_data = domain::NetworkTokenData {


can this be moved to a From implementation?

prasunna09 · 2025-01-13T09:17:50Z

crates/router/src/core/payments/tokenization.rs

+                                        Some(token_response),
+                                        network_token_requestor_ref_id.clone(),
+                                    )),
+                                    _ => Ok((None, None)),


incase fetch cryptogram fails we need to delete the network token generated right?
you return Ok((None, None)) in this failure case.

in save_card_and_network_token_data fn, it is written that if pre_payment_tokenization is None, then vault operation is set to SaveCardData(api::Card). but we need to return network token requestor ref id right? so that we can use this id to delete network token at token requestor in post update tracker

sai-harsha-vardhan · 2025-01-27T17:40:50Z

crates/diesel_models/src/business_profile.rs

@@ -106,6 +107,7 @@ pub struct ProfileNew {
    pub is_click_to_pay_enabled: bool,
    pub authentication_product_ids:
        Option<common_types::payments::AuthenticationConnectorAccountMap>,
+    pub is_pre_network_tokenization_enabled: Option<bool>,


Suggested change

pub is_pre_network_tokenization_enabled: Option<bool>,

pub is_pre_network_tokenization_enabled: bool,

sai-harsha-vardhan · 2025-01-28T14:29:58Z

crates/router/src/core/payments.rs

+}
+
+#[cfg(feature = "v1")]
+impl From<network_tokenization::TokenResponse> for domain::NetworkTokenData {


Can we move this to payments/transformers

sai-harsha-vardhan · 2025-01-28T14:35:17Z

crates/router/src/core/payments.rs

+}
+
+#[derive(Clone, serde::Serialize, Debug)]
+pub enum PaymentMethodDataAction {


Can we move these to domain models?

sai-harsha-vardhan · 2025-01-28T14:46:13Z

crates/router/src/core/payments/tokenization.rs

+#[cfg(feature = "v1")]
+pub async fn pre_payment_tokenization(
+    state: &SessionState,
+    customer_id: Option<id_type::CustomerId>,


Suggested change

customer_id: Option<id_type::CustomerId>,

customer_id: id_type::CustomerId,

sai-harsha-vardhan · 2025-01-28T14:48:17Z

crates/router/src/core/payments.rs

+{
+    let customer_id = payment_data.get_payment_intent().customer_id.clone();
+    let payment_method_data = payment_data.get_payment_method_data();
+    let pre_tokenization_response =


We can call pre_payment_tokenization after checking for PaymentMethodData::Card

sai-harsha-vardhan · 2025-01-28T15:04:46Z

crates/router/src/core/payments/tokenization.rs

+                                        Some(token_response),
+                                        network_token_requestor_ref_id.clone(),
+                                    )),
+                                    _ => Ok((None, network_token_requestor_ref_id.clone())),


Try to avoid default cases, and you can log the errors here

sai-harsha-vardhan · 2025-01-28T15:07:05Z

crates/router/src/core/payments/tokenization.rs

+                                ) {
+                                    let _ = record_operation_time(
+                                        async {
+                                            network_tokenization::delete_network_token_from_tokenization_service(


Should we tokio::spawn these deletions?

sai-harsha-vardhan · 2025-01-28T15:07:30Z

crates/router/src/core/payments/tokenization.rs

+                            payments::PaymentMethodDataAction::SaveCardAndNetworkTokenData(
+                                save_card_and_network_token_data,
+                            ) => {
+                                let card_data = api::CardDetail {


You can have from impls for these

sai-harsha-vardhan · 2025-01-28T15:09:23Z

crates/router/src/core/payments.rs

@@ -559,6 +576,19 @@ where

                    let connector_data = get_connector_data(&mut connectors)?;

+                    if is_pre_network_tokenization_enabled(


Shoudn't we move this to call_connector_service? What if the next connector is eligible for network tokenization and not the first one?

crates/router/src/core/payments.rs

hrithikesh026 · 2025-05-02T08:04:31Z

crates/api_models/src/admin.rs

@@ -2423,6 +2434,9 @@ pub struct ProfileResponse {
    //Merchant country for the profile
    #[schema(value_type = Option<CountryAlpha2>, example = "US")]
    pub merchant_business_country: Option<api_enums::CountryAlpha2>,
+
+    /// Indicates if pre network tokenization is enabled or not
+    pub is_pre_network_tokenization_enabled: bool,


Is this feature available in v2 as well?
If not, this can be removed.

hrithikesh026 · 2025-05-02T08:05:09Z

crates/diesel_models/src/business_profile.rs

@@ -541,6 +550,7 @@ impl ProfileUpdateInternal {
            merchant_business_country,
            revenue_recovery_retry_algorithm_type,
            revenue_recovery_retry_algorithm_data,
+            is_pre_network_tokenization_enabled,


If this is not used in v2, it can be removed.

hrithikesh026 · 2025-05-02T08:05:41Z

crates/diesel_models/src/schema_v2.rs

@@ -221,6 +221,7 @@ diesel::table! {
        merchant_business_country -> Nullable<CountryAlpha2>,
        #[max_length = 64]
        id -> Varchar,
+        is_pre_network_tokenization_enabled -> Bool,


Can be removed if not used

hrithikesh026 · 2025-05-02T08:27:27Z

crates/router/src/core/payments/tokenization.rs

@@ -210,41 +215,163 @@ where
                    .await?;
                    ((res, dc, None), None)
                } else {


please move the logic in else part to a different function.

ImSagnik007 self-assigned this Dec 18, 2024

ImSagnik007 requested review from a team as code owners December 18, 2024 06:19

ImSagnik007 linked an issue Dec 18, 2024 that may be closed by this pull request

[FEATURE] [Network Tokenization]: Tokenize before payment #6872

Open

2 tasks

hyperswitch-bot bot added the M-database-changes Metadata: This PR involves database schema changes label Dec 18, 2024

ImSagnik007 force-pushed the pre_network_tokenization branch from 276d588 to 5c13cc8 Compare December 23, 2024 06:06

hyperswitch-bot bot added the M-api-contract-changes Metadata: This PR involves API contract changes label Dec 23, 2024

ImSagnik007 force-pushed the pre_network_tokenization branch from a5845b1 to 3f9c0ba Compare December 23, 2024 08:49

hyperswitch-bot bot removed the M-api-contract-changes Metadata: This PR involves API contract changes label Dec 23, 2024

ImSagnik007 changed the title ~~Pre network tokenization~~ feat(core): [Network Tokenization] pre network tokenization Dec 23, 2024

hyperswitch-bot bot added the M-api-contract-changes Metadata: This PR involves API contract changes label Dec 23, 2024

ImSagnik007 force-pushed the pre_network_tokenization branch from 16e0f52 to dcc8625 Compare December 25, 2024 06:13

hyperswitch-bot bot added M-api-contract-changes Metadata: This PR involves API contract changes and removed M-api-contract-changes Metadata: This PR involves API contract changes labels Dec 25, 2024

prasunna09 requested changes Dec 27, 2024

View reviewed changes

ImSagnik007 force-pushed the pre_network_tokenization branch from 4c8d6a4 to 7563104 Compare January 6, 2025 05:49

hyperswitch-bot bot removed the M-api-contract-changes Metadata: This PR involves API contract changes label Jan 6, 2025

prasunna09 requested changes Jan 13, 2025

View reviewed changes

ImSagnik007 force-pushed the pre_network_tokenization branch 3 times, most recently from d3d4ecf to 90da476 Compare January 20, 2025 09:55

hyperswitch-bot bot added the M-api-contract-changes Metadata: This PR involves API contract changes label Jan 20, 2025

ImSagnik007 force-pushed the pre_network_tokenization branch from 4b62178 to 6bb59b2 Compare January 21, 2025 11:29

hyperswitch-bot bot added M-api-contract-changes Metadata: This PR involves API contract changes and removed M-api-contract-changes Metadata: This PR involves API contract changes labels Jan 21, 2025

ImSagnik007 force-pushed the pre_network_tokenization branch from a699724 to 9311c2c Compare January 22, 2025 08:59

hyperswitch-bot bot added M-api-contract-changes Metadata: This PR involves API contract changes and removed M-api-contract-changes Metadata: This PR involves API contract changes labels Jan 22, 2025

ImSagnik007 force-pushed the pre_network_tokenization branch from e5f5590 to 17f5577 Compare January 22, 2025 11:19

hyperswitch-bot bot added M-api-contract-changes Metadata: This PR involves API contract changes and removed M-api-contract-changes Metadata: This PR involves API contract changes labels Jan 22, 2025

sai-harsha-vardhan reviewed Jan 28, 2025

View reviewed changes

ImSagnik007 force-pushed the pre_network_tokenization branch from a56539e to f9bfc8a Compare February 11, 2025 13:33

hyperswitch-bot bot added M-api-contract-changes Metadata: This PR involves API contract changes and removed M-api-contract-changes Metadata: This PR involves API contract changes labels Feb 11, 2025

ImSagnik007 force-pushed the pre_network_tokenization branch from 1964bb5 to ba62a4d Compare April 25, 2025 10:50

ImSagnik007 requested a review from a team as a code owner April 25, 2025 10:50

hyperswitch-bot bot added M-api-contract-changes Metadata: This PR involves API contract changes and removed M-api-contract-changes Metadata: This PR involves API contract changes labels Apr 25, 2025

ImSagnik007 force-pushed the pre_network_tokenization branch from 3eebfe7 to fb31fea Compare April 27, 2025 16:21

hyperswitch-bot bot added M-api-contract-changes Metadata: This PR involves API contract changes and removed M-api-contract-changes Metadata: This PR involves API contract changes labels Apr 27, 2025

ImSagnik007 force-pushed the pre_network_tokenization branch from ca1d682 to fb31fea Compare April 28, 2025 09:53

hyperswitch-bot bot removed the M-api-contract-changes Metadata: This PR involves API contract changes label Apr 28, 2025

ImSagnik007 force-pushed the pre_network_tokenization branch from fb31fea to b10f6c1 Compare April 28, 2025 09:53

hyperswitch-bot bot added the M-api-contract-changes Metadata: This PR involves API contract changes label Apr 28, 2025

pre network tokenization

a5035b5

ImSagnik007 force-pushed the pre_network_tokenization branch from dda6dac to a5035b5 Compare May 1, 2025 19:36

hyperswitch-bot bot added M-api-contract-changes Metadata: This PR involves API contract changes and removed M-api-contract-changes Metadata: This PR involves API contract changes labels May 1, 2025

ImSagnik007 force-pushed the pre_network_tokenization branch from 5a6ebb8 to a5035b5 Compare May 2, 2025 07:24

hyperswitch-bot bot removed the M-api-contract-changes Metadata: This PR involves API contract changes label May 2, 2025

docs(openapi): re-generate OpenAPI specification

bd24c54

hyperswitch-bot bot added the M-api-contract-changes Metadata: This PR involves API contract changes label May 2, 2025

hrithikesh026 reviewed May 2, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(core): [Network Tokenization] pre network tokenization #6873

feat(core): [Network Tokenization] pre network tokenization #6873

ImSagnik007 commented Dec 18, 2024 •

edited

Loading

semanticdiff-com bot commented Dec 18, 2024 •

edited

Loading

prasunna09 left a comment

prasunna09 Dec 27, 2024

prasunna09 Dec 27, 2024

prasunna09 Dec 27, 2024

prasunna09 Dec 27, 2024

prasunna09 Jan 13, 2025

prasunna09 Jan 13, 2025

prasunna09 Jan 13, 2025

prasunna09 Jan 13, 2025

prasunna09 Jan 13, 2025

prasunna09 Jan 13, 2025

prasunna09 Jan 13, 2025

prasunna09 Jan 13, 2025

prasunna09 Jan 13, 2025

prasunna09 Jan 13, 2025

sai-harsha-vardhan Jan 27, 2025

sai-harsha-vardhan Jan 28, 2025

sai-harsha-vardhan Jan 28, 2025

sai-harsha-vardhan Jan 28, 2025

sai-harsha-vardhan Jan 28, 2025

sai-harsha-vardhan Jan 28, 2025

sai-harsha-vardhan Jan 28, 2025

sai-harsha-vardhan Jan 28, 2025

sai-harsha-vardhan Jan 28, 2025

hrithikesh026 May 2, 2025

hrithikesh026 May 2, 2025

hrithikesh026 May 2, 2025

hrithikesh026 May 2, 2025

		if is_pre_tokenization_enabled && is_nt_supported_connector_available {
		let pre_tokenization_response = tokenization::pre_payment_tokenization(


		let is_nt_supported_connector = ntid_supported_connectors.contains(&connector_data.connector_name);

		println!("{:?}<<>>10",is_nt_supported_connector);

	pub is_pre_network_tokenization_enabled: Option<bool>,
	pub is_pre_network_tokenization_enabled: bool,

	customer_id: Option<id_type::CustomerId>,
	customer_id: id_type::CustomerId,

		@@ -559,6 +576,19 @@ where

		let connector_data = get_connector_data(&mut connectors)?;

		if is_pre_network_tokenization_enabled(

feat(core): [Network Tokenization] pre network tokenization #6873

Are you sure you want to change the base?

feat(core): [Network Tokenization] pre network tokenization #6873

Conversation

ImSagnik007 commented Dec 18, 2024 • edited Loading

Type of Change

Description

Additional Changes

Motivation and Context

How did you test it?

Checklist

semanticdiff-com bot commented Dec 18, 2024 • edited Loading

prasunna09 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ImSagnik007 commented Dec 18, 2024 •

edited

Loading

semanticdiff-com bot commented Dec 18, 2024 •

edited

Loading