feat(core): add payments post_session_tokens flow #6202

swangi-kumari · 2024-10-02T19:27:59Z

Type of Change

Description

Add support for a new endpoint post_session_tokens which can be called before the confirm call.

Use Case

In PayPal, after the session call, when we click the PayPal button, we need to create an order. Previously, this was done in the /confirm call, and in response, we received the order_id / connector_transaction_id. We would then send this information to the HS SDK, which forwarded it to PayPal. PayPal used this data to render their SDK, allowing the user to log in and modify the shipping address. The user would then click "Complete Purchase," triggering the OnApprove callback, which was handled by the /complete_authorize call.
The /confirm call happens at the point of order creation, but we receive the shipping address after that. At that stage, we make a call to TaxJar, and the order's tax amount is added. However, since the /confirm call has already happened, we can't change/update the amount at that point. This was the reason for creating the new flow, where the order creation happens in the /post_session_tokens call, and the /confirm call occurs after tax calculation.
After this refactoring, the CreateOrder step will be handled in the /post_session_tokens call, and the OnApprove action will be handled in the /confirm call.

Populate Dynamic Fields for Paypal

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?

Create Merchant Account

curl --location 'http://localhost:8080/accounts' \
--header 'Content-Type: application/json' \
--header 'Accept: application/json' \
--header 'api-key: test_admin' \
--data-raw '{
  "merchant_id": "merchant_1728546485",
  "locker_id": "m0010",
  "merchant_name": "NewAge Retailer",
  "merchant_details": {
    "primary_contact_person": "John Test",
    "primary_email": "JohnTest@test.com",
    "primary_phone": "sunt laborum",
    "secondary_contact_person": "John Test2",
    "secondary_email": "JohnTest2@test.com",
    "secondary_phone": "cillum do dolor id",
    "website": "https://www.example.com",
    "about_business": "Online Retail with a wide selection of organic products for North America",
    "address": {
      "line1": "1467",
      "line2": "Harrison Street",
      "line3": "Harrison Street",
      "city": "San Fransico",
      "state": "California",
      "zip": "94122",
      "country": "US"
    }
  },
  "return_url": "https://google.com/success",
  "webhook_details": {
    "webhook_version": "1.0.1",
    "webhook_username": "ekart_retail",
    "webhook_password": "password_ekart@123",
    "payment_created_enabled": true,
    "payment_succeeded_enabled": true,
    "payment_failed_enabled": true
  },
  "sub_merchants_enabled": false,
  "metadata": {
    "city": "NY",
    "unit": "245"
  },
  "primary_business_details": [
    {
      "country": "US",
      "business": "food"
    }
  ]
}'

Create API Key

curl --location 'http://localhost:8080/api_keys/merchant_1728540504' \
--header 'Content-Type: application/json' \
--header 'Accept: application/json' \
--header 'api-key: test_admin' \
--data '{
  "name": "API Key 1",
  "description": null,
  "expiration": "2025-09-23T01:02:03.000Z"
}'

Create MCA

curl --location 'http://localhost:8080/account/merchant_1728540504/connectors?=' \
--header 'Content-Type: application/json' \
--header 'Accept: application/json' \
--header 'api-key: test_admin' \
--data '{
    "connector_type": "payment_processor",
    "connector_name": "paypal",
    "connector_account_details": {
        "auth_type": "BodyKey",
        "api_key": "_",
        "key1": "_"
    },
    "test_mode": false,
    "disabled": false,
    "payment_methods_enabled": [
        {
            "payment_method": "card",
            "payment_method_types": [
                {
                    "payment_method_type": "credit",
                    "card_networks": [
                        "Visa",
                        "Mastercard"
                    ],
                    "minimum_amount": 1,
                    "maximum_amount": 68607706,
                    "recurring_enabled": true,
                    "installment_payment_enabled": true
                },
                {
                    "payment_method_type": "debit",
                    "card_networks": [
                        "Visa",
                        "Mastercard"
                    ],
                    "minimum_amount": 1,
                    "maximum_amount": 68607706,
                    "recurring_enabled": true,
                    "installment_payment_enabled": true
                }
            ]
        },
        {
            "payment_method": "wallet",
            "payment_method_types": [
                {
                    "payment_method_type": "paypal",
                    "payment_experience": "redirect_to_url",
                    "minimum_amount": 1,
                    "maximum_amount": 68607706,
                    "recurring_enabled": false,
                    "installment_payment_enabled": false
                },
                {
                    "payment_method_type": "paypal",
                    "payment_experience": "invoke_sdk_client",
                    "minimum_amount": 1,
                    "maximum_amount": 68607706,
                    "recurring_enabled": false,
                    "installment_payment_enabled": false
                }
                
            ]
        },
        {
            "payment_method": "bank_redirect",
            "payment_method_types": [
                {
                    "payment_method_type": "giropay",
                    "recurring_enabled": true,
                    "installment_payment_enabled": true,
                    "payment_experience": "redirect_to_url"
                },
                {
                    "payment_method_type": "ideal",
                    "recurring_enabled": true,
                    "installment_payment_enabled": true,
                    "payment_experience": "redirect_to_url"
                },
                {
                    "payment_method_type": "eps",
                    "recurring_enabled": true,
                    "installment_payment_enabled": true,
                    "payment_experience": "redirect_to_url"
                },
                {
                    "payment_method_type": "sofort",
                    "recurring_enabled": true,
                    "installment_payment_enabled": true,
                    "payment_experience": "redirect_to_url"
                }
            ]
        }
    ],
     "metadata": {
        "paypal_sdk": {
            "client_id": "___"
        }
    },
    "business_country": "US",
    "business_label": "food"
}'

Create Payment

curl --location 'http://localhost:8080/payments' \
--header 'Content-Type: application/json' \
--header 'Accept: application/json' \
--header 'api-key: dev_MTxKOCiP8GOiXv955xYCMuW0MUzl1anEbVVkxBBR87wfDUObqYqOsCqpogsFFnCd' \
--data-raw '{
    "amount": 6540,
    "currency": "USD",
    "confirm": false,
    "capture_method": "automatic",
    "capture_on": "2022-09-10T10:11:12Z",
    "amount_to_capture": 6540,
    "customer_id": "StripeCustomer",
    "email": "guest@example.com",
    "name": "John Doe",
    "phone": "999999999",
    "phone_country_code": "+1",
    "description": "Its my first payment request",
    "authentication_type": "no_three_ds",
    "return_url": "https://duck.com",
    "billing": {
        "address": {
            "line1": "1467",
            "line2": "Harrison Street",
            "line3": "Harrison Street",
            "city": "San Fransico",
            "state": "California",
            "zip": "94122",
            "country": "US",
            "first_name": "PiX"
        }
    },
    "shipping": {
        "address": {
            "line1": "1467",
            "line2": "Harrison Street",
            "line3": "Harrison Street",
            "city": "San Fransico",
            "state": "California",
            "zip": "94122",
            "country": "US",
            "first_name": "PiX"
        }
    },
    "statement_descriptor_name": "joseph",
    "statement_descriptor_suffix": "JS",
    "metadata": {
        "udf1": "value1",
        "new_customer": "true",
        "login_date": "2019-09-10T10:11:12Z"
    }
}'

Create Session token

curl --location 'http://localhost:8080/payments/session_tokens' \
--header 'Content-Type: application/json' \
--header 'api-key: pk_dev_10cfee22267a4184a3d45665920788ea' \
--data '{
    "payment_id": "pay_J3IXGvol8nNvUkSRTcwQ",
    "wallets": [],
    "client_secret": "pay_J3IXGvol8nNvUkSRTcwQ_secret_VN76rK4oCqTghQ1kwNcO"
}'

Response

{
    "payment_id": "pay_mcVzUMZws5KmEKbGkZ0g",
    "client_secret": "pay_mcVzUMZws5KmEKbGkZ0g_secret_RMWlmy1jSdlp9VOMX1qc",
    "session_token": [
        {
            "wallet_name": "paypal",
            "connector": "paypal",
            "session_token": "ASKAGh2WXgqfQ5TzjpZzLsfhVGlFbjq5VrV5IOX8KXDD2N_XqkGeYNDkWyr_UXnfhXpEkABdmP284b_2",
            "sdk_next_action": {
                "next_action": "post_session_tokens"
            }
        }
    ]
}

In Response Check for Next action - It should be post_session_tokens

List Payment Methods for merchant - Check for required fields (shipping_details)

curl --location 'http://localhost:8080/account/payment_methods?client_secret=pay_J3IXGvol8nNvUkSRTcwQ_secret_VN76rK4oCqTghQ1kwNcO' \
--header 'Accept: application/json' \
--header 'api-key: pk_dev_10cfee22267a4184a3d45665920788ea'

Response

{
    "redirect_url": "https://google.com/success",
    "currency": "USD",
    "payment_methods": [
        {
            "payment_method": "wallet",
            "payment_method_types": [
                {
                    "payment_method_type": "paypal",
                    "payment_experience": [
                        {
                            "payment_experience_type": "invoke_sdk_client",
                            "eligible_connectors": [
                                "paypal"
                            ]
                        },
                        {
                            "payment_experience_type": "redirect_to_url",
                            "eligible_connectors": [
                                "paypal"
                            ]
                        }
                    ],
                    "card_networks": null,
                    "bank_names": null,
                    "bank_debits": null,
                    "bank_transfers": null,
                    "required_fields": {
                        "shipping.address.country": {
                            "required_field": "shipping.address.country",
                            "display_name": "country",
                            "field_type": {
                                "user_shipping_address_country": {
                                    "options": [
                                        "ALL"
                                    ]
                                }
                            },
                            "value": "US"
                        },
                        "shipping.address.first_name": {
                            "required_field": "shipping.address.first_name",
                            "display_name": "shipping_first_name",
                            "field_type": "user_shipping_name",
                            "value": "PiX"
                        },
                        "shipping.address.zip": {
                            "required_field": "shipping.address.zip",
                            "display_name": "zip",
                            "field_type": "user_shipping_address_pincode",
                            "value": "94122"
                        },
                        "shipping.address.state": {
                            "required_field": "shipping.address.state",
                            "display_name": "state",
                            "field_type": "user_shipping_address_state",
                            "value": "California"
                        },
                        "shipping.address.city": {
                            "required_field": "shipping.address.city",
                            "display_name": "city",
                            "field_type": "user_shipping_address_city",
                            "value": "San Fransico"
                        },
                        "shipping.address.last_name": {
                            "required_field": "shipping.address.last_name",
                            "display_name": "shipping_last_name",
                            "field_type": "user_shipping_name",
                            "value": null
                        },
                        "shipping.address.line1": {
                            "required_field": "shipping.address.line1",
                            "display_name": "line1",
                            "field_type": "user_shipping_address_line1",
                            "value": "1467"
                        }
                    },
                    "surcharge_details": null,
                    "pm_auth_connector": null
                }
            ]
        },
            ],
    "mandate_payment": null,
    "merchant_name": "NewAge Retailer",
    "show_surcharge_breakup_screen": false,
    "payment_type": "normal",
    "request_external_three_ds_authentication": false,
    "collect_shipping_details_from_wallets": false,
    "collect_billing_details_from_wallets": false,
    "is_tax_calculation_enabled": false
}

Create Post Session Tokens for Paypal

curl --location 'http://localhost:8080/payments/pay_J3IXGvol8nNvUkSRTcwQ/post_session_tokens' \
--header 'Content-Type: application/json' \
--header 'api-key: pk_dev_10cfee22267a4184a3d45665920788ea' \
--data '{
    "client_secret": "pay_J3IXGvol8nNvUkSRTcwQ_secret_VN76rK4oCqTghQ1kwNcO",
    "payment_method_type": "paypal",
    "payment_method": "wallet"
}'

Response

 {
    "payment_id": "pay_mcVzUMZws5KmEKbGkZ0g",
    "next_action": {
        "type": "invoke_sdk_client",
        "next_action_data": {
            "next_action": "confirm",
            "order_id": "2KW93090954330301"
        }
    }
}

In Response Check for Next action - It should be confirm

Confirm Request

curl 'http://localhost:8080/payments/pay_6oSZ2utmkjgdOlfrZ53E/confirm' \
-X 'POST' \
-H 'Content-Type: application/json' \
-H 'Accept-Encoding: gzip, deflate' \
-H 'Sec-Fetch-Mode: cors' \
-H 'x-payment-confirm-source: sdk' \
-H 'x-client-source: ExpressCheckoutElement' \
-H 'api-key: pk_dev_43922dfcb2694e09929891b0f4f7b6dc' \
-H 'x-browser-version: 605.1.15' \
--data-binary '{"client_secret":"pay_6oSZ2utmkjgdOlfrZ53E_secret_EFrF7Izc98NHygNyG51x","return_url":"http://localhost:9060","retry_action":"manual_retry","shipping":{"address":{"country":"US","state":"California","zip":"94588","first_name":"Jagan","city":"Pleasanton","last_name":"Elavarasan","line1":"4141"}},"payment_method":"wallet","payment_method_type":"paypal","payment_experience":"invoke_sdk_client","connector":["paypal"],"payment_method_data":{"wallet":{"paypal_sdk":{"token":""}}},"browser_info":{"user_agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.1.2 Safari/605.1.15","accept_header":"text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8","language":"en-US","color_depth":24,"screen_height":1117,"screen_width":1728,"time_zone":-330,"java_enabled":true,"java_script_enabled":true},"payment_type":"normal"}'

Response

    "payment_id": "pay_6oSZ2utmkjgdOlfrZ53E",
    "merchant_id": "merchant_1728844379",
    "status": "succeeded",
    "amount": 2999,
    "net_amount": 2999,
    "amount_capturable": 0,
    "amount_received": 2999,
    "connector": "paypal",
    "client_secret": "pay_6oSZ2utmkjgdOlfrZ53E_secret_EFrF7Izc98NHygNyG51x",
    "created": "2024-10-14T09:09:36.340Z",
    "currency": "USD",
    "customer_id": "hyperswitch_sdk_demo_id",
    "customer": {
        "id": "hyperswitch_sdk_demo_id",
        "name": null,
        "email": "hyperswitch_sdk_demo_id@gmail.com",
        "phone": null,
        "phone_country_code": null
    },
    "description": "Hello this is description",
    "refunds": null,
    "disputes": null,
    "mandate_id": null,
    "mandate_data": null,
    "setup_future_usage": null,
    "off_session": null,
    "capture_on": null,
    "capture_method": "automatic",
    "payment_method": "wallet",
    "payment_method_data": {
        "wallet": {},
        "billing": null
    },
    "payment_token": null,
    "shipping": {
        "address": {
            "city": "Pleasanton",
            "country": "US",
            "line1": "4141",
            "line2": "Amsterdam Ave",
            "line3": "alsksoe",
            "zip": "94588",
            "state": "California",
            "first_name": "Jagan",
            "last_name": "Elavarasan"
        },
        "phone": {
            "number": "5551234",
            "country_code": "+1"
        },
        "email": "customer@email.us"
    },
    "billing": {
        "address": {
            "city": "San Fransico",
            "country": "US",
            "line1": "1467",
            "line2": "Harrison Street",
            "line3": "Harrison Street",
            "zip": "94122",
            "state": "California",
            "first_name": "joseph",
            "last_name": "Doe"
        },
        "phone": {
            "number": "_",
            "country_code": "+91"
        },
        "email": "swangi@getMaxListeners.com"
    },
    "order_details": [
        {
            "brand": null,
            "amount": 2999,
            "category": null,
            "quantity": 1,
            "product_id": null,
            "product_name": "Apple iPhone 15",
            "product_type": null,
            "sub_category": null,
            "product_img_link": null,
            "product_tax_code": null,
            "requires_shipping": null
        }
    ],
    "email": "hyperswitch_sdk_demo_id@gmail.com",
    "name": null,
    "phone": null,
    "return_url": "http://localhost:9060/",
    "authentication_type": "three_ds",
    "statement_descriptor_name": null,
    "statement_descriptor_suffix": null,
    "next_action": null,
    "cancellation_reason": null,
    "error_code": null,
    "error_message": null,
    "unified_code": null,
    "unified_message": null,
    "payment_experience": "invoke_sdk_client",
    "payment_method_type": "paypal",
    "connector_label": null,
    "business_country": null,
    "business_label": "default",
    "business_sub_label": null,
    "allowed_payment_method_types": null,
    "ephemeral_key": null,
    "manual_retry_allowed": false,
    "connector_transaction_id": "1SV0561343891340C",
    "frm_message": null,
    "metadata": {
        "udf1": "value1",
        "login_date": "2019-09-10T10:11:12Z",
        "new_customer": "true"
    },
    "connector_metadata": null,
    "feature_metadata": null,
    "reference_id": "pay_6oSZ2utmkjgdOlfrZ53E_1",
    "payment_link": null,
    "profile_id": "pro_03iBylVoOpuldQsVZKtO",
    "surcharge_details": null,
    "attempt_count": 1,
    "merchant_decision": null,
    "merchant_connector_id": "mca_frKbF7wxB3Rt7tAFbpJA",
    "incremental_authorization_allowed": null,
    "authorization_count": null,
    "incremental_authorizations": null,
    "external_authentication_details": null,
    "external_3ds_authentication_attempted": false,
    "expires_on": "2024-10-14T09:24:36.340Z",
    "fingerprint": null,
    "browser_info": {
        "language": "en-US",
        "time_zone": -330,
        "ip_address": "::1",
        "user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.1.2 Safari/605.1.15",
        "color_depth": 24,
        "java_enabled": true,
        "screen_width": 1728,
        "accept_header": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8",
        "screen_height": 1117,
        "java_script_enabled": true
    },
    "payment_method_id": null,
    "payment_method_status": null,
    "updated": "2024-10-14T09:10:19.289Z",
    "charges": null,
    "frm_metadata": null,
    "merchant_order_reference_id": null,
    "order_tax_amount": null,
    "connector_mandate_id": null
}

For end to end testing, we need to do the payment via SDK

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-10-02T19:28:02Z

Review changes with SemanticDiff.

Analyzed 40 of 41 files.

Overall, the semantic diff is 8% smaller than the GitHub diff.

File Information

	Filename	Status
✔️	crates/router_env/src/logger/types.rs	Analyzed
✔️	crates/router_derive/src/macros/operation.rs	Analyzed
✔️	crates/router/src/types.rs	78.0% smaller
✔️	crates/router/src/types/api/payments.rs	90.74% smaller
✔️	crates/router/src/types/api/payments_v2.rs	89.53% smaller
✔️	crates/router/src/services/api.rs	Analyzed
✔️	crates/router/src/services/authentication.rs	Analyzed
✔️	crates/router/src/routes/app.rs	21.33% smaller
✔️	crates/router/src/routes/lock_utils.rs	82.81% smaller
✔️	crates/router/src/routes/payments.rs	Analyzed
✔️	crates/router/src/core/payments.rs	47.84% smaller
✔️	crates/router/src/core/payments/connector_integration_v2_impls.rs	Analyzed
✔️	crates/router/src/core/payments/flows.rs	Analyzed
✔️	crates/router/src/core/payments/operations.rs	62.76% smaller
✔️	crates/router/src/core/payments/transformers.rs	Analyzed
✔️	crates/router/src/core/payments/operations/payment_post_session_tokens.rs	Analyzed
✔️	crates/router/src/core/payments/operations/payment_response.rs	9.49% smaller
✔️	crates/router/src/core/payments/flows/post_session_tokens_flow.rs	Analyzed
✔️	crates/router/src/core/payments/flows/session_flow.rs	Analyzed
✔️	crates/router/src/connector/paypal.rs	15.33% smaller
✔️	crates/router/src/connector/utils.rs	Analyzed
✔️	crates/router/src/connector/paypal/transformers.rs	11.38% smaller
✔️	crates/router/src/configs/defaults.rs	8.66% smaller
✔️	crates/openapi/src/openapi.rs	Analyzed
✔️	crates/openapi/src/routes/payments.rs	Analyzed
✔️	crates/hyperswitch_interfaces/src/types.rs	42.98% smaller
✔️	crates/hyperswitch_interfaces/src/api/payments.rs	35.97% smaller
✔️	crates/hyperswitch_interfaces/src/api/payments_v2.rs	24.12% smaller
✔️	crates/hyperswitch_domain_models/src/router_request_types.rs	Analyzed
✔️	crates/hyperswitch_domain_models/src/types.rs	66.25% smaller
✔️	crates/hyperswitch_domain_models/src/router_flow_types/payments.rs	Analyzed
✔️	crates/hyperswitch_domain_models/src/payments/payment_attempt.rs	Analyzed
✔️	crates/hyperswitch_connectors/src/default_implementations.rs	7.2% smaller
✔️	crates/hyperswitch_connectors/src/default_implementations_v2.rs	32.11% smaller
✔️	crates/diesel_models/src/payment_attempt.rs	Analyzed
✔️	crates/api_models/src/payments.rs	Analyzed
✔️	crates/api_models/src/events/payment.rs	13.61% smaller
✔️	api-reference-v2/openapi_spec.json	Analyzed
✔️	api-reference/mint.json	66.67% smaller
✔️	api-reference/openapi_spec.json	Analyzed
❔	api-reference/api-reference/payments/payments--post-session-tokens.mdx	Unsupported file format

…into create-order

…ate-order

…into create-order

Narayanbhat166 · 2024-10-14T07:36:40Z

crates/api_models/src/payments.rs

+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize, Clone, ToSchema)]
+pub struct PaymentsPostSessionTokensResponse {


are we using this response anywhere? I think we are sending the payments response. Instead of that can we use this struct?

Narayanbhat166 · 2024-10-14T09:24:14Z

crates/router/src/core/payments/operations/payment_post_session_tokens.rs

+        )
+        .await?;
+
+        let payment_method_billing = helpers::get_address_by_id(


we will not have this billing address in this flow, can be removed

Billing address would be there if merchant has sent it in payments create request right? As, this is create order call and connector expects billing address, we should be sending it? @Narayanbhat166

Narayanbhat166 · 2024-10-14T10:11:28Z

crates/router/src/core/payments/operations/payment_response.rs

+                let m_db = db.clone().store;
+                let payment_attempt_update =
+                    storage::PaymentAttemptUpdate::PostSessionTokensUpdate {
+                        connector_transaction_id: connector_transaction_id.clone(),


we should not update connector_transaction_id in this flow. There can be cases where confirm happens through a different payment method data and a new connector might be selected, we will have the wrong mapping of connector and transaction id.

Narayanbhat166 · 2024-10-14T10:14:14Z

crates/router/src/core/payments/operations/payment_response.rs

+                    connector: payment_data
+                        .payment_attempt
+                        .connector
+                        .clone()


we will not store the connector in this case. We should not update the error message in this case. This should be a bad request error.

Narayanbhat166 · 2024-10-14T10:21:45Z

crates/diesel_models/src/payment_attempt.rs

@@ -475,6 +475,11 @@ pub enum PaymentAttemptUpdate {
        unified_message: Option<String>,
        connector_transaction_id: Option<String>,
    },
+    PostSessionTokensUpdate {
+        updated_by: String,
+        connector_transaction_id: Option<String>,


do not update this

deepanshu-iiitu · 2024-10-14T10:56:54Z

crates/router/src/connector/paypal.rs

+        let req = match payment_method_data {
+            domain::PaymentMethodData::Wallet(domain::WalletData::PaypalSdk(_)) => {
+                services::RequestBuilder::new()
+                    .method(services::Method::Post)


Why is this method Post if we are not sending a body?

We are using this flow to authorize the payment.
It should be Post Method - doc

Narayanbhat166 · 2024-10-15T05:47:39Z

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

+        _is_latency_header_enabled: Option<bool>,
+    ) -> RouterResponse<Self> {
+        let papal_sdk_next_action =
+            paypal_sdk_next_steps_check(payment_data.get_payment_attempt().clone())?;


we should avoid doing this, the core orchestration layer should not handle connector specific logic. This refactor can be taken up separately

Narayanbhat166 · 2024-10-15T05:48:27Z

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

@@ -1774,6 +1809,7 @@ impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::PaymentsAuthoriz
            charges,
            merchant_order_reference_id,
            integrity_object: None,
+            connector_transaction_id: payment_data.payment_attempt.connector_transaction_id,


please remove this field from the request, we do not need connector_transaction_id to be present before the authorization has happened

Narayanbhat166 · 2024-10-15T05:53:05Z

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

+            .shipping_cost
+            .unwrap_or_default();
+        // amount here would include amount, surcharge_amount and shipping_cost
+        let amount = payment_data.payment_intent.amount + shipping_cost + surcharge_amount;


should we not include order_tax_amount in case this was provided by the merchant in payments create? @sai-harsha-vardhan I think we should have the net amount struct for intent as well to handle these cases where some amount might be missed

Yes, that is the ideal way. We can introduce net_amount in intent domain models.

@swangi-kumari we should include order_tax amount here right?

Narayanbhat166 · 2024-10-15T05:55:54Z

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

+            .clone();
+        Ok(Self {
+            amount, //need to change after we move to connector module
+            currency: payment_data.currency,


nit: use this from payment intent. We do not want two source of truth for the same field. We plan on removing currency from payment data later in time

Narayanbhat166 · 2024-10-15T06:00:08Z

crates/router/src/types/api/payments.rs

@@ -9,7 +9,8 @@ pub use api_models::payments::{
    PaymentsApproveRequest, PaymentsCancelRequest, PaymentsCaptureRequest,
    PaymentsCompleteAuthorizeRequest, PaymentsDynamicTaxCalculationRequest,
    PaymentsDynamicTaxCalculationResponse, PaymentsExternalAuthenticationRequest,
-    PaymentsIncrementalAuthorizationRequest, PaymentsManualUpdateRequest, PaymentsRedirectRequest,
+    PaymentsIncrementalAuthorizationRequest, PaymentsManualUpdateRequest,


@SanchithHegde what do you think about such re exports? This adds friction when a developer is trying to move his way to from where and how this struct has been imported. In my opinion we should always qualify specific imports from the parent module. This might take some time, but I think it will be better to move away from this.

I believe this was kept this way when we moved out API models to a separate crate, to reduce the number of changes elsewhere in code. But yeah, I think we should avoid such public re-exports.

Of course, this can be taken up in a separate PR.

sai-harsha-vardhan · 2024-10-15T06:25:54Z

crates/router/src/core/payments/operations/payment_response.rs

+                    .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;
+                payment_data.payment_attempt = updated_payment_attempt;
+            }
+            Err(_) => {


We can't ignore errors here, we should send back the relevant error code and error message back in the response

sai-harsha-vardhan · 2024-10-15T06:27:31Z

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

+            .shipping_cost
+            .unwrap_or_default();
+        // amount here would include amount, surcharge_amount and shipping_cost
+        let amount = payment_data.payment_intent.amount + shipping_cost + surcharge_amount;


Yes, that is the ideal way. We can introduce net_amount in intent domain models.

sai-harsha-vardhan · 2024-10-15T06:36:38Z

crates/hyperswitch_domain_models/src/router_request_types.rs

@@ -71,6 +71,18 @@ pub struct PaymentsAuthorizeData {
    /// In case the connector supports only one reference id, Hyperswitch's Payment ID will be sent as reference.
    pub merchant_order_reference_id: Option<String>,
    pub integrity_object: Option<AuthoriseIntegrityObject>,
+    pub connector_transaction_id: Option<String>,


This is not required anymore

sai-harsha-vardhan · 2024-10-15T06:38:04Z

crates/openapi/src/openapi_v2.rs

@@ -579,6 +579,8 @@ Never share your secret api keys. Keep them guarded and secure.
        api_models::payments::PaymentsDynamicTaxCalculationRequest,
        api_models::payments::PaymentsDynamicTaxCalculationResponse,
        api_models::payments::DisplayAmountOnSdk,
+        api_models::payments::PaymentsPostSessionTokensRequest,


If we are not adding the route, please remove the req / res structs from openapi_v2

sai-harsha-vardhan · 2024-10-15T06:41:09Z

crates/router/src/connector/paypal.rs

+        event_builder: Option<&mut ConnectorEvent>,
+        res: Response,
+    ) -> CustomResult<types::PaymentsPostSessionTokensRouterData, errors::ConnectorError> {
+        let response: paypal::PaypalRedirectResponse = res


This should be PaypalOrdersResponse instead of PaypalRedirectResponse right?

The response which get for PaypaSdk Create Order , matches the struct PaypalRedirectResponse.

sai-harsha-vardhan · 2024-10-15T06:59:39Z

crates/router/src/core/payments/flows/session_flow.rs

@@ -955,7 +955,7 @@ fn create_paypal_sdk_session_token(
                    connector: connector.connector_name.to_string(),
                    session_token: paypal_sdk_data.data.client_id,
                    sdk_next_action: payment_types::SdkNextAction {
-                        next_action: payment_types::NextActionCall::Confirm,
+                        next_action: payment_types::NextActionCall::PostSessionTokens,


These changes can only go after SDK deployment right?
Due to this flow change, it would be backward incompatible. How would we handle staggered deployment here? @Narayanbhat166 @swangi-kumari

Yes, this will go in sandbox after SDK sandbox deployment.

Yes, this will go in sandbox after SDK sandbox deployment.

What's our strategy for production rollout of this change, would it be rolled out after SDK deployment on production as well?

sai-harsha-vardhan · 2024-10-15T07:01:45Z

crates/router/src/core/payments/operations/payment_post_session_tokens.rs

+            .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {
+                id: profile_id.get_string_repr().to_owned(),
+            })?;
+        payment_attempt.payment_method = Some(request.payment_method);


Is this change required?

Yes, this is required for routing.

sai-harsha-vardhan · 2024-10-15T07:03:02Z

crates/router/src/core/payments/operations/payment_response.rs

+        _key_store: &domain::MerchantKeyStore,
+        storage_scheme: enums::MerchantStorageScheme,
+        _locale: &Option<String>,
+        #[cfg(all(feature = "v1", feature = "dynamic_routing"))] _routable_connector: Vec<


These feature flags are redundant as we have v1 on top level

sai-harsha-vardhan · 2024-10-15T07:04:11Z

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

+        });
+        Ok(services::ApplicationResponse::JsonWithHeaders((
+            Self {
+                payment_id: payment_data.get_payment_attempt().payment_id.clone(),


You can get payment_id from payment_intent here

sai-harsha-vardhan · 2024-10-15T07:10:59Z

crates/router_env/src/logger/types.rs

@@ -498,6 +498,8 @@ pub enum Flow {
    PaymentsManualUpdate,
    /// Dynamic Tax Calcultion
    SessionUpdateTaxCalculation,
+    /// Payments create order flow


Suggested change

/// Payments create order flow

/// Payments post session tokens flow

…into create-order

SanchithHegde · 2024-10-15T11:04:37Z

crates/api_models/src/payments.rs

+    /// The unique identifier for the payment
+    #[serde(skip_deserializing)]
+    #[schema(value_type = String)]
+    pub payment_id: id_type::PaymentId,


If we're not obtaining this from the request (not deserializing it), why are we including it in the request?

This is for ApiEventMetrics and ApiLocking

@Narayanbhat166 Should we consider having an "internal" struct for such purposes, or are we okay with this practice?

SanchithHegde · 2024-10-15T11:31:28Z

crates/router/src/connector/paypal.rs

+                .url(&types::PaymentsPostSessionTokensType::get_url(
+                    self, req, connectors,
+                )?)
+                .headers(types::PaymentsPostSessionTokensType::get_headers(


Can we call attach_default_headers() as well?

SanchithHegde · 2024-10-15T11:32:29Z

crates/router/src/connector/paypal.rs

+                    .url(&types::PaymentsAuthorizeType::get_url(
+                        self, req, connectors,
+                    )?)
+                    .headers(types::PaymentsAuthorizeType::get_headers(


SanchithHegde · 2024-10-15T11:33:12Z

crates/router/src/connector/paypal/transformers.rs

+                "Payment for invoice {}",
+                item.router_data.connector_request_reference_id
+            ),
+            quantity: 1,


Any reason this is hardcoded?

Initially we had only 1 order, so we are treating whole order as single line item in order
We will discuss with with team, and refactor this in upcoming PRs.

SanchithHegde · 2024-10-15T11:35:03Z

crates/router/src/core/payments/flows/session_flow.rs

@@ -955,7 +955,7 @@ fn create_paypal_sdk_session_token(
                    connector: connector.connector_name.to_string(),
                    session_token: paypal_sdk_data.data.client_id,
                    sdk_next_action: payment_types::SdkNextAction {
-                        next_action: payment_types::NextActionCall::Confirm,
+                        next_action: payment_types::NextActionCall::PostSessionTokens,


Yes, this will go in sandbox after SDK sandbox deployment.

What's our strategy for production rollout of this change, would it be rolled out after SDK deployment on production as well?

SanchithHegde · 2024-10-15T11:41:52Z

crates/router/src/types/api/payments.rs

@@ -9,7 +9,8 @@ pub use api_models::payments::{
    PaymentsApproveRequest, PaymentsCancelRequest, PaymentsCaptureRequest,
    PaymentsCompleteAuthorizeRequest, PaymentsDynamicTaxCalculationRequest,
    PaymentsDynamicTaxCalculationResponse, PaymentsExternalAuthenticationRequest,
-    PaymentsIncrementalAuthorizationRequest, PaymentsManualUpdateRequest, PaymentsRedirectRequest,
+    PaymentsIncrementalAuthorizationRequest, PaymentsManualUpdateRequest,


I believe this was kept this way when we moved out API models to a separate crate, to reduce the number of changes elsewhere in code. But yeah, I think we should avoid such public re-exports.

Of course, this can be taken up in a separate PR.

swangi-kumari · 2024-10-15T12:23:09Z

What's our strategy for production rollout of this change, would it be rolled out after SDK deployment on production as well?
Yes we will have SDK production deployment first.

Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>

feat: add order_create_endpoint

0265c1d

swangi-kumari and others added 3 commits October 3, 2024 22:12

refactor: paypal sdk via create order

e343022

refactor: merge main

bae1ed8

docs(openapi): re-generate OpenAPI specification

3eea57a

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

swangi-kumari self-assigned this Oct 4, 2024

swangi-kumari and others added 8 commits October 7, 2024 13:27

feat: post update tracker for craete order

97b7104

Merge branch 'create-order' of https://github.com/juspay/hyperswitch …

902b799

…into create-order

refactor: next action

1cd705b

docs(openapi): re-generate OpenAPI specification

1e258a8

Merge branch 'main' into create-order

99a03bf

refactor: some refactor

6071f12

refactor: rename to post_session_tokens

1563a0b

docs(openapi): re-generate OpenAPI specification

990a535

swangi-kumari added A-connector-integration Area: Connector integration A-core Area: Core flows C-feature Category: Feature request or enhancement C-refactor Category: Refactor labels Oct 8, 2024

swangi-kumari and others added 11 commits October 8, 2024 13:31

refactor: status of paymene attempt

abf5f65

refactor: refactor post_update_trackers

bfe5bec

refactor: add dynamic fields

5aa4a7a

refactor: paypal paymnet succeeded

7235dac

Merge branch 'main' of https://github.com/juspay/hyperswitch into cre…

2bda2ef

…ate-order

refactor: mereg main

5b57ae3

chore: run formatter

f4cd68f

refactor: formating

6b14707

Merge branch 'create-order' of https://github.com/juspay/hyperswitch …

5a0b776

…into create-order

Merge branch 'main' into create-order

6b3fcc0

refactor: solve clippy

1f152c1

refactor: open api

04b3afe

swangi-kumari changed the title ~~feat(core): add payments post_session_update flow~~ feat(core): add payments post_session_tokens flow Oct 14, 2024

Narayanbhat166 requested changes Oct 14, 2024

View reviewed changes

Narayanbhat166 reviewed Oct 14, 2024

View reviewed changes

deepanshu-iiitu requested changes Oct 14, 2024

View reviewed changes

swangi-kumari and others added 3 commits October 14, 2024 20:14

refactor: store connector_transaction_id in connector_metadata

ebf6d43

docs(openapi): re-generate OpenAPI specification

e88f86e

Merge branch 'main' into create-order

5a2f0f1

Narayanbhat166 reviewed Oct 15, 2024

View reviewed changes

sai-harsha-vardhan reviewed Oct 15, 2024

View reviewed changes

swangi-kumari and others added 5 commits October 15, 2024 15:01

refactor: resolve comments

6117ddf

docs(openapi): re-generate OpenAPI specification

d34a704

refactor: add status

2976976

Merge branch 'create-order' of https://github.com/juspay/hyperswitch …

7a68862

…into create-order

docs(openapi): re-generate OpenAPI specification

d3da258

sai-harsha-vardhan approved these changes Oct 15, 2024

View reviewed changes

Narayanbhat166 approved these changes Oct 15, 2024

View reviewed changes

deepanshu-iiitu approved these changes Oct 15, 2024

View reviewed changes

tsdk02 approved these changes Oct 15, 2024

View reviewed changes

apoorvdixit88 approved these changes Oct 15, 2024

View reviewed changes

SanchithHegde reviewed Oct 15, 2024

View reviewed changes

SanchithHegde approved these changes Oct 15, 2024

View reviewed changes

bernard-eugine merged commit 53e82c3 into main Oct 15, 2024
22 of 25 checks passed

bernard-eugine deleted the create-order branch October 15, 2024 12:59

swangi-kumari mentioned this pull request Oct 15, 2024

feat(core): add payments post_session_tokens flow #6325

Closed

14 tasks

swangi-kumari added a commit that referenced this pull request Oct 15, 2024

feat(core): add payments post_session_tokens flow (#6202)

d84e7d0

Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>

swangi-kumari mentioned this pull request Oct 15, 2024

feat(core): add payments post_session_tokens flow #6326

Merged

14 tasks

swangi-kumari added a commit that referenced this pull request Oct 17, 2024

feat(core): add payments post_session_tokens flow (#6202)

6745dc6

Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>

swangi-kumari mentioned this pull request Oct 17, 2024

feat(core): add payments post_session_tokens flow #6346

Merged

14 tasks

	/// Payments create order flow
	/// Payments post session tokens flow

feat(core): add payments post_session_tokens flow #6202

feat(core): add payments post_session_tokens flow #6202

Conversation

swangi-kumari commented Oct 2, 2024 • edited Loading

Type of Change

Description

Additional Changes

Motivation and Context

How did you test it?

Checklist

semanticdiff-com bot commented Oct 2, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sai-harsha-vardhan Oct 15, 2024 • edited Loading

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

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

swangi-kumari Oct 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

swangi-kumari commented Oct 15, 2024

swangi-kumari commented Oct 2, 2024 •

edited

Loading

semanticdiff-com bot commented Oct 2, 2024 •

edited

Loading

sai-harsha-vardhan Oct 15, 2024 •

edited

Loading

swangi-kumari Oct 15, 2024 •

edited

Loading