File size: 193,131 Bytes
e80f97d | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 | {
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db",
"pr_number": 10080,
"rust_files": [
"crates/common_utils/src/access_token.rs",
"crates/common_utils/src/id_type/merchant.rs",
"crates/common_utils/src/lib.rs",
"crates/hyperswitch_connectors/src/connectors/santander.rs",
"crates/hyperswitch_interfaces/src/api.rs",
"crates/hyperswitch_interfaces/src/connector_integration_interface.rs",
"crates/hyperswitch_interfaces/src/connector_integration_v2.rs",
"crates/router/src/core/payments.rs",
"crates/router/src/core/payments/access_token.rs",
"crates/router/src/core/payments/retry.rs",
"crates/router/src/core/payouts/access_token.rs",
"crates/router/src/core/unified_connector_service.rs",
"crates/router/src/db/kafka_store.rs",
"crates/router/src/db/merchant_connector_account.rs"
],
"diffs": [
{
"id": "crates/router/src/core/payments/retry.rs::function::do_retry",
"file": "crates/router/src/core/payments/retry.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "pub async fn do_retry<'a, F, ApiRequest, FData, D>(\n state: &'a routes::SessionState,\n req_state: ReqState,\n connector: &'a api::ConnectorData,\n operation: &'a operations::BoxedOperation<'a, F, ApiRequest, D>,\n customer: &'a Option<domain::Customer>,\n merchant_context: &domain::MerchantContext,\n payment_data: &'a mut D,\n router_data: types::RouterData<F, FData, types::PaymentsResponseData>,\n validate_result: &operations::ValidateResult,\n schedule_time: Option<time::PrimitiveDateTime>,\n is_step_up: bool,\n frm_suggestion: Option<storage_enums::FrmSuggestion>,\n business_profile: &domain::Profile,\n should_retry_with_pan: bool,\n routing_decision: Option<routing_helpers::RoutingDecisionData>,\n) -> RouterResult<types::RouterData<F, FData, types::PaymentsResponseData>>\nwhere\n F: Clone + Send + Sync + 'static,\n FData: Send + Sync + types::Capturable + Clone + 'static + serde::Serialize,\n payments::PaymentResponse: operations::Operation<F, FData>,\n D: payments::OperationSessionGetters<F>\n + payments::OperationSessionSetters<F>\n + Send\n + Sync\n + Clone,\n D: ConstructFlowSpecificData<F, FData, types::PaymentsResponseData>,\n types::RouterData<F, FData, types::PaymentsResponseData>: Feature<F, FData>,\n dyn api::Connector: services::api::ConnectorIntegration<F, FData, types::PaymentsResponseData>,\n{\n metrics::AUTO_RETRY_PAYMENT_COUNT.add(1, &[]);\n\n modify_trackers(\n state,\n connector.connector_name.to_string(),\n payment_data,\n merchant_context.get_merchant_key_store(),\n merchant_context.get_merchant_account().storage_scheme,\n router_data,\n is_step_up,\n )\n .await?;\n\n let (merchant_connector_account, router_data, tokenization_action) =\n payments::call_connector_service_prerequisites(\n state,\n merchant_context,\n connector.clone(),\n operation,\n payment_data,\n customer,\n validate_result,\n business_profile,\n should_retry_with_pan,\n routing_decision,\n )\n .await?;\n\n let (router_data, _mca) = payments::decide_unified_connector_service_call(\n state,\n req_state,\n merchant_context,\n connector.clone(),\n operation,\n payment_data,\n customer,\n payments::CallConnectorAction::Trigger,\n None,\n validate_result,\n schedule_time,\n hyperswitch_domain_models::payments::HeaderPayload::default(),\n frm_suggestion,\n business_profile,\n true,\n None,\n merchant_connector_account,\n router_data,\n tokenization_action,\n )\n .await?;\n\n Ok(router_data)\n}",
"after_code": "pub async fn do_retry<'a, F, ApiRequest, FData, D>(\n state: &'a routes::SessionState,\n req_state: ReqState,\n connector: &'a api::ConnectorData,\n operation: &'a operations::BoxedOperation<'a, F, ApiRequest, D>,\n customer: &'a Option<domain::Customer>,\n merchant_context: &domain::MerchantContext,\n payment_data: &'a mut D,\n router_data: types::RouterData<F, FData, types::PaymentsResponseData>,\n validate_result: &operations::ValidateResult,\n schedule_time: Option<time::PrimitiveDateTime>,\n is_step_up: bool,\n frm_suggestion: Option<storage_enums::FrmSuggestion>,\n business_profile: &domain::Profile,\n should_retry_with_pan: bool,\n routing_decision: Option<routing_helpers::RoutingDecisionData>,\n) -> RouterResult<types::RouterData<F, FData, types::PaymentsResponseData>>\nwhere\n F: Clone + Send + Sync + std::fmt::Debug + 'static,\n FData: Send + Sync + types::Capturable + Clone + 'static + serde::Serialize,\n payments::PaymentResponse: operations::Operation<F, FData>,\n D: payments::OperationSessionGetters<F>\n + payments::OperationSessionSetters<F>\n + Send\n + Sync\n + Clone,\n D: ConstructFlowSpecificData<F, FData, types::PaymentsResponseData>,\n types::RouterData<F, FData, types::PaymentsResponseData>: Feature<F, FData>,\n dyn api::Connector: services::api::ConnectorIntegration<F, FData, types::PaymentsResponseData>,\n{\n metrics::AUTO_RETRY_PAYMENT_COUNT.add(1, &[]);\n\n modify_trackers(\n state,\n connector.connector_name.to_string(),\n payment_data,\n merchant_context.get_merchant_key_store(),\n merchant_context.get_merchant_account().storage_scheme,\n router_data,\n is_step_up,\n )\n .await?;\n\n let (merchant_connector_account, router_data, tokenization_action) =\n payments::call_connector_service_prerequisites(\n state,\n merchant_context,\n connector.clone(),\n operation,\n payment_data,\n customer,\n validate_result,\n business_profile,\n should_retry_with_pan,\n routing_decision,\n )\n .await?;\n\n let (router_data, _mca) = payments::decide_unified_connector_service_call(\n state,\n req_state,\n merchant_context,\n connector.clone(),\n operation,\n payment_data,\n customer,\n payments::CallConnectorAction::Trigger,\n None,\n validate_result,\n schedule_time,\n hyperswitch_domain_models::payments::HeaderPayload::default(),\n frm_suggestion,\n business_profile,\n true,\n None,\n merchant_connector_account,\n router_data,\n tokenization_action,\n )\n .await?;\n\n Ok(router_data)\n}",
"diff_span": {
"before": ") -> RouterResult<types::RouterData<F, FData, types::PaymentsResponseData>>\nwhere\n F: Clone + Send + Sync + 'static,\n FData: Send + Sync + types::Capturable + Clone + 'static + serde::Serialize,\n payments::PaymentResponse: operations::Operation<F, FData>,",
"after": ") -> RouterResult<types::RouterData<F, FData, types::PaymentsResponseData>>\nwhere\n F: Clone + Send + Sync + std::fmt::Debug + 'static,\n FData: Send + Sync + types::Capturable + Clone + 'static + serde::Serialize,\n payments::PaymentResponse: operations::Operation<F, FData>,"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/hyperswitch_interfaces/src/connector_integration_interface.rs::ConnectorEnum::function::get_access_token_suffix_from_connector",
"file": "crates/hyperswitch_interfaces/src/connector_integration_interface.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n match self {\n Self::Old(connector) => connector.get_access_token_suffix_from_connector(router_data),\n Self::New(connector) => connector.get_access_token_suffix_from_connector(router_data),\n }\n }",
"after_code": "fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n match self {\n Self::Old(connector) => connector.get_access_token_suffix_from_connector(\n router_data,\n merchant_connector_id_or_connector_name,\n ),\n Self::New(connector) => connector.get_access_token_suffix_from_connector(\n router_data,\n merchant_connector_id_or_connector_name,\n ),\n }\n }",
"diff_span": {
"before": " &self,\n router_data: &RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n match self {\n Self::Old(connector) => connector.get_access_token_suffix_from_connector(router_data),\n Self::New(connector) => connector.get_access_token_suffix_from_connector(router_data),\n }\n }",
"after": " &self,\n router_data: &RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n match self {\n Self::Old(connector) => connector.get_access_token_suffix_from_connector(\n router_data,\n merchant_connector_id_or_connector_name,\n ),\n Self::New(connector) => connector.get_access_token_suffix_from_connector(\n router_data,\n merchant_connector_id_or_connector_name,\n ),\n }\n }"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/hyperswitch_connectors/src/connectors/santander.rs::impl::Santander",
"file": "crates/hyperswitch_connectors/src/connectors/santander.rs",
"kind": "impl_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "impl ConnectorAccessTokenSuffix for Santander {\n fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(router_data\n .payment_method_type\n .as_ref()\n .map(|pmt| pmt.to_string()))\n }\n}",
"after_code": "impl ConnectorAccessTokenSuffix for Santander {\n fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n let key_suffix = router_data\n .payment_method_type\n .as_ref()\n .map(|pmt| pmt.to_string());\n\n match key_suffix {\n Some(key) => Ok(format!(\n \"access_token_{}_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name,\n key\n )),\n None => Ok(format!(\n \"access_token_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n )),\n }\n }\n}",
"diff_span": {
"before": " &self,\n router_data: &RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(router_data\n .payment_method_type\n .as_ref()\n .map(|pmt| pmt.to_string()))\n }\n}",
"after": " &self,\n router_data: &RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n let key_suffix = router_data\n .payment_method_type\n .as_ref()\n .map(|pmt| pmt.to_string());\n\n match key_suffix {\n Some(key) => Ok(format!(\n \"access_token_{}_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name,\n key\n )),\n None => Ok(format!(\n \"access_token_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n )),\n }\n }\n}"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/core/unified_connector_service.rs::function::set_access_token_for_ucs",
"file": "crates/router/src/core/unified_connector_service.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "pub async fn set_access_token_for_ucs(\n state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n access_token: AccessToken,\n merchant_connector_id: Option<&id_type::MerchantConnectorAccountId>,\n creds_identifier: Option<String>,\n) -> Result<(), errors::StorageError> {\n let merchant_id = merchant_context.get_merchant_account().get_id();\n\n let merchant_connector_id_or_connector_name = merchant_connector_id\n .map(|mca_id| mca_id.get_string_repr().to_string())\n .or(creds_identifier.map(|id| id.to_string()))\n .unwrap_or(connector_name.to_string());\n\n let modified_access_token = AccessToken {\n expires: access_token\n .expires\n .saturating_sub(consts::REDUCE_ACCESS_TOKEN_EXPIRY_TIME.into()),\n ..access_token\n };\n\n logger::debug!(\n access_token_expiry_after_modification = modified_access_token.expires,\n merchant_id = ?merchant_id,\n connector_name = connector_name,\n merchant_connector_id_or_connector_name = merchant_connector_id_or_connector_name\n );\n\n if let Err(access_token_set_error) = state\n .store\n .set_access_token(\n merchant_id,\n &merchant_connector_id_or_connector_name,\n modified_access_token,\n None,\n )\n .await\n {\n // If we are not able to set the access token in redis, the error should just be logged and proceed with the payment\n // Payments should not fail, once the access token is successfully created\n // The next request will create new access token, if required\n logger::error!(access_token_set_error=?access_token_set_error, \"Failed to store UCS access token\");\n }\n\n Ok(())\n}",
"after_code": "pub async fn set_access_token_for_ucs(\n state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n access_token: AccessToken,\n merchant_connector_id: Option<&id_type::MerchantConnectorAccountId>,\n creds_identifier: Option<String>,\n) -> Result<(), errors::StorageError> {\n let merchant_id = merchant_context.get_merchant_account().get_id();\n\n let merchant_connector_id_or_connector_name = merchant_connector_id\n .map(|mca_id| mca_id.get_string_repr().to_string())\n .or(creds_identifier.map(|id| id.to_string()))\n .unwrap_or(connector_name.to_string());\n\n let key = format!(\n \"access_token_{}_{}\",\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n );\n\n let modified_access_token = AccessToken {\n expires: access_token\n .expires\n .saturating_sub(consts::REDUCE_ACCESS_TOKEN_EXPIRY_TIME.into()),\n ..access_token\n };\n\n logger::debug!(\n access_token_expiry_after_modification = modified_access_token.expires,\n merchant_id = ?merchant_id,\n connector_name = connector_name,\n merchant_connector_id_or_connector_name = merchant_connector_id_or_connector_name\n );\n\n if let Err(access_token_set_error) = state\n .store\n .set_access_token(\n key,\n // merchant_id,\n // &merchant_connector_id_or_connector_name,\n modified_access_token,\n // None,\n )\n .await\n {\n // If we are not able to set the access token in redis, the error should just be logged and proceed with the payment\n // Payments should not fail, once the access token is successfully created\n // The next request will create new access token, if required\n logger::error!(access_token_set_error=?access_token_set_error, \"Failed to store UCS access token\");\n }\n\n Ok(())\n}",
"diff_span": {
"before": " .store\n .set_access_token(\n merchant_id,\n &merchant_connector_id_or_connector_name,\n modified_access_token,\n None,\n )\n .await",
"after": " .or(creds_identifier.map(|id| id.to_string()))\n .unwrap_or(connector_name.to_string());\n\n let key = format!(\n \"access_token_{}_{}\",\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n );\n\n let modified_access_token = AccessToken {\n expires: access_token\n .expires\n .saturating_sub(consts::REDUCE_ACCESS_TOKEN_EXPIRY_TIME.into()),\n ..access_token\n };\n\n logger::debug!(\n access_token_expiry_after_modification = modified_access_token.expires,\n merchant_id = ?merchant_id,\n connector_name = connector_name,\n merchant_connector_id_or_connector_name = merchant_connector_id_or_connector_name\n );\n\n if let Err(access_token_set_error) = state\n .store\n .set_access_token(\n key,\n // merchant_id,\n // &merchant_connector_id_or_connector_name,\n modified_access_token,\n // None,\n )\n .await"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/db/merchant_connector_account.rs::MockDb::function::get_access_token",
"file": "crates/router/src/db/merchant_connector_account.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "async fn get_access_token(\n &self,\n _merchant_id: &common_utils::id_type::MerchantId,\n _merchant_connector_id_or_connector_name: &str,\n _access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n Ok(None)\n }",
"after_code": "async fn get_access_token(\n &self,\n _key: String,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n Ok(None)\n }",
"diff_span": {
"before": "async fn get_access_token(\n &self,\n _merchant_id: &common_utils::id_type::MerchantId,\n _merchant_connector_id_or_connector_name: &str,\n _access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n Ok(None)",
"after": "async fn get_access_token(\n &self,\n _key: String,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n Ok(None)"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/core/payments/access_token.rs::function::add_access_token",
"file": "crates/router/src/core/payments/access_token.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "pub async fn add_access_token<\n F: Clone + 'static,\n Req: Debug + Clone + 'static,\n Res: Debug + Clone + 'static,\n>(\n state: &SessionState,\n connector: &api_types::ConnectorData,\n router_data: &types::RouterData<F, Req, Res>,\n creds_identifier: Option<&str>,\n) -> RouterResult<types::AddAccessTokenResult> {\n if connector\n .connector_name\n .supports_access_token(router_data.payment_method)\n {\n let merchant_id = &router_data.merchant_id;\n let store = &*state.store;\n\n // `merchant_connector_id` may not be present in the below cases\n // - when straight through routing is used without passing the `merchant_connector_id`\n // - when creds identifier is passed\n //\n // In these cases fallback to `connector_name`.\n // We cannot use multiple merchant connector account in these cases\n let merchant_connector_id_or_connector_name = connector\n .merchant_connector_id\n .clone()\n .map(|mca_id| mca_id.get_string_repr().to_string())\n .or(creds_identifier.map(|id| id.to_string()))\n .unwrap_or(connector.connector_name.to_string());\n\n let key_suffix = connector\n .connector\n .get_access_token_suffix_from_connector(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let old_access_token = store\n .get_access_token(\n merchant_id,\n &merchant_connector_id_or_connector_name,\n key_suffix.clone(),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when accessing the access token\")?;\n\n let res = match old_access_token {\n Some(access_token) => {\n router_env::logger::debug!(\n \"Access token found in redis for merchant_id: {:?}, payment_id: {:?}, connector: {} which has expiry of: {} seconds\",\n merchant_id,\n router_data.payment_id,\n connector.connector_name,\n access_token.expires\n );\n metrics::ACCESS_TOKEN_CACHE_HIT.add(\n 1,\n router_env::metric_attributes!((\n \"connector\",\n connector.connector_name.to_string()\n )),\n );\n Ok(Some(access_token))\n }\n None => {\n metrics::ACCESS_TOKEN_CACHE_MISS.add(\n 1,\n router_env::metric_attributes!((\n \"connector\",\n connector.connector_name.to_string()\n )),\n );\n\n let authentication_token =\n execute_authentication_token(state, connector, router_data).await?;\n\n let cloned_router_data = router_data.clone();\n\n let refresh_token_request_data = types::AccessTokenRequestData::try_from((\n router_data.connector_auth_type.clone(),\n authentication_token,\n ))\n .attach_printable(\n \"Could not create access token request, invalid connector account credentials\",\n )?;\n\n let refresh_token_response_data: Result<types::AccessToken, types::ErrorResponse> =\n Err(types::ErrorResponse::default());\n let refresh_token_router_data = payments::helpers::router_data_type_conversion::<\n _,\n api_types::AccessTokenAuth,\n _,\n _,\n _,\n _,\n >(\n cloned_router_data,\n refresh_token_request_data,\n refresh_token_response_data,\n );\n refresh_connector_auth(state, connector, &refresh_token_router_data)\n .await?\n .async_map(|access_token| async move {\n let store = &*state.store;\n\n // The expiry should be adjusted for network delays from the connector\n // The access token might not have been expired when request is sent\n // But once it reaches the connector, it might expire because of the network delay\n // Subtract few seconds from the expiry in order to account for these network delays\n // This will reduce the expiry time by `REDUCE_ACCESS_TOKEN_EXPIRY_TIME` seconds\n let modified_access_token_with_expiry = types::AccessToken {\n expires: access_token\n .expires\n .saturating_sub(consts::REDUCE_ACCESS_TOKEN_EXPIRY_TIME.into()),\n ..access_token\n };\n\n logger::debug!(\n access_token_expiry_after_modification =\n modified_access_token_with_expiry.expires\n );\n\n if let Err(access_token_set_error) = store\n .set_access_token(\n merchant_id,\n &merchant_connector_id_or_connector_name,\n modified_access_token_with_expiry.clone(),\n key_suffix.clone(),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when setting the access token\")\n {\n // If we are not able to set the access token in redis, the error should just be logged and proceed with the payment\n // Payments should not fail, once the access token is successfully created\n // The next request will create new access token, if required\n logger::error!(access_token_set_error=?access_token_set_error);\n }\n Some(modified_access_token_with_expiry)\n })\n .await\n }\n };\n\n Ok(types::AddAccessTokenResult {\n access_token_result: res,\n connector_supports_access_token: true,\n })\n } else {\n Ok(types::AddAccessTokenResult {\n access_token_result: Err(types::ErrorResponse::default()),\n connector_supports_access_token: false,\n })\n }\n}",
"after_code": "pub async fn add_access_token<\n F: Clone + 'static,\n Req: Debug + Clone + 'static,\n Res: Debug + Clone + 'static,\n>(\n state: &SessionState,\n connector: &api_types::ConnectorData,\n router_data: &types::RouterData<F, Req, Res>,\n creds_identifier: Option<&str>,\n) -> RouterResult<types::AddAccessTokenResult> {\n if connector\n .connector_name\n .supports_access_token(router_data.payment_method)\n {\n let merchant_id = &router_data.merchant_id;\n let store = &*state.store;\n\n // `merchant_connector_id` may not be present in the below cases\n // - when straight through routing is used without passing the `merchant_connector_id`\n // - when creds identifier is passed\n //\n // In these cases fallback to `connector_name`.\n // We cannot use multiple merchant connector account in these cases\n let merchant_connector_id_or_connector_name = connector\n .merchant_connector_id\n .clone()\n .map(|mca_id| mca_id.get_string_repr().to_string())\n .or(creds_identifier.map(|id| id.to_string()))\n .unwrap_or(connector.connector_name.to_string());\n\n let key = connector\n .connector\n .get_access_token_suffix_from_connector(\n router_data,\n merchant_connector_id_or_connector_name,\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let old_access_token = store\n .get_access_token(key.clone())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when accessing the access token\")?;\n\n let res = match old_access_token {\n Some(access_token) => {\n router_env::logger::debug!(\n \"Access token found in redis for merchant_id: {:?}, payment_id: {:?}, connector: {} which has expiry of: {} seconds\",\n merchant_id,\n router_data.payment_id,\n connector.connector_name,\n access_token.expires\n );\n metrics::ACCESS_TOKEN_CACHE_HIT.add(\n 1,\n router_env::metric_attributes!((\n \"connector\",\n connector.connector_name.to_string()\n )),\n );\n Ok(Some(access_token))\n }\n None => {\n metrics::ACCESS_TOKEN_CACHE_MISS.add(\n 1,\n router_env::metric_attributes!((\n \"connector\",\n connector.connector_name.to_string()\n )),\n );\n\n let authentication_token =\n execute_authentication_token(state, connector, router_data).await?;\n\n let cloned_router_data = router_data.clone();\n\n let refresh_token_request_data = types::AccessTokenRequestData::try_from((\n router_data.connector_auth_type.clone(),\n authentication_token,\n ))\n .attach_printable(\n \"Could not create access token request, invalid connector account credentials\",\n )?;\n\n let refresh_token_response_data: Result<types::AccessToken, types::ErrorResponse> =\n Err(types::ErrorResponse::default());\n let refresh_token_router_data = payments::helpers::router_data_type_conversion::<\n _,\n api_types::AccessTokenAuth,\n _,\n _,\n _,\n _,\n >(\n cloned_router_data,\n refresh_token_request_data,\n refresh_token_response_data,\n );\n refresh_connector_auth(state, connector, &refresh_token_router_data)\n .await?\n .async_map(|access_token| async move {\n let store = &*state.store;\n\n // The expiry should be adjusted for network delays from the connector\n // The access token might not have been expired when request is sent\n // But once it reaches the connector, it might expire because of the network delay\n // Subtract few seconds from the expiry in order to account for these network delays\n // This will reduce the expiry time by `REDUCE_ACCESS_TOKEN_EXPIRY_TIME` seconds\n let modified_access_token_with_expiry = types::AccessToken {\n expires: access_token\n .expires\n .saturating_sub(consts::REDUCE_ACCESS_TOKEN_EXPIRY_TIME.into()),\n ..access_token\n };\n\n logger::debug!(\n access_token_expiry_after_modification =\n modified_access_token_with_expiry.expires\n );\n\n if let Err(access_token_set_error) = store\n .set_access_token(\n key.clone(),\n modified_access_token_with_expiry.clone(),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when setting the access token\")\n {\n // If we are not able to set the access token in redis, the error should just be logged and proceed with the payment\n // Payments should not fail, once the access token is successfully created\n // The next request will create new access token, if required\n logger::error!(access_token_set_error=?access_token_set_error);\n }\n Some(modified_access_token_with_expiry)\n })\n .await\n }\n };\n\n Ok(types::AddAccessTokenResult {\n access_token_result: res,\n connector_supports_access_token: true,\n })\n } else {\n Ok(types::AddAccessTokenResult {\n access_token_result: Err(types::ErrorResponse::default()),\n connector_supports_access_token: false,\n })\n }\n}",
"diff_span": {
"before": " .unwrap_or(connector.connector_name.to_string());\n\n let key_suffix = connector\n .connector\n .get_access_token_suffix_from_connector(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let old_access_token = store\n .get_access_token(\n merchant_id,\n &merchant_connector_id_or_connector_name,\n key_suffix.clone(),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when accessing the access token\")?;\n\n let res = match old_access_token {\n Some(access_token) => {\n router_env::logger::debug!(\n \"Access token found in redis for merchant_id: {:?}, payment_id: {:?}, connector: {} which has expiry of: {} seconds\",\n merchant_id,\n router_data.payment_id,\n connector.connector_name,\n access_token.expires\n );\n metrics::ACCESS_TOKEN_CACHE_HIT.add(\n 1,\n router_env::metric_attributes!((\n \"connector\",\n connector.connector_name.to_string()\n )),\n );\n Ok(Some(access_token))\n }\n None => {\n metrics::ACCESS_TOKEN_CACHE_MISS.add(\n 1,\n router_env::metric_attributes!((\n \"connector\",\n connector.connector_name.to_string()\n )),\n );\n\n let authentication_token =\n execute_authentication_token(state, connector, router_data).await?;\n\n let cloned_router_data = router_data.clone();\n\n let refresh_token_request_data = types::AccessTokenRequestData::try_from((\n router_data.connector_auth_type.clone(),\n authentication_token,\n ))\n .attach_printable(\n \"Could not create access token request, invalid connector account credentials\",\n )?;\n\n let refresh_token_response_data: Result<types::AccessToken, types::ErrorResponse> =\n Err(types::ErrorResponse::default());\n let refresh_token_router_data = payments::helpers::router_data_type_conversion::<\n _,\n api_types::AccessTokenAuth,\n _,\n _,\n _,\n _,\n >(\n cloned_router_data,\n refresh_token_request_data,\n refresh_token_response_data,\n );\n refresh_connector_auth(state, connector, &refresh_token_router_data)\n .await?\n .async_map(|access_token| async move {\n let store = &*state.store;\n\n // The expiry should be adjusted for network delays from the connector\n // The access token might not have been expired when request is sent\n // But once it reaches the connector, it might expire because of the network delay\n // Subtract few seconds from the expiry in order to account for these network delays\n // This will reduce the expiry time by `REDUCE_ACCESS_TOKEN_EXPIRY_TIME` seconds\n let modified_access_token_with_expiry = types::AccessToken {\n expires: access_token\n .expires\n .saturating_sub(consts::REDUCE_ACCESS_TOKEN_EXPIRY_TIME.into()),\n ..access_token\n };\n\n logger::debug!(\n access_token_expiry_after_modification =\n modified_access_token_with_expiry.expires\n );\n\n if let Err(access_token_set_error) = store\n .set_access_token(\n merchant_id,\n &merchant_connector_id_or_connector_name,\n modified_access_token_with_expiry.clone(),\n key_suffix.clone(),\n )\n .await",
"after": " .unwrap_or(connector.connector_name.to_string());\n\n let key = connector\n .connector\n .get_access_token_suffix_from_connector(\n router_data,\n merchant_connector_id_or_connector_name,\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let old_access_token = store\n .get_access_token(key.clone())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when accessing the access token\")?;\n\n let res = match old_access_token {\n Some(access_token) => {\n router_env::logger::debug!(\n \"Access token found in redis for merchant_id: {:?}, payment_id: {:?}, connector: {} which has expiry of: {} seconds\",\n merchant_id,\n router_data.payment_id,\n connector.connector_name,\n access_token.expires\n );\n metrics::ACCESS_TOKEN_CACHE_HIT.add(\n 1,\n router_env::metric_attributes!((\n \"connector\",\n connector.connector_name.to_string()\n )),\n );\n Ok(Some(access_token))\n }\n None => {\n metrics::ACCESS_TOKEN_CACHE_MISS.add(\n 1,\n router_env::metric_attributes!((\n \"connector\",\n connector.connector_name.to_string()\n )),\n );\n\n let authentication_token =\n execute_authentication_token(state, connector, router_data).await?;\n\n let cloned_router_data = router_data.clone();\n\n let refresh_token_request_data = types::AccessTokenRequestData::try_from((\n router_data.connector_auth_type.clone(),\n authentication_token,\n ))\n .attach_printable(\n \"Could not create access token request, invalid connector account credentials\",\n )?;\n\n let refresh_token_response_data: Result<types::AccessToken, types::ErrorResponse> =\n Err(types::ErrorResponse::default());\n let refresh_token_router_data = payments::helpers::router_data_type_conversion::<\n _,\n api_types::AccessTokenAuth,\n _,\n _,\n _,\n _,\n >(\n cloned_router_data,\n refresh_token_request_data,\n refresh_token_response_data,\n );\n refresh_connector_auth(state, connector, &refresh_token_router_data)\n .await?\n .async_map(|access_token| async move {\n let store = &*state.store;\n\n // The expiry should be adjusted for network delays from the connector\n // The access token might not have been expired when request is sent\n // But once it reaches the connector, it might expire because of the network delay\n // Subtract few seconds from the expiry in order to account for these network delays\n // This will reduce the expiry time by `REDUCE_ACCESS_TOKEN_EXPIRY_TIME` seconds\n let modified_access_token_with_expiry = types::AccessToken {\n expires: access_token\n .expires\n .saturating_sub(consts::REDUCE_ACCESS_TOKEN_EXPIRY_TIME.into()),\n ..access_token\n };\n\n logger::debug!(\n access_token_expiry_after_modification =\n modified_access_token_with_expiry.expires\n );\n\n if let Err(access_token_set_error) = store\n .set_access_token(\n key.clone(),\n modified_access_token_with_expiry.clone(),\n )"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/hyperswitch_connectors/src/connectors/santander.rs::Santander::function::get_access_token_suffix_from_connector",
"file": "crates/hyperswitch_connectors/src/connectors/santander.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(router_data\n .payment_method_type\n .as_ref()\n .map(|pmt| pmt.to_string()))\n }",
"after_code": "fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n let key_suffix = router_data\n .payment_method_type\n .as_ref()\n .map(|pmt| pmt.to_string());\n\n match key_suffix {\n Some(key) => Ok(format!(\n \"access_token_{}_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name,\n key\n )),\n None => Ok(format!(\n \"access_token_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n )),\n }\n }",
"diff_span": {
"before": " &self,\n router_data: &RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(router_data\n .payment_method_type\n .as_ref()\n .map(|pmt| pmt.to_string()))\n }",
"after": " &self,\n router_data: &RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n let key_suffix = router_data\n .payment_method_type\n .as_ref()\n .map(|pmt| pmt.to_string());\n\n match key_suffix {\n Some(key) => Ok(format!(\n \"access_token_{}_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name,\n key\n )),\n None => Ok(format!(\n \"access_token_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n )),\n }\n }"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/core/unified_connector_service.rs::function::get_access_token_from_ucs_response",
"file": "crates/router/src/core/unified_connector_service.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "pub async fn get_access_token_from_ucs_response(\n session_state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n merchant_connector_id: Option<&id_type::MerchantConnectorAccountId>,\n creds_identifier: Option<String>,\n ucs_state: Option<&unified_connector_service_client::payments::ConnectorState>,\n) -> Option<AccessToken> {\n let ucs_access_token = ucs_state\n .and_then(|state| state.access_token.as_ref())\n .map(AccessToken::foreign_from)?;\n\n let merchant_id = merchant_context.get_merchant_account().get_id();\n\n let merchant_connector_id_or_connector_name = merchant_connector_id\n .map(|mca_id| mca_id.get_string_repr().to_string())\n .or(creds_identifier.map(|id| id.to_string()))\n .unwrap_or(connector_name.to_string());\n\n if let Ok(Some(cached_token)) = session_state\n .store\n .get_access_token(merchant_id, &merchant_connector_id_or_connector_name, None)\n .await\n {\n if cached_token.token.peek() == ucs_access_token.token.peek() {\n return None;\n }\n }\n\n Some(ucs_access_token)\n}",
"after_code": "pub async fn get_access_token_from_ucs_response(\n session_state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n merchant_connector_id: Option<&id_type::MerchantConnectorAccountId>,\n creds_identifier: Option<String>,\n ucs_state: Option<&unified_connector_service_client::payments::ConnectorState>,\n) -> Option<AccessToken> {\n let ucs_access_token = ucs_state\n .and_then(|state| state.access_token.as_ref())\n .map(AccessToken::foreign_from)?;\n\n let merchant_id = merchant_context.get_merchant_account().get_id();\n\n let merchant_connector_id_or_connector_name = merchant_connector_id\n .map(|mca_id| mca_id.get_string_repr().to_string())\n .or(creds_identifier.map(|id| id.to_string()))\n .unwrap_or(connector_name.to_string());\n\n let key = format!(\n \"access_token_{}_{}\",\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n );\n\n if let Ok(Some(cached_token)) = session_state.store.get_access_token(key).await {\n if cached_token.token.peek() == ucs_access_token.token.peek() {\n return None;\n }\n }\n\n Some(ucs_access_token)\n}",
"diff_span": {
"before": " .unwrap_or(connector_name.to_string());\n\n if let Ok(Some(cached_token)) = session_state\n .store\n .get_access_token(merchant_id, &merchant_connector_id_or_connector_name, None)\n .await\n {\n if cached_token.token.peek() == ucs_access_token.token.peek() {\n return None;",
"after": " .unwrap_or(connector_name.to_string());\n\n let key = format!(\n \"access_token_{}_{}\",\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n );\n\n if let Ok(Some(cached_token)) = session_state.store.get_access_token(key).await {\n if cached_token.token.peek() == ucs_access_token.token.peek() {\n return None;"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/common_utils/src/id_type/merchant.rs::impl::MerchantId",
"file": "crates/common_utils/src/id_type/merchant.rs",
"kind": "impl_item",
"status": "modified",
"code_changed": true,
"imports_changed": true,
"before_code": "impl MerchantId {\n /// get step up enabled key\n pub fn get_step_up_enabled_key(&self) -> String {\n format!(\"step_up_enabled_{}\", self.get_string_repr())\n }\n\n /// get_max_auto_retries_enabled key\n pub fn get_max_auto_retries_enabled(&self) -> String {\n format!(\"max_auto_retries_enabled_{}\", self.get_string_repr())\n }\n\n /// get_requires_cvv_key\n pub fn get_requires_cvv_key(&self) -> String {\n format!(\"{}_requires_cvv\", self.get_string_repr())\n }\n\n /// get_pm_filters_cgraph_key\n pub fn get_pm_filters_cgraph_key(&self) -> String {\n format!(\"pm_filters_cgraph_{}\", self.get_string_repr())\n }\n\n /// get_blocklist_enabled_key\n pub fn get_blocklist_guard_key(&self) -> String {\n format!(\"guard_blocklist_for_{}\", self.get_string_repr())\n }\n\n /// get_merchant_fingerprint_secret_key\n pub fn get_merchant_fingerprint_secret_key(&self) -> String {\n format!(\"fingerprint_secret_{}\", self.get_string_repr())\n }\n\n /// get_surcharge_dsk_key\n pub fn get_surcharge_dsk_key(&self) -> String {\n format!(\"surcharge_dsl_{}\", self.get_string_repr())\n }\n\n /// get_dsk_key\n pub fn get_dsl_config(&self) -> String {\n format!(\"dsl_{}\", self.get_string_repr())\n }\n\n /// get_creds_identifier_key\n pub fn get_creds_identifier_key(&self, creds_identifier: &str) -> String {\n format!(\"mcd_{}_{creds_identifier}\", self.get_string_repr())\n }\n\n /// get_poll_id\n pub fn get_poll_id(&self, unique_id: &str) -> String {\n format!(\"poll_{}_{unique_id}\", self.get_string_repr())\n }\n\n /// get_access_token_key\n pub fn get_access_token_key(\n &self,\n merchant_connector_id_or_connector_name: impl Display,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> String {\n match access_token_key_suffix_from_connector {\n Some(key_suffix) => {\n format!(\n \"access_token_{}_{}_{}\",\n self.get_string_repr(),\n merchant_connector_id_or_connector_name,\n key_suffix\n )\n }\n None => {\n format!(\n \"access_token_{}_{}\",\n self.get_string_repr(),\n merchant_connector_id_or_connector_name\n )\n }\n }\n }\n\n /// get_skip_saving_wallet_at_connector_key\n pub fn get_skip_saving_wallet_at_connector_key(&self) -> String {\n format!(\"skip_saving_wallet_at_connector_{}\", self.get_string_repr())\n }\n\n /// get_payment_config_routing_id\n pub fn get_payment_config_routing_id(&self) -> String {\n format!(\"payment_config_id_{}\", self.get_string_repr())\n }\n\n /// get_payment_method_surcharge_routing_id\n pub fn get_payment_method_surcharge_routing_id(&self) -> String {\n format!(\"payment_method_surcharge_id_{}\", self.get_string_repr())\n }\n\n /// get_webhook_config_disabled_events_key\n pub fn get_webhook_config_disabled_events_key(&self, connector_id: &str) -> String {\n format!(\n \"whconf_disabled_events_{}_{connector_id}\",\n self.get_string_repr()\n )\n }\n\n /// get_should_call_gsm_payout_key\n pub fn get_should_call_gsm_payout_key(\n &self,\n payout_retry_type: common_enums::PayoutRetryType,\n ) -> String {\n match payout_retry_type {\n common_enums::PayoutRetryType::SingleConnector => format!(\n \"should_call_gsm_single_connector_payout_{}\",\n self.get_string_repr()\n ),\n common_enums::PayoutRetryType::MultiConnector => format!(\n \"should_call_gsm_multiple_connector_payout_{}\",\n self.get_string_repr()\n ),\n }\n }\n\n /// Get should call gsm key for payment\n pub fn get_should_call_gsm_key(&self) -> String {\n format!(\"should_call_gsm_{}\", self.get_string_repr())\n }\n\n /// get_max_auto_single_connector_payout_retries_enabled_\n pub fn get_max_auto_single_connector_payout_retries_enabled(\n &self,\n payout_retry_type: common_enums::PayoutRetryType,\n ) -> String {\n match payout_retry_type {\n common_enums::PayoutRetryType::SingleConnector => format!(\n \"max_auto_single_connector_payout_retries_enabled_{}\",\n self.get_string_repr()\n ),\n common_enums::PayoutRetryType::MultiConnector => format!(\n \"max_auto_multiple_connector_payout_retries_enabled_{}\",\n self.get_string_repr()\n ),\n }\n }\n /// allow payment update via client auth default should be false\n pub fn get_payment_update_enabled_for_client_auth_key(&self) -> String {\n format!(\n \"payment_update_enabled_for_client_auth_{}\",\n self.get_string_repr()\n )\n }\n\n /// Get should perform eligibility check key for payment\n pub fn get_should_perform_eligibility_check_key(&self) -> String {\n format!(\"should_perform_eligibility_{}\", self.get_string_repr())\n }\n}",
"after_code": "impl MerchantId {\n /// get step up enabled key\n pub fn get_step_up_enabled_key(&self) -> String {\n format!(\"step_up_enabled_{}\", self.get_string_repr())\n }\n\n /// get_max_auto_retries_enabled key\n pub fn get_max_auto_retries_enabled(&self) -> String {\n format!(\"max_auto_retries_enabled_{}\", self.get_string_repr())\n }\n\n /// get_requires_cvv_key\n pub fn get_requires_cvv_key(&self) -> String {\n format!(\"{}_requires_cvv\", self.get_string_repr())\n }\n\n /// get_pm_filters_cgraph_key\n pub fn get_pm_filters_cgraph_key(&self) -> String {\n format!(\"pm_filters_cgraph_{}\", self.get_string_repr())\n }\n\n /// get_blocklist_enabled_key\n pub fn get_blocklist_guard_key(&self) -> String {\n format!(\"guard_blocklist_for_{}\", self.get_string_repr())\n }\n\n /// get_merchant_fingerprint_secret_key\n pub fn get_merchant_fingerprint_secret_key(&self) -> String {\n format!(\"fingerprint_secret_{}\", self.get_string_repr())\n }\n\n /// get_surcharge_dsk_key\n pub fn get_surcharge_dsk_key(&self) -> String {\n format!(\"surcharge_dsl_{}\", self.get_string_repr())\n }\n\n /// get_dsk_key\n pub fn get_dsl_config(&self) -> String {\n format!(\"dsl_{}\", self.get_string_repr())\n }\n\n /// get_creds_identifier_key\n pub fn get_creds_identifier_key(&self, creds_identifier: &str) -> String {\n format!(\"mcd_{}_{creds_identifier}\", self.get_string_repr())\n }\n\n /// get_poll_id\n pub fn get_poll_id(&self, unique_id: &str) -> String {\n format!(\"poll_{}_{unique_id}\", self.get_string_repr())\n }\n\n /// get_skip_saving_wallet_at_connector_key\n pub fn get_skip_saving_wallet_at_connector_key(&self) -> String {\n format!(\"skip_saving_wallet_at_connector_{}\", self.get_string_repr())\n }\n\n /// get_payment_config_routing_id\n pub fn get_payment_config_routing_id(&self) -> String {\n format!(\"payment_config_id_{}\", self.get_string_repr())\n }\n\n /// get_payment_method_surcharge_routing_id\n pub fn get_payment_method_surcharge_routing_id(&self) -> String {\n format!(\"payment_method_surcharge_id_{}\", self.get_string_repr())\n }\n\n /// get_webhook_config_disabled_events_key\n pub fn get_webhook_config_disabled_events_key(&self, connector_id: &str) -> String {\n format!(\n \"whconf_disabled_events_{}_{connector_id}\",\n self.get_string_repr()\n )\n }\n\n /// get_should_call_gsm_payout_key\n pub fn get_should_call_gsm_payout_key(\n &self,\n payout_retry_type: common_enums::PayoutRetryType,\n ) -> String {\n match payout_retry_type {\n common_enums::PayoutRetryType::SingleConnector => format!(\n \"should_call_gsm_single_connector_payout_{}\",\n self.get_string_repr()\n ),\n common_enums::PayoutRetryType::MultiConnector => format!(\n \"should_call_gsm_multiple_connector_payout_{}\",\n self.get_string_repr()\n ),\n }\n }\n\n /// Get should call gsm key for payment\n pub fn get_should_call_gsm_key(&self) -> String {\n format!(\"should_call_gsm_{}\", self.get_string_repr())\n }\n\n /// get_max_auto_single_connector_payout_retries_enabled_\n pub fn get_max_auto_single_connector_payout_retries_enabled(\n &self,\n payout_retry_type: common_enums::PayoutRetryType,\n ) -> String {\n match payout_retry_type {\n common_enums::PayoutRetryType::SingleConnector => format!(\n \"max_auto_single_connector_payout_retries_enabled_{}\",\n self.get_string_repr()\n ),\n common_enums::PayoutRetryType::MultiConnector => format!(\n \"max_auto_multiple_connector_payout_retries_enabled_{}\",\n self.get_string_repr()\n ),\n }\n }\n /// allow payment update via client auth default should be false\n pub fn get_payment_update_enabled_for_client_auth_key(&self) -> String {\n format!(\n \"payment_update_enabled_for_client_auth_{}\",\n self.get_string_repr()\n )\n }\n\n /// Get should perform eligibility check key for payment\n pub fn get_should_perform_eligibility_check_key(&self) -> String {\n format!(\"should_perform_eligibility_{}\", self.get_string_repr())\n }\n}",
"diff_span": {
"before": " pub fn get_poll_id(&self, unique_id: &str) -> String {\n format!(\"poll_{}_{unique_id}\", self.get_string_repr())\n }\n\n /// get_access_token_key\n pub fn get_access_token_key(\n &self,\n merchant_connector_id_or_connector_name: impl Display,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> String {\n match access_token_key_suffix_from_connector {\n Some(key_suffix) => {\n format!(\n \"access_token_{}_{}_{}\",\n self.get_string_repr(),\n merchant_connector_id_or_connector_name,\n key_suffix\n )\n }\n None => {\n format!(\n \"access_token_{}_{}\",\n self.get_string_repr(),\n merchant_connector_id_or_connector_name\n )\n }\n }\n }\n",
"after": ""
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db",
"before_imports": [
"use std::fmt::Display;"
],
"after_imports": []
},
{
"id": "crates/router/src/core/payouts/access_token.rs::function::add_access_token_for_payout",
"file": "crates/router/src/core/payouts/access_token.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": true,
"before_code": "pub async fn add_access_token_for_payout<F: Clone + 'static>(\n state: &SessionState,\n connector: &api_types::ConnectorData,\n merchant_context: &domain::MerchantContext,\n router_data: &types::PayoutsRouterData<F>,\n payout_type: Option<enums::PayoutType>,\n) -> RouterResult<types::AddAccessTokenResult> {\n use crate::types::api::ConnectorCommon;\n\n if connector\n .connector_name\n .supports_access_token_for_payout(payout_type)\n {\n let merchant_id = merchant_context.get_merchant_account().get_id();\n let store = &*state.store;\n let old_access_token = store\n .get_access_token(merchant_id, connector.connector.id(), None)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when accessing the access token\")?;\n\n let res = match old_access_token {\n Some(access_token) => Ok(Some(access_token)),\n None => {\n let cloned_router_data = router_data.clone();\n let refresh_token_request_data = types::AccessTokenRequestData::try_from(\n router_data.connector_auth_type.clone(),\n )\n .attach_printable(\n \"Could not create access token request, invalid connector account credentials\",\n )?;\n\n let refresh_token_response_data: Result<types::AccessToken, types::ErrorResponse> =\n Err(types::ErrorResponse::default());\n let refresh_token_router_data = payments::helpers::router_data_type_conversion::<\n _,\n api_types::AccessTokenAuth,\n _,\n _,\n _,\n _,\n >(\n cloned_router_data,\n refresh_token_request_data,\n refresh_token_response_data,\n );\n refresh_connector_auth(\n state,\n connector,\n merchant_context,\n &refresh_token_router_data,\n )\n .await?\n .async_map(|access_token| async {\n //Store the access token in db\n let store = &*state.store;\n // This error should not be propagated, we don't want payments to fail once we have\n // the access token, the next request will create new access token\n let _ = store\n .set_access_token(\n merchant_id,\n connector.connector.id(),\n access_token.clone(),\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when setting the access token\");\n Some(access_token)\n })\n .await\n }\n };\n\n Ok(types::AddAccessTokenResult {\n access_token_result: res,\n connector_supports_access_token: true,\n })\n } else {\n Ok(types::AddAccessTokenResult {\n access_token_result: Err(types::ErrorResponse::default()),\n connector_supports_access_token: false,\n })\n }\n}",
"after_code": "pub async fn add_access_token_for_payout<F: Clone + 'static>(\n state: &SessionState,\n connector: &api_types::ConnectorData,\n merchant_context: &domain::MerchantContext,\n router_data: &types::PayoutsRouterData<F>,\n payout_type: Option<enums::PayoutType>,\n) -> RouterResult<types::AddAccessTokenResult> {\n if connector\n .connector_name\n .supports_access_token_for_payout(payout_type)\n {\n let store = &*state.store;\n\n let key = connector\n .connector\n .get_access_token_suffix_from_connector(\n router_data,\n connector.connector.id().to_string(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let old_access_token = store\n .get_access_token(key.clone())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when accessing the access token\")?;\n\n let res = match old_access_token {\n Some(access_token) => Ok(Some(access_token)),\n None => {\n let cloned_router_data = router_data.clone();\n let refresh_token_request_data = types::AccessTokenRequestData::try_from(\n router_data.connector_auth_type.clone(),\n )\n .attach_printable(\n \"Could not create access token request, invalid connector account credentials\",\n )?;\n\n let refresh_token_response_data: Result<types::AccessToken, types::ErrorResponse> =\n Err(types::ErrorResponse::default());\n let refresh_token_router_data = payments::helpers::router_data_type_conversion::<\n _,\n api_types::AccessTokenAuth,\n _,\n _,\n _,\n _,\n >(\n cloned_router_data,\n refresh_token_request_data,\n refresh_token_response_data,\n );\n refresh_connector_auth(\n state,\n connector,\n merchant_context,\n &refresh_token_router_data,\n )\n .await?\n .async_map(|access_token| async {\n //Store the access token in db\n let store = &*state.store;\n // This error should not be propagated, we don't want payments to fail once we have\n // the access token, the next request will create new access token\n let _ = store\n .set_access_token(key, access_token.clone())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when setting the access token\");\n Some(access_token)\n })\n .await\n }\n };\n\n Ok(types::AddAccessTokenResult {\n access_token_result: res,\n connector_supports_access_token: true,\n })\n } else {\n Ok(types::AddAccessTokenResult {\n access_token_result: Err(types::ErrorResponse::default()),\n connector_supports_access_token: false,\n })\n }\n}",
"diff_span": {
"before": " payout_type: Option<enums::PayoutType>,\n) -> RouterResult<types::AddAccessTokenResult> {\n use crate::types::api::ConnectorCommon;\n\n if connector\n .connector_name\n .supports_access_token_for_payout(payout_type)\n {\n let merchant_id = merchant_context.get_merchant_account().get_id();\n let store = &*state.store;\n let old_access_token = store\n .get_access_token(merchant_id, connector.connector.id(), None)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when accessing the access token\")?;\n\n let res = match old_access_token {\n Some(access_token) => Ok(Some(access_token)),\n None => {\n let cloned_router_data = router_data.clone();\n let refresh_token_request_data = types::AccessTokenRequestData::try_from(\n router_data.connector_auth_type.clone(),\n )\n .attach_printable(\n \"Could not create access token request, invalid connector account credentials\",\n )?;\n\n let refresh_token_response_data: Result<types::AccessToken, types::ErrorResponse> =\n Err(types::ErrorResponse::default());\n let refresh_token_router_data = payments::helpers::router_data_type_conversion::<\n _,\n api_types::AccessTokenAuth,\n _,\n _,\n _,\n _,\n >(\n cloned_router_data,\n refresh_token_request_data,\n refresh_token_response_data,\n );\n refresh_connector_auth(\n state,\n connector,\n merchant_context,\n &refresh_token_router_data,\n )\n .await?\n .async_map(|access_token| async {\n //Store the access token in db\n let store = &*state.store;\n // This error should not be propagated, we don't want payments to fail once we have\n // the access token, the next request will create new access token\n let _ = store\n .set_access_token(\n merchant_id,\n connector.connector.id(),\n access_token.clone(),\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)",
"after": " {\n let store = &*state.store;\n\n let key = connector\n .connector\n .get_access_token_suffix_from_connector(\n router_data,\n connector.connector.id().to_string(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let old_access_token = store\n .get_access_token(key.clone())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when accessing the access token\")?;\n\n let res = match old_access_token {\n Some(access_token) => Ok(Some(access_token)),\n None => {\n let cloned_router_data = router_data.clone();\n let refresh_token_request_data = types::AccessTokenRequestData::try_from(\n router_data.connector_auth_type.clone(),\n )\n .attach_printable(\n \"Could not create access token request, invalid connector account credentials\",\n )?;\n\n let refresh_token_response_data: Result<types::AccessToken, types::ErrorResponse> =\n Err(types::ErrorResponse::default());\n let refresh_token_router_data = payments::helpers::router_data_type_conversion::<\n _,\n api_types::AccessTokenAuth,\n _,\n _,\n _,\n _,\n >(\n cloned_router_data,\n refresh_token_request_data,\n refresh_token_response_data,\n );\n refresh_connector_auth(\n state,\n connector,\n merchant_context,\n &refresh_token_router_data,\n )\n .await?\n .async_map(|access_token| async {\n //Store the access token in db\n let store = &*state.store;\n // This error should not be propagated, we don't want payments to fail once we have\n // the access token, the next request will create new access token\n let _ = store\n .set_access_token(key, access_token.clone())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db",
"before_imports": [
"use crate::types::api::ConnectorCommon;"
],
"after_imports": []
},
{
"id": "crates/router/src/db/merchant_connector_account.rs::impl::MockDb",
"file": "crates/router/src/db/merchant_connector_account.rs",
"kind": "impl_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "impl ConnectorAccessToken for MockDb {\n async fn get_access_token(\n &self,\n _merchant_id: &common_utils::id_type::MerchantId,\n _merchant_connector_id_or_connector_name: &str,\n _access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n Ok(None)\n }\n\n async fn set_access_token(\n &self,\n _merchant_id: &common_utils::id_type::MerchantId,\n _merchant_connector_id_or_connector_name: &str,\n _access_token: types::AccessToken,\n _access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<(), errors::StorageError> {\n Ok(())\n }\n}",
"after_code": "impl ConnectorAccessToken for MockDb {\n async fn get_access_token(\n &self,\n _key: String,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n Ok(None)\n }\n\n async fn set_access_token(\n &self,\n _key: String,\n _access_token: types::AccessToken,\n ) -> CustomResult<(), errors::StorageError> {\n Ok(())\n }\n}",
"diff_span": {
"before": " async fn get_access_token(\n &self,\n _merchant_id: &common_utils::id_type::MerchantId,\n _merchant_connector_id_or_connector_name: &str,\n _access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n Ok(None)\n }\n\n async fn set_access_token(\n &self,\n _merchant_id: &common_utils::id_type::MerchantId,\n _merchant_connector_id_or_connector_name: &str,\n _access_token: types::AccessToken,\n _access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<(), errors::StorageError> {\n Ok(())",
"after": " async fn get_access_token(\n &self,\n _key: String,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n Ok(None)\n }\n\n async fn set_access_token(\n &self,\n _key: String,\n _access_token: types::AccessToken,\n ) -> CustomResult<(), errors::StorageError> {"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/core/payments/retry.rs::function::do_gsm_actions",
"file": "crates/router/src/core/payments/retry.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "pub async fn do_gsm_actions<'a, F, ApiRequest, FData, D>(\n state: &app::SessionState,\n req_state: ReqState,\n payment_data: &mut D,\n mut connector_routing_data: IntoIter<api::ConnectorRoutingData>,\n original_connector_data: &api::ConnectorData,\n mut router_data: types::RouterData<F, FData, types::PaymentsResponseData>,\n merchant_context: &domain::MerchantContext,\n operation: &operations::BoxedOperation<'_, F, ApiRequest, D>,\n customer: &Option<domain::Customer>,\n validate_result: &operations::ValidateResult,\n schedule_time: Option<time::PrimitiveDateTime>,\n frm_suggestion: Option<storage_enums::FrmSuggestion>,\n business_profile: &domain::Profile,\n) -> RouterResult<types::RouterData<F, FData, types::PaymentsResponseData>>\nwhere\n F: Clone + Send + Sync + 'static,\n FData: Send + Sync + types::Capturable + Clone + 'static + serde::Serialize,\n payments::PaymentResponse: operations::Operation<F, FData>,\n D: payments::OperationSessionGetters<F>\n + payments::OperationSessionSetters<F>\n + Send\n + Sync\n + Clone,\n D: ConstructFlowSpecificData<F, FData, types::PaymentsResponseData>,\n types::RouterData<F, FData, types::PaymentsResponseData>: Feature<F, FData>,\n dyn api::Connector: services::api::ConnectorIntegration<F, FData, types::PaymentsResponseData>,\n{\n let mut retries = None;\n\n metrics::AUTO_RETRY_ELIGIBLE_REQUEST_COUNT.add(1, &[]);\n\n let mut initial_gsm = get_gsm(state, &router_data).await?;\n\n let step_up_possible = initial_gsm\n .as_ref()\n .and_then(|data| data.feature_data.get_retry_feature_data())\n .map(|data| data.is_step_up_possible())\n .unwrap_or(false);\n\n #[cfg(feature = \"v1\")]\n let is_no_three_ds_payment = matches!(\n payment_data.get_payment_attempt().authentication_type,\n Some(storage_enums::AuthenticationType::NoThreeDs)\n );\n\n #[cfg(feature = \"v2\")]\n let is_no_three_ds_payment = matches!(\n payment_data.get_payment_attempt().authentication_type,\n storage_enums::AuthenticationType::NoThreeDs\n );\n\n let should_step_up = if step_up_possible && is_no_three_ds_payment {\n is_step_up_enabled_for_merchant_connector(\n state,\n merchant_context.get_merchant_account().get_id(),\n original_connector_data.connector_name,\n )\n .await\n } else {\n false\n };\n\n if should_step_up {\n router_data = do_retry(\n &state.clone(),\n req_state.clone(),\n original_connector_data,\n operation,\n customer,\n merchant_context,\n payment_data,\n router_data,\n validate_result,\n schedule_time,\n true,\n frm_suggestion,\n business_profile,\n false, //should_retry_with_pan is not applicable for step-up\n None,\n )\n .await?;\n }\n // Step up is not applicable so proceed with auto retries flow\n else {\n loop {\n // Use initial_gsm for first time alone\n let gsm = match initial_gsm.as_ref() {\n Some(gsm) => Some(gsm.clone()),\n None => get_gsm(state, &router_data).await?,\n };\n\n match get_gsm_decision(gsm) {\n storage_enums::GsmDecision::Retry => {\n retries = get_retries(\n state,\n retries,\n merchant_context.get_merchant_account().get_id(),\n business_profile,\n )\n .await;\n\n if retries.is_none() || retries == Some(0) {\n metrics::AUTO_RETRY_EXHAUSTED_COUNT.add(1, &[]);\n logger::info!(\"retries exhausted for auto_retry payment\");\n break;\n }\n\n if connector_routing_data.len() == 0 {\n logger::info!(\"connectors exhausted for auto_retry payment\");\n metrics::AUTO_RETRY_EXHAUSTED_COUNT.add(1, &[]);\n break;\n }\n\n let is_network_token = payment_data\n .get_payment_method_data()\n .map(|pmd| pmd.is_network_token_payment_method_data())\n .unwrap_or(false);\n\n let clear_pan_possible = initial_gsm\n .and_then(|data| data.feature_data.get_retry_feature_data())\n .map(|data| data.is_clear_pan_possible())\n .unwrap_or(false);\n\n let should_retry_with_pan = is_network_token\n && clear_pan_possible\n && business_profile.is_clear_pan_retries_enabled;\n\n // Currently we are taking off_session as a source of truth to identify MIT payments.\n let is_mit_payment = payment_data\n .get_payment_intent()\n .off_session\n .unwrap_or(false);\n\n let (connector, routing_decision) = if is_mit_payment {\n let connector_routing_data =\n super::get_connector_data(&mut connector_routing_data)?;\n let payment_method_info = payment_data\n .get_payment_method_info()\n .get_required_value(\"payment_method_info\")?\n .clone();\n let mandate_reference_id = payments::get_mandate_reference_id(\n connector_routing_data.action_type.clone(),\n connector_routing_data.clone(),\n payment_data,\n &payment_method_info,\n )?;\n payment_data.set_mandate_id(api_models::payments::MandateIds {\n mandate_id: None,\n mandate_reference_id, //mandate_ref_id\n });\n (connector_routing_data.connector_data, None)\n } else if should_retry_with_pan {\n // If should_retry_with_pan is true, it indicates that we are retrying with PAN using the same connector.\n (original_connector_data.clone(), None)\n } else {\n let connector_routing_data =\n super::get_connector_data(&mut connector_routing_data)?;\n let routing_decision = connector_routing_data.network.map(|card_network| {\n routing_helpers::RoutingDecisionData::get_debit_routing_decision_data(\n card_network,\n None,\n )\n });\n\n (connector_routing_data.connector_data, routing_decision)\n };\n\n router_data = do_retry(\n &state.clone(),\n req_state.clone(),\n &connector,\n operation,\n customer,\n merchant_context,\n payment_data,\n router_data,\n validate_result,\n schedule_time,\n //this is an auto retry payment, but not step-up\n false,\n frm_suggestion,\n business_profile,\n should_retry_with_pan,\n routing_decision,\n )\n .await?;\n\n retries = retries.map(|i| i - 1);\n }\n storage_enums::GsmDecision::DoDefault => break,\n }\n initial_gsm = None;\n }\n }\n Ok(router_data)\n}",
"after_code": "pub async fn do_gsm_actions<'a, F, ApiRequest, FData, D>(\n state: &app::SessionState,\n req_state: ReqState,\n payment_data: &mut D,\n mut connector_routing_data: IntoIter<api::ConnectorRoutingData>,\n original_connector_data: &api::ConnectorData,\n mut router_data: types::RouterData<F, FData, types::PaymentsResponseData>,\n merchant_context: &domain::MerchantContext,\n operation: &operations::BoxedOperation<'_, F, ApiRequest, D>,\n customer: &Option<domain::Customer>,\n validate_result: &operations::ValidateResult,\n schedule_time: Option<time::PrimitiveDateTime>,\n frm_suggestion: Option<storage_enums::FrmSuggestion>,\n business_profile: &domain::Profile,\n) -> RouterResult<types::RouterData<F, FData, types::PaymentsResponseData>>\nwhere\n F: Clone + Send + Sync + std::fmt::Debug + 'static,\n FData: Send + Sync + types::Capturable + Clone + 'static + serde::Serialize,\n payments::PaymentResponse: operations::Operation<F, FData>,\n D: payments::OperationSessionGetters<F>\n + payments::OperationSessionSetters<F>\n + Send\n + Sync\n + Clone,\n D: ConstructFlowSpecificData<F, FData, types::PaymentsResponseData>,\n types::RouterData<F, FData, types::PaymentsResponseData>: Feature<F, FData>,\n dyn api::Connector: services::api::ConnectorIntegration<F, FData, types::PaymentsResponseData>,\n{\n let mut retries = None;\n\n metrics::AUTO_RETRY_ELIGIBLE_REQUEST_COUNT.add(1, &[]);\n\n let mut initial_gsm = get_gsm(state, &router_data).await?;\n\n let step_up_possible = initial_gsm\n .as_ref()\n .and_then(|data| data.feature_data.get_retry_feature_data())\n .map(|data| data.is_step_up_possible())\n .unwrap_or(false);\n\n #[cfg(feature = \"v1\")]\n let is_no_three_ds_payment = matches!(\n payment_data.get_payment_attempt().authentication_type,\n Some(storage_enums::AuthenticationType::NoThreeDs)\n );\n\n #[cfg(feature = \"v2\")]\n let is_no_three_ds_payment = matches!(\n payment_data.get_payment_attempt().authentication_type,\n storage_enums::AuthenticationType::NoThreeDs\n );\n\n let should_step_up = if step_up_possible && is_no_three_ds_payment {\n is_step_up_enabled_for_merchant_connector(\n state,\n merchant_context.get_merchant_account().get_id(),\n original_connector_data.connector_name,\n )\n .await\n } else {\n false\n };\n\n if should_step_up {\n router_data = do_retry(\n &state.clone(),\n req_state.clone(),\n original_connector_data,\n operation,\n customer,\n merchant_context,\n payment_data,\n router_data,\n validate_result,\n schedule_time,\n true,\n frm_suggestion,\n business_profile,\n false, //should_retry_with_pan is not applicable for step-up\n None,\n )\n .await?;\n }\n // Step up is not applicable so proceed with auto retries flow\n else {\n loop {\n // Use initial_gsm for first time alone\n let gsm = match initial_gsm.as_ref() {\n Some(gsm) => Some(gsm.clone()),\n None => get_gsm(state, &router_data).await?,\n };\n\n match get_gsm_decision(gsm) {\n storage_enums::GsmDecision::Retry => {\n retries = get_retries(\n state,\n retries,\n merchant_context.get_merchant_account().get_id(),\n business_profile,\n )\n .await;\n\n if retries.is_none() || retries == Some(0) {\n metrics::AUTO_RETRY_EXHAUSTED_COUNT.add(1, &[]);\n logger::info!(\"retries exhausted for auto_retry payment\");\n break;\n }\n\n if connector_routing_data.len() == 0 {\n logger::info!(\"connectors exhausted for auto_retry payment\");\n metrics::AUTO_RETRY_EXHAUSTED_COUNT.add(1, &[]);\n break;\n }\n\n let is_network_token = payment_data\n .get_payment_method_data()\n .map(|pmd| pmd.is_network_token_payment_method_data())\n .unwrap_or(false);\n\n let clear_pan_possible = initial_gsm\n .and_then(|data| data.feature_data.get_retry_feature_data())\n .map(|data| data.is_clear_pan_possible())\n .unwrap_or(false);\n\n let should_retry_with_pan = is_network_token\n && clear_pan_possible\n && business_profile.is_clear_pan_retries_enabled;\n\n // Currently we are taking off_session as a source of truth to identify MIT payments.\n let is_mit_payment = payment_data\n .get_payment_intent()\n .off_session\n .unwrap_or(false);\n\n let (connector, routing_decision) = if is_mit_payment {\n let connector_routing_data =\n super::get_connector_data(&mut connector_routing_data)?;\n let payment_method_info = payment_data\n .get_payment_method_info()\n .get_required_value(\"payment_method_info\")?\n .clone();\n let mandate_reference_id = payments::get_mandate_reference_id(\n connector_routing_data.action_type.clone(),\n connector_routing_data.clone(),\n payment_data,\n &payment_method_info,\n )?;\n payment_data.set_mandate_id(api_models::payments::MandateIds {\n mandate_id: None,\n mandate_reference_id, //mandate_ref_id\n });\n (connector_routing_data.connector_data, None)\n } else if should_retry_with_pan {\n // If should_retry_with_pan is true, it indicates that we are retrying with PAN using the same connector.\n (original_connector_data.clone(), None)\n } else {\n let connector_routing_data =\n super::get_connector_data(&mut connector_routing_data)?;\n let routing_decision = connector_routing_data.network.map(|card_network| {\n routing_helpers::RoutingDecisionData::get_debit_routing_decision_data(\n card_network,\n None,\n )\n });\n\n (connector_routing_data.connector_data, routing_decision)\n };\n\n router_data = do_retry(\n &state.clone(),\n req_state.clone(),\n &connector,\n operation,\n customer,\n merchant_context,\n payment_data,\n router_data,\n validate_result,\n schedule_time,\n //this is an auto retry payment, but not step-up\n false,\n frm_suggestion,\n business_profile,\n should_retry_with_pan,\n routing_decision,\n )\n .await?;\n\n retries = retries.map(|i| i - 1);\n }\n storage_enums::GsmDecision::DoDefault => break,\n }\n initial_gsm = None;\n }\n }\n Ok(router_data)\n}",
"diff_span": {
"before": ") -> RouterResult<types::RouterData<F, FData, types::PaymentsResponseData>>\nwhere\n F: Clone + Send + Sync + 'static,\n FData: Send + Sync + types::Capturable + Clone + 'static + serde::Serialize,\n payments::PaymentResponse: operations::Operation<F, FData>,",
"after": ") -> RouterResult<types::RouterData<F, FData, types::PaymentsResponseData>>\nwhere\n F: Clone + Send + Sync + std::fmt::Debug + 'static,\n FData: Send + Sync + types::Capturable + Clone + 'static + serde::Serialize,\n payments::PaymentResponse: operations::Operation<F, FData>,"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/core/payments.rs::function::payments_operation_core",
"file": "crates/router/src/core/payments.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "pub async fn payments_operation_core<'a, F, Req, Op, FData, D>(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n profile_id_from_auth_layer: Option<id_type::ProfileId>,\n operation: Op,\n req: Req,\n call_connector_action: CallConnectorAction,\n shadow_ucs_call_connector_action: Option<CallConnectorAction>,\n auth_flow: services::AuthFlow,\n eligible_connectors: Option<Vec<common_enums::RoutableConnectors>>,\n header_payload: HeaderPayload,\n) -> RouterResult<(D, Req, Option<domain::Customer>, Option<u16>, Option<u128>)>\nwhere\n F: Send + Clone + Sync + 'static,\n Req: Authenticate + Clone,\n Op: Operation<F, Req, Data = D> + Send + Sync,\n D: OperationSessionGetters<F> + OperationSessionSetters<F> + Send + Sync + Clone,\n\n // To create connector flow specific interface data\n D: ConstructFlowSpecificData<F, FData, router_types::PaymentsResponseData>,\n RouterData<F, FData, router_types::PaymentsResponseData>: Feature<F, FData>,\n\n // To construct connector flow specific api\n dyn api::Connector:\n services::api::ConnectorIntegration<F, FData, router_types::PaymentsResponseData>,\n\n // To perform router related operation for PaymentResponse\n PaymentResponse: Operation<F, FData, Data = D>,\n FData: Send + Sync + Clone + router_types::Capturable + 'static + serde::Serialize,\n{\n let operation: BoxedOperation<'_, F, Req, D> = Box::new(operation);\n\n tracing::Span::current().record(\n \"merchant_id\",\n merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr(),\n );\n let (operation, validate_result) = operation\n .to_validate_request()?\n .validate_request(&req, merchant_context)?;\n\n tracing::Span::current().record(\"payment_id\", format!(\"{}\", validate_result.payment_id));\n // get profile from headers\n let operations::GetTrackerResponse {\n operation,\n customer_details,\n mut payment_data,\n business_profile,\n mandate_type,\n } = operation\n .to_get_tracker()?\n .get_trackers(\n state,\n &validate_result.payment_id,\n &req,\n merchant_context,\n auth_flow,\n &header_payload,\n )\n .await?;\n\n operation\n .to_get_tracker()?\n .validate_request_with_state(state, &req, &mut payment_data, &business_profile)\n .await?;\n\n core_utils::validate_profile_id_from_auth_layer(\n profile_id_from_auth_layer,\n &payment_data.get_payment_intent().clone(),\n )?;\n\n let (operation, customer) = operation\n .to_domain()?\n // get_customer_details\n .get_or_create_customer_details(\n state,\n &mut payment_data,\n customer_details,\n merchant_context.get_merchant_key_store(),\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::CustomerNotFound)\n .attach_printable(\"Failed while fetching/creating customer\")?;\n\n let authentication_type =\n call_decision_manager(state, merchant_context, &business_profile, &payment_data).await?;\n\n payment_data.set_authentication_type_in_attempt(authentication_type);\n\n let connector = get_connector_choice(\n &operation,\n state,\n &req,\n merchant_context,\n &business_profile,\n &mut payment_data,\n eligible_connectors,\n mandate_type,\n )\n .await?;\n\n let payment_method_token = get_decrypted_wallet_payment_method_token(\n &operation,\n state,\n merchant_context,\n &mut payment_data,\n connector.as_ref(),\n )\n .await?;\n\n payment_method_token.map(|token| payment_data.set_payment_method_token(Some(token)));\n\n let (connector, debit_routing_output) = debit_routing::perform_debit_routing(\n &operation,\n state,\n &business_profile,\n &mut payment_data,\n connector,\n )\n .await;\n\n operation\n .to_domain()?\n .apply_three_ds_authentication_strategy(state, &mut payment_data, &business_profile)\n .await?;\n\n let should_add_task_to_process_tracker = should_add_task_to_process_tracker(&payment_data);\n\n let locale = header_payload.locale.clone();\n\n payment_data = tokenize_in_router_when_confirm_false_or_external_authentication(\n state,\n &operation,\n &mut payment_data,\n &validate_result,\n merchant_context.get_merchant_key_store(),\n &customer,\n &business_profile,\n )\n .await?;\n\n let mut connector_http_status_code = None;\n let mut external_latency = None;\n if let Some(connector_details) = connector {\n // Fetch and check FRM configs\n #[cfg(feature = \"frm\")]\n let mut frm_info = None;\n #[allow(unused_variables, unused_mut)]\n let mut should_continue_transaction: bool = true;\n #[cfg(feature = \"frm\")]\n let mut should_continue_capture: bool = true;\n #[cfg(feature = \"frm\")]\n let frm_configs = if state.conf.frm.enabled {\n Box::pin(frm_core::call_frm_before_connector_call(\n &operation,\n merchant_context,\n &mut payment_data,\n state,\n &mut frm_info,\n &customer,\n &mut should_continue_transaction,\n &mut should_continue_capture,\n ))\n .await?\n } else {\n None\n };\n #[cfg(feature = \"frm\")]\n logger::debug!(\n \"frm_configs: {:?}\\nshould_continue_transaction: {:?}\\nshould_continue_capture: {:?}\",\n frm_configs,\n should_continue_transaction,\n should_continue_capture,\n );\n\n let is_eligible_for_uas = helpers::is_merchant_eligible_authentication_service(\n merchant_context.get_merchant_account().get_id(),\n state,\n )\n .await?;\n\n if is_eligible_for_uas {\n operation\n .to_domain()?\n .call_unified_authentication_service_if_eligible(\n state,\n &mut payment_data,\n &mut should_continue_transaction,\n &connector_details,\n &business_profile,\n merchant_context.get_merchant_key_store(),\n mandate_type,\n )\n .await?;\n } else {\n logger::info!(\n \"skipping authentication service call since the merchant is not eligible.\"\n );\n\n operation\n .to_domain()?\n .call_external_three_ds_authentication_if_eligible(\n state,\n &mut payment_data,\n &mut should_continue_transaction,\n &connector_details,\n &business_profile,\n merchant_context.get_merchant_key_store(),\n mandate_type,\n )\n .await?;\n };\n\n operation\n .to_domain()?\n .payments_dynamic_tax_calculation(\n state,\n &mut payment_data,\n &connector_details,\n &business_profile,\n merchant_context,\n )\n .await?;\n\n if should_continue_transaction {\n #[cfg(feature = \"frm\")]\n match (\n should_continue_capture,\n payment_data.get_payment_attempt().capture_method,\n ) {\n (\n false,\n Some(storage_enums::CaptureMethod::Automatic)\n | Some(storage_enums::CaptureMethod::SequentialAutomatic),\n )\n | (false, Some(storage_enums::CaptureMethod::Scheduled)) => {\n if let Some(info) = &mut frm_info {\n if let Some(frm_data) = &mut info.frm_data {\n frm_data.fraud_check.payment_capture_method =\n payment_data.get_payment_attempt().capture_method;\n }\n }\n payment_data\n .set_capture_method_in_attempt(storage_enums::CaptureMethod::Manual);\n logger::debug!(\"payment_id : {:?} capture method has been changed to manual, since it has configured Post FRM flow\",payment_data.get_payment_attempt().payment_id);\n }\n _ => (),\n };\n\n payment_data = match connector_details {\n ConnectorCallType::PreDetermined(ref connector) => {\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n let routable_connectors = convert_connector_data_to_routable_connectors(\n std::slice::from_ref(connector),\n )\n .map_err(|e| logger::error!(routable_connector_error=?e))\n .unwrap_or_default();\n let schedule_time = if should_add_task_to_process_tracker {\n payment_sync::get_sync_process_schedule_time(\n &*state.store,\n connector.connector_data.connector.id(),\n merchant_context.get_merchant_account().get_id(),\n 0,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while getting process schedule time\")?\n } else {\n None\n };\n\n let (merchant_connector_account, router_data, tokenization_action) =\n call_connector_service_prerequisites(\n state,\n merchant_context,\n connector.connector_data.clone(),\n &operation,\n &mut payment_data,\n &customer,\n &validate_result,\n &business_profile,\n false,\n None,\n )\n .await?;\n\n let (router_data, mca) = decide_unified_connector_service_call(\n state,\n req_state.clone(),\n merchant_context,\n connector.connector_data.clone(),\n &operation,\n &mut payment_data,\n &customer,\n call_connector_action.clone(),\n shadow_ucs_call_connector_action.clone(),\n &validate_result,\n schedule_time,\n header_payload.clone(),\n #[cfg(feature = \"frm\")]\n frm_info.as_ref().and_then(|fi| fi.suggested_action),\n #[cfg(not(feature = \"frm\"))]\n None,\n &business_profile,\n false,\n <Req as Authenticate>::should_return_raw_response(&req),\n merchant_connector_account,\n router_data,\n tokenization_action,\n )\n .await?;\n\n let op_ref = &operation;\n let should_trigger_post_processing_flows = is_operation_confirm(&operation);\n\n let operation = Box::new(PaymentResponse);\n\n connector_http_status_code = router_data.connector_http_status_code;\n external_latency = router_data.external_latency;\n //add connector http status code metrics\n add_connector_http_status_code_metrics(connector_http_status_code);\n\n operation\n .to_post_update_tracker()?\n .save_pm_and_mandate(\n state,\n &router_data,\n merchant_context,\n &mut payment_data,\n &business_profile,\n )\n .await?;\n\n let mut payment_data = operation\n .to_post_update_tracker()?\n .update_tracker(\n state,\n payment_data,\n router_data,\n merchant_context.get_merchant_key_store(),\n merchant_context.get_merchant_account().storage_scheme,\n &locale,\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n routable_connectors,\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n &business_profile,\n )\n .await?;\n\n if should_trigger_post_processing_flows {\n complete_postprocessing_steps_if_required(\n state,\n merchant_context,\n &customer,\n &mca,\n &connector.connector_data,\n &mut payment_data,\n op_ref,\n Some(header_payload.clone()),\n )\n .await?;\n }\n\n if is_eligible_for_uas {\n complete_confirmation_for_click_to_pay_if_required(\n state,\n merchant_context,\n &payment_data,\n )\n .await?;\n }\n\n payment_data\n }\n\n ConnectorCallType::Retryable(ref connectors) => {\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n let routable_connectors =\n convert_connector_data_to_routable_connectors(connectors)\n .map_err(|e| logger::error!(routable_connector_error=?e))\n .unwrap_or_default();\n\n let mut connectors = connectors.clone().into_iter();\n\n let (connector_data, routing_decision) =\n get_connector_data_with_routing_decision(\n &mut connectors,\n &business_profile,\n debit_routing_output,\n )?;\n\n let schedule_time = if should_add_task_to_process_tracker {\n payment_sync::get_sync_process_schedule_time(\n &*state.store,\n connector_data.connector.id(),\n merchant_context.get_merchant_account().get_id(),\n 0,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while getting process schedule time\")?\n } else {\n None\n };\n\n let (merchant_connector_account, router_data, tokenization_action) =\n call_connector_service_prerequisites(\n state,\n merchant_context,\n connector_data.clone(),\n &operation,\n &mut payment_data,\n &customer,\n &validate_result,\n &business_profile,\n false,\n routing_decision,\n )\n .await?;\n\n let (router_data, mca) = decide_unified_connector_service_call(\n state,\n req_state.clone(),\n merchant_context,\n connector_data.clone(),\n &operation,\n &mut payment_data,\n &customer,\n call_connector_action.clone(),\n shadow_ucs_call_connector_action,\n &validate_result,\n schedule_time,\n header_payload.clone(),\n #[cfg(feature = \"frm\")]\n frm_info.as_ref().and_then(|fi| fi.suggested_action),\n #[cfg(not(feature = \"frm\"))]\n None,\n &business_profile,\n false,\n <Req as Authenticate>::should_return_raw_response(&req),\n merchant_connector_account,\n router_data,\n tokenization_action,\n )\n .await?;\n\n #[cfg(all(feature = \"retry\", feature = \"v1\"))]\n let mut router_data = router_data;\n #[cfg(all(feature = \"retry\", feature = \"v1\"))]\n {\n use crate::core::payments::retry::{self, GsmValidation};\n let config_bool = retry::config_should_call_gsm(\n &*state.store,\n merchant_context.get_merchant_account().get_id(),\n &business_profile,\n )\n .await;\n\n if config_bool && router_data.should_call_gsm() {\n router_data = retry::do_gsm_actions(\n state,\n req_state.clone(),\n &mut payment_data,\n connectors,\n &connector_data,\n router_data,\n merchant_context,\n &operation,\n &customer,\n &validate_result,\n schedule_time,\n #[cfg(feature = \"frm\")]\n frm_info.as_ref().and_then(|fi| fi.suggested_action),\n #[cfg(not(feature = \"frm\"))]\n None,\n &business_profile,\n )\n .await?;\n };\n }\n\n let op_ref = &operation;\n let should_trigger_post_processing_flows = is_operation_confirm(&operation);\n\n let operation = Box::new(PaymentResponse);\n connector_http_status_code = router_data.connector_http_status_code;\n external_latency = router_data.external_latency;\n //add connector http status code metrics\n add_connector_http_status_code_metrics(connector_http_status_code);\n\n operation\n .to_post_update_tracker()?\n .save_pm_and_mandate(\n state,\n &router_data,\n merchant_context,\n &mut payment_data,\n &business_profile,\n )\n .await?;\n\n let mut payment_data = operation\n .to_post_update_tracker()?\n .update_tracker(\n state,\n payment_data,\n router_data,\n merchant_context.get_merchant_key_store(),\n merchant_context.get_merchant_account().storage_scheme,\n &locale,\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n routable_connectors,\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n &business_profile,\n )\n .await?;\n\n if should_trigger_post_processing_flows {\n complete_postprocessing_steps_if_required(\n state,\n merchant_context,\n &customer,\n &mca,\n &connector_data,\n &mut payment_data,\n op_ref,\n Some(header_payload.clone()),\n )\n .await?;\n }\n\n if is_eligible_for_uas {\n complete_confirmation_for_click_to_pay_if_required(\n state,\n merchant_context,\n &payment_data,\n )\n .await?;\n }\n\n payment_data\n }\n\n ConnectorCallType::SessionMultiple(connectors) => {\n let session_surcharge_details =\n call_surcharge_decision_management_for_session_flow(\n state,\n merchant_context,\n &business_profile,\n payment_data.get_payment_attempt(),\n payment_data.get_payment_intent(),\n payment_data.get_billing_address(),\n &connectors,\n )\n .await?;\n Box::pin(call_multiple_connectors_service(\n state,\n merchant_context,\n connectors,\n &operation,\n payment_data,\n &customer,\n session_surcharge_details,\n &business_profile,\n header_payload.clone(),\n <Req as Authenticate>::should_return_raw_response(&req),\n ))\n .await?\n }\n };\n\n #[cfg(feature = \"frm\")]\n if let Some(fraud_info) = &mut frm_info {\n #[cfg(feature = \"v1\")]\n Box::pin(frm_core::post_payment_frm_core(\n state,\n req_state,\n merchant_context,\n &mut payment_data,\n fraud_info,\n frm_configs\n .clone()\n .ok_or(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"frm_configs\",\n })\n .attach_printable(\"Frm configs label not found\")?,\n &customer,\n &mut should_continue_capture,\n ))\n .await?;\n }\n } else {\n (_, payment_data) = operation\n .to_update_tracker()?\n .update_trackers(\n state,\n req_state,\n payment_data.clone(),\n customer.clone(),\n validate_result.storage_scheme,\n None,\n merchant_context.get_merchant_key_store(),\n #[cfg(feature = \"frm\")]\n frm_info.and_then(|info| info.suggested_action),\n #[cfg(not(feature = \"frm\"))]\n None,\n header_payload.clone(),\n )\n .await?;\n }\n\n let payment_intent_status = payment_data.get_payment_intent().status;\n\n payment_data\n .get_payment_attempt()\n .payment_token\n .as_ref()\n .zip(payment_data.get_payment_attempt().payment_method)\n .map(ParentPaymentMethodToken::create_key_for_token)\n .async_map(|key_for_hyperswitch_token| async move {\n if key_for_hyperswitch_token\n .should_delete_payment_method_token(payment_intent_status)\n {\n let _ = key_for_hyperswitch_token.delete(state).await;\n }\n })\n .await;\n } else {\n (_, payment_data) = operation\n .to_update_tracker()?\n .update_trackers(\n state,\n req_state,\n payment_data.clone(),\n customer.clone(),\n validate_result.storage_scheme,\n None,\n merchant_context.get_merchant_key_store(),\n None,\n header_payload.clone(),\n )\n .await?;\n }\n\n let cloned_payment_data = payment_data.clone();\n let cloned_customer = customer.clone();\n\n #[cfg(feature = \"v1\")]\n operation\n .to_domain()?\n .store_extended_card_info_temporarily(\n state,\n payment_data.get_payment_intent().get_id(),\n &business_profile,\n payment_data.get_payment_method_data(),\n )\n .await?;\n\n utils::trigger_payments_webhook(\n merchant_context.clone(),\n business_profile,\n cloned_payment_data,\n cloned_customer,\n state,\n operation,\n )\n .await\n .map_err(|error| logger::warn!(payments_outgoing_webhook_error=?error))\n .ok();\n\n Ok((\n payment_data,\n req,\n customer,\n connector_http_status_code,\n external_latency,\n ))\n}",
"after_code": "pub async fn payments_operation_core<'a, F, Req, Op, FData, D>(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n profile_id_from_auth_layer: Option<id_type::ProfileId>,\n operation: Op,\n req: Req,\n call_connector_action: CallConnectorAction,\n shadow_ucs_call_connector_action: Option<CallConnectorAction>,\n auth_flow: services::AuthFlow,\n eligible_connectors: Option<Vec<common_enums::RoutableConnectors>>,\n header_payload: HeaderPayload,\n) -> RouterResult<(D, Req, Option<domain::Customer>, Option<u16>, Option<u128>)>\nwhere\n F: Send + Clone + Sync + Debug + 'static,\n Req: Authenticate + Clone,\n Op: Operation<F, Req, Data = D> + Send + Sync,\n D: OperationSessionGetters<F> + OperationSessionSetters<F> + Send + Sync + Clone,\n\n // To create connector flow specific interface data\n D: ConstructFlowSpecificData<F, FData, router_types::PaymentsResponseData>,\n RouterData<F, FData, router_types::PaymentsResponseData>: Feature<F, FData>,\n\n // To construct connector flow specific api\n dyn api::Connector:\n services::api::ConnectorIntegration<F, FData, router_types::PaymentsResponseData>,\n\n // To perform router related operation for PaymentResponse\n PaymentResponse: Operation<F, FData, Data = D>,\n FData: Send + Sync + Clone + router_types::Capturable + 'static + serde::Serialize,\n{\n let operation: BoxedOperation<'_, F, Req, D> = Box::new(operation);\n\n tracing::Span::current().record(\n \"merchant_id\",\n merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr(),\n );\n let (operation, validate_result) = operation\n .to_validate_request()?\n .validate_request(&req, merchant_context)?;\n\n tracing::Span::current().record(\"payment_id\", format!(\"{}\", validate_result.payment_id));\n // get profile from headers\n let operations::GetTrackerResponse {\n operation,\n customer_details,\n mut payment_data,\n business_profile,\n mandate_type,\n } = operation\n .to_get_tracker()?\n .get_trackers(\n state,\n &validate_result.payment_id,\n &req,\n merchant_context,\n auth_flow,\n &header_payload,\n )\n .await?;\n\n operation\n .to_get_tracker()?\n .validate_request_with_state(state, &req, &mut payment_data, &business_profile)\n .await?;\n\n core_utils::validate_profile_id_from_auth_layer(\n profile_id_from_auth_layer,\n &payment_data.get_payment_intent().clone(),\n )?;\n\n let (operation, customer) = operation\n .to_domain()?\n // get_customer_details\n .get_or_create_customer_details(\n state,\n &mut payment_data,\n customer_details,\n merchant_context.get_merchant_key_store(),\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::CustomerNotFound)\n .attach_printable(\"Failed while fetching/creating customer\")?;\n\n let authentication_type =\n call_decision_manager(state, merchant_context, &business_profile, &payment_data).await?;\n\n payment_data.set_authentication_type_in_attempt(authentication_type);\n\n let connector = get_connector_choice(\n &operation,\n state,\n &req,\n merchant_context,\n &business_profile,\n &mut payment_data,\n eligible_connectors,\n mandate_type,\n )\n .await?;\n\n let payment_method_token = get_decrypted_wallet_payment_method_token(\n &operation,\n state,\n merchant_context,\n &mut payment_data,\n connector.as_ref(),\n )\n .await?;\n\n payment_method_token.map(|token| payment_data.set_payment_method_token(Some(token)));\n\n let (connector, debit_routing_output) = debit_routing::perform_debit_routing(\n &operation,\n state,\n &business_profile,\n &mut payment_data,\n connector,\n )\n .await;\n\n operation\n .to_domain()?\n .apply_three_ds_authentication_strategy(state, &mut payment_data, &business_profile)\n .await?;\n\n let should_add_task_to_process_tracker = should_add_task_to_process_tracker(&payment_data);\n\n let locale = header_payload.locale.clone();\n\n payment_data = tokenize_in_router_when_confirm_false_or_external_authentication(\n state,\n &operation,\n &mut payment_data,\n &validate_result,\n merchant_context.get_merchant_key_store(),\n &customer,\n &business_profile,\n )\n .await?;\n\n let mut connector_http_status_code = None;\n let mut external_latency = None;\n if let Some(connector_details) = connector {\n // Fetch and check FRM configs\n #[cfg(feature = \"frm\")]\n let mut frm_info = None;\n #[allow(unused_variables, unused_mut)]\n let mut should_continue_transaction: bool = true;\n #[cfg(feature = \"frm\")]\n let mut should_continue_capture: bool = true;\n #[cfg(feature = \"frm\")]\n let frm_configs = if state.conf.frm.enabled {\n Box::pin(frm_core::call_frm_before_connector_call(\n &operation,\n merchant_context,\n &mut payment_data,\n state,\n &mut frm_info,\n &customer,\n &mut should_continue_transaction,\n &mut should_continue_capture,\n ))\n .await?\n } else {\n None\n };\n #[cfg(feature = \"frm\")]\n logger::debug!(\n \"frm_configs: {:?}\\nshould_continue_transaction: {:?}\\nshould_continue_capture: {:?}\",\n frm_configs,\n should_continue_transaction,\n should_continue_capture,\n );\n\n let is_eligible_for_uas = helpers::is_merchant_eligible_authentication_service(\n merchant_context.get_merchant_account().get_id(),\n state,\n )\n .await?;\n\n if is_eligible_for_uas {\n operation\n .to_domain()?\n .call_unified_authentication_service_if_eligible(\n state,\n &mut payment_data,\n &mut should_continue_transaction,\n &connector_details,\n &business_profile,\n merchant_context.get_merchant_key_store(),\n mandate_type,\n )\n .await?;\n } else {\n logger::info!(\n \"skipping authentication service call since the merchant is not eligible.\"\n );\n\n operation\n .to_domain()?\n .call_external_three_ds_authentication_if_eligible(\n state,\n &mut payment_data,\n &mut should_continue_transaction,\n &connector_details,\n &business_profile,\n merchant_context.get_merchant_key_store(),\n mandate_type,\n )\n .await?;\n };\n\n operation\n .to_domain()?\n .payments_dynamic_tax_calculation(\n state,\n &mut payment_data,\n &connector_details,\n &business_profile,\n merchant_context,\n )\n .await?;\n\n if should_continue_transaction {\n #[cfg(feature = \"frm\")]\n match (\n should_continue_capture,\n payment_data.get_payment_attempt().capture_method,\n ) {\n (\n false,\n Some(storage_enums::CaptureMethod::Automatic)\n | Some(storage_enums::CaptureMethod::SequentialAutomatic),\n )\n | (false, Some(storage_enums::CaptureMethod::Scheduled)) => {\n if let Some(info) = &mut frm_info {\n if let Some(frm_data) = &mut info.frm_data {\n frm_data.fraud_check.payment_capture_method =\n payment_data.get_payment_attempt().capture_method;\n }\n }\n payment_data\n .set_capture_method_in_attempt(storage_enums::CaptureMethod::Manual);\n logger::debug!(\"payment_id : {:?} capture method has been changed to manual, since it has configured Post FRM flow\",payment_data.get_payment_attempt().payment_id);\n }\n _ => (),\n };\n\n payment_data = match connector_details {\n ConnectorCallType::PreDetermined(ref connector) => {\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n let routable_connectors = convert_connector_data_to_routable_connectors(\n std::slice::from_ref(connector),\n )\n .map_err(|e| logger::error!(routable_connector_error=?e))\n .unwrap_or_default();\n let schedule_time = if should_add_task_to_process_tracker {\n payment_sync::get_sync_process_schedule_time(\n &*state.store,\n connector.connector_data.connector.id(),\n merchant_context.get_merchant_account().get_id(),\n 0,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while getting process schedule time\")?\n } else {\n None\n };\n\n let (merchant_connector_account, router_data, tokenization_action) =\n call_connector_service_prerequisites(\n state,\n merchant_context,\n connector.connector_data.clone(),\n &operation,\n &mut payment_data,\n &customer,\n &validate_result,\n &business_profile,\n false,\n None,\n )\n .await?;\n\n let (router_data, mca) = decide_unified_connector_service_call(\n state,\n req_state.clone(),\n merchant_context,\n connector.connector_data.clone(),\n &operation,\n &mut payment_data,\n &customer,\n call_connector_action.clone(),\n shadow_ucs_call_connector_action.clone(),\n &validate_result,\n schedule_time,\n header_payload.clone(),\n #[cfg(feature = \"frm\")]\n frm_info.as_ref().and_then(|fi| fi.suggested_action),\n #[cfg(not(feature = \"frm\"))]\n None,\n &business_profile,\n false,\n <Req as Authenticate>::should_return_raw_response(&req),\n merchant_connector_account,\n router_data,\n tokenization_action,\n )\n .await?;\n\n let op_ref = &operation;\n let should_trigger_post_processing_flows = is_operation_confirm(&operation);\n\n let operation = Box::new(PaymentResponse);\n\n connector_http_status_code = router_data.connector_http_status_code;\n external_latency = router_data.external_latency;\n //add connector http status code metrics\n add_connector_http_status_code_metrics(connector_http_status_code);\n\n operation\n .to_post_update_tracker()?\n .save_pm_and_mandate(\n state,\n &router_data,\n merchant_context,\n &mut payment_data,\n &business_profile,\n )\n .await?;\n\n let mut payment_data = operation\n .to_post_update_tracker()?\n .update_tracker(\n state,\n payment_data,\n router_data,\n merchant_context.get_merchant_key_store(),\n merchant_context.get_merchant_account().storage_scheme,\n &locale,\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n routable_connectors,\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n &business_profile,\n )\n .await?;\n\n if should_trigger_post_processing_flows {\n complete_postprocessing_steps_if_required(\n state,\n merchant_context,\n &customer,\n &mca,\n &connector.connector_data,\n &mut payment_data,\n op_ref,\n Some(header_payload.clone()),\n )\n .await?;\n }\n\n if is_eligible_for_uas {\n complete_confirmation_for_click_to_pay_if_required(\n state,\n merchant_context,\n &payment_data,\n )\n .await?;\n }\n\n payment_data\n }\n\n ConnectorCallType::Retryable(ref connectors) => {\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n let routable_connectors =\n convert_connector_data_to_routable_connectors(connectors)\n .map_err(|e| logger::error!(routable_connector_error=?e))\n .unwrap_or_default();\n\n let mut connectors = connectors.clone().into_iter();\n\n let (connector_data, routing_decision) =\n get_connector_data_with_routing_decision(\n &mut connectors,\n &business_profile,\n debit_routing_output,\n )?;\n\n let schedule_time = if should_add_task_to_process_tracker {\n payment_sync::get_sync_process_schedule_time(\n &*state.store,\n connector_data.connector.id(),\n merchant_context.get_merchant_account().get_id(),\n 0,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while getting process schedule time\")?\n } else {\n None\n };\n\n let (merchant_connector_account, router_data, tokenization_action) =\n call_connector_service_prerequisites(\n state,\n merchant_context,\n connector_data.clone(),\n &operation,\n &mut payment_data,\n &customer,\n &validate_result,\n &business_profile,\n false,\n routing_decision,\n )\n .await?;\n\n let (router_data, mca) = decide_unified_connector_service_call(\n state,\n req_state.clone(),\n merchant_context,\n connector_data.clone(),\n &operation,\n &mut payment_data,\n &customer,\n call_connector_action.clone(),\n shadow_ucs_call_connector_action,\n &validate_result,\n schedule_time,\n header_payload.clone(),\n #[cfg(feature = \"frm\")]\n frm_info.as_ref().and_then(|fi| fi.suggested_action),\n #[cfg(not(feature = \"frm\"))]\n None,\n &business_profile,\n false,\n <Req as Authenticate>::should_return_raw_response(&req),\n merchant_connector_account,\n router_data,\n tokenization_action,\n )\n .await?;\n\n #[cfg(all(feature = \"retry\", feature = \"v1\"))]\n let mut router_data = router_data;\n #[cfg(all(feature = \"retry\", feature = \"v1\"))]\n {\n use crate::core::payments::retry::{self, GsmValidation};\n let config_bool = retry::config_should_call_gsm(\n &*state.store,\n merchant_context.get_merchant_account().get_id(),\n &business_profile,\n )\n .await;\n\n if config_bool && router_data.should_call_gsm() {\n router_data = retry::do_gsm_actions(\n state,\n req_state.clone(),\n &mut payment_data,\n connectors,\n &connector_data,\n router_data,\n merchant_context,\n &operation,\n &customer,\n &validate_result,\n schedule_time,\n #[cfg(feature = \"frm\")]\n frm_info.as_ref().and_then(|fi| fi.suggested_action),\n #[cfg(not(feature = \"frm\"))]\n None,\n &business_profile,\n )\n .await?;\n };\n }\n\n let op_ref = &operation;\n let should_trigger_post_processing_flows = is_operation_confirm(&operation);\n\n let operation = Box::new(PaymentResponse);\n connector_http_status_code = router_data.connector_http_status_code;\n external_latency = router_data.external_latency;\n //add connector http status code metrics\n add_connector_http_status_code_metrics(connector_http_status_code);\n\n operation\n .to_post_update_tracker()?\n .save_pm_and_mandate(\n state,\n &router_data,\n merchant_context,\n &mut payment_data,\n &business_profile,\n )\n .await?;\n\n let mut payment_data = operation\n .to_post_update_tracker()?\n .update_tracker(\n state,\n payment_data,\n router_data,\n merchant_context.get_merchant_key_store(),\n merchant_context.get_merchant_account().storage_scheme,\n &locale,\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n routable_connectors,\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n &business_profile,\n )\n .await?;\n\n if should_trigger_post_processing_flows {\n complete_postprocessing_steps_if_required(\n state,\n merchant_context,\n &customer,\n &mca,\n &connector_data,\n &mut payment_data,\n op_ref,\n Some(header_payload.clone()),\n )\n .await?;\n }\n\n if is_eligible_for_uas {\n complete_confirmation_for_click_to_pay_if_required(\n state,\n merchant_context,\n &payment_data,\n )\n .await?;\n }\n\n payment_data\n }\n\n ConnectorCallType::SessionMultiple(connectors) => {\n let session_surcharge_details =\n call_surcharge_decision_management_for_session_flow(\n state,\n merchant_context,\n &business_profile,\n payment_data.get_payment_attempt(),\n payment_data.get_payment_intent(),\n payment_data.get_billing_address(),\n &connectors,\n )\n .await?;\n Box::pin(call_multiple_connectors_service(\n state,\n merchant_context,\n connectors,\n &operation,\n payment_data,\n &customer,\n session_surcharge_details,\n &business_profile,\n header_payload.clone(),\n <Req as Authenticate>::should_return_raw_response(&req),\n ))\n .await?\n }\n };\n\n #[cfg(feature = \"frm\")]\n if let Some(fraud_info) = &mut frm_info {\n #[cfg(feature = \"v1\")]\n Box::pin(frm_core::post_payment_frm_core(\n state,\n req_state,\n merchant_context,\n &mut payment_data,\n fraud_info,\n frm_configs\n .clone()\n .ok_or(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"frm_configs\",\n })\n .attach_printable(\"Frm configs label not found\")?,\n &customer,\n &mut should_continue_capture,\n ))\n .await?;\n }\n } else {\n (_, payment_data) = operation\n .to_update_tracker()?\n .update_trackers(\n state,\n req_state,\n payment_data.clone(),\n customer.clone(),\n validate_result.storage_scheme,\n None,\n merchant_context.get_merchant_key_store(),\n #[cfg(feature = \"frm\")]\n frm_info.and_then(|info| info.suggested_action),\n #[cfg(not(feature = \"frm\"))]\n None,\n header_payload.clone(),\n )\n .await?;\n }\n\n let payment_intent_status = payment_data.get_payment_intent().status;\n\n payment_data\n .get_payment_attempt()\n .payment_token\n .as_ref()\n .zip(payment_data.get_payment_attempt().payment_method)\n .map(ParentPaymentMethodToken::create_key_for_token)\n .async_map(|key_for_hyperswitch_token| async move {\n if key_for_hyperswitch_token\n .should_delete_payment_method_token(payment_intent_status)\n {\n let _ = key_for_hyperswitch_token.delete(state).await;\n }\n })\n .await;\n } else {\n (_, payment_data) = operation\n .to_update_tracker()?\n .update_trackers(\n state,\n req_state,\n payment_data.clone(),\n customer.clone(),\n validate_result.storage_scheme,\n None,\n merchant_context.get_merchant_key_store(),\n None,\n header_payload.clone(),\n )\n .await?;\n }\n\n let cloned_payment_data = payment_data.clone();\n let cloned_customer = customer.clone();\n\n #[cfg(feature = \"v1\")]\n operation\n .to_domain()?\n .store_extended_card_info_temporarily(\n state,\n payment_data.get_payment_intent().get_id(),\n &business_profile,\n payment_data.get_payment_method_data(),\n )\n .await?;\n\n utils::trigger_payments_webhook(\n merchant_context.clone(),\n business_profile,\n cloned_payment_data,\n cloned_customer,\n state,\n operation,\n )\n .await\n .map_err(|error| logger::warn!(payments_outgoing_webhook_error=?error))\n .ok();\n\n Ok((\n payment_data,\n req,\n customer,\n connector_http_status_code,\n external_latency,\n ))\n}",
"diff_span": {
"before": ") -> RouterResult<(D, Req, Option<domain::Customer>, Option<u16>, Option<u128>)>\nwhere\n F: Send + Clone + Sync + 'static,\n Req: Authenticate + Clone,\n Op: Operation<F, Req, Data = D> + Send + Sync,",
"after": ") -> RouterResult<(D, Req, Option<domain::Customer>, Option<u16>, Option<u128>)>\nwhere\n F: Send + Clone + Sync + Debug + 'static,\n Req: Authenticate + Clone,\n Op: Operation<F, Req, Data = D> + Send + Sync,"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/hyperswitch_interfaces/src/api.rs::trait::ConnectorAccessTokenSuffix",
"file": "crates/hyperswitch_interfaces/src/api.rs",
"kind": "trait_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "pub trait ConnectorAccessTokenSuffix {\n /// fn get_access_token_suffix_from_connector\n fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n _router_data: &RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(None)\n }\n}",
"after_code": "pub trait ConnectorAccessTokenSuffix {\n /// Function to get dynamic access token key suffix from Connector\n fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError>;\n}",
"diff_span": {
"before": "pub trait ConnectorAccessTokenSuffix {\n /// fn get_access_token_suffix_from_connector\n fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n _router_data: &RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(None)\n }\n}",
"after": "pub trait ConnectorAccessTokenSuffix {\n /// Function to get dynamic access token key suffix from Connector\n fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError>;\n}"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/core/payments/access_token.rs::function::get_cached_access_token_for_ucs",
"file": "crates/router/src/core/payments/access_token.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "pub async fn get_cached_access_token_for_ucs(\n state: &SessionState,\n connector: &api_types::ConnectorData,\n merchant_context: &domain::MerchantContext,\n payment_method: common_enums::PaymentMethod,\n creds_identifier: Option<&str>,\n) -> RouterResult<Option<types::AccessToken>> {\n if connector\n .connector_name\n .supports_access_token(payment_method)\n {\n let merchant_id = merchant_context.get_merchant_account().get_id();\n let store = &*state.store;\n\n let merchant_connector_id_or_connector_name = connector\n .merchant_connector_id\n .clone()\n .map(|mca_id| mca_id.get_string_repr().to_string())\n .or(creds_identifier.map(|id| id.to_string()))\n .unwrap_or(connector.connector_name.to_string());\n\n let cached_access_token = store\n .get_access_token(merchant_id, &merchant_connector_id_or_connector_name, None)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when accessing the access token\")?;\n\n if let Some(access_token) = cached_access_token {\n router_env::logger::info!(\n \"Cached access token found for UCS flow - merchant_id: {:?}, connector: {} with expiry of: {} seconds\",\n merchant_context.get_merchant_account().get_id(),\n connector.connector_name,\n access_token.expires\n );\n metrics::ACCESS_TOKEN_CACHE_HIT.add(\n 1,\n router_env::metric_attributes!((\"connector\", connector.connector_name.to_string())),\n );\n Ok(Some(access_token))\n } else {\n router_env::logger::info!(\n \"No cached access token found for UCS flow - UCS will generate internally - merchant_id: {:?}, connector: {}\",\n merchant_context.get_merchant_account().get_id(),\n connector.connector_name\n );\n metrics::ACCESS_TOKEN_CACHE_MISS.add(\n 1,\n router_env::metric_attributes!((\"connector\", connector.connector_name.to_string())),\n );\n Ok(None)\n }\n } else {\n Ok(None)\n }\n}",
"after_code": "pub async fn get_cached_access_token_for_ucs(\n state: &SessionState,\n connector: &api_types::ConnectorData,\n merchant_context: &domain::MerchantContext,\n payment_method: common_enums::PaymentMethod,\n creds_identifier: Option<&str>,\n) -> RouterResult<Option<types::AccessToken>> {\n if connector\n .connector_name\n .supports_access_token(payment_method)\n {\n let merchant_id = merchant_context.get_merchant_account().get_id();\n let store = &*state.store;\n\n let merchant_connector_id_or_connector_name = connector\n .merchant_connector_id\n .clone()\n .map(|mca_id| mca_id.get_string_repr().to_string())\n .or(creds_identifier.map(|id| id.to_string()))\n .unwrap_or(connector.connector_name.to_string());\n\n let key = format!(\n \"access_token_{}_{}\",\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n );\n\n let cached_access_token = store\n .get_access_token(key)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"DB error when accessing the access token\")?;\n\n if let Some(access_token) = cached_access_token {\n router_env::logger::info!(\n \"Cached access token found for UCS flow - merchant_id: {:?}, connector: {} with expiry of: {} seconds\",\n merchant_context.get_merchant_account().get_id(),\n connector.connector_name,\n access_token.expires\n );\n metrics::ACCESS_TOKEN_CACHE_HIT.add(\n 1,\n router_env::metric_attributes!((\"connector\", connector.connector_name.to_string())),\n );\n Ok(Some(access_token))\n } else {\n router_env::logger::info!(\n \"No cached access token found for UCS flow - UCS will generate internally - merchant_id: {:?}, connector: {}\",\n merchant_context.get_merchant_account().get_id(),\n connector.connector_name\n );\n metrics::ACCESS_TOKEN_CACHE_MISS.add(\n 1,\n router_env::metric_attributes!((\"connector\", connector.connector_name.to_string())),\n );\n Ok(None)\n }\n } else {\n Ok(None)\n }\n}",
"diff_span": {
"before": "\n let cached_access_token = store\n .get_access_token(merchant_id, &merchant_connector_id_or_connector_name, None)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)",
"after": " .unwrap_or(connector.connector_name.to_string());\n\n let key = format!(\n \"access_token_{}_{}\",\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n );\n\n let cached_access_token = store\n .get_access_token(key)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/db/merchant_connector_account.rs::trait::ConnectorAccessToken",
"file": "crates/router/src/db/merchant_connector_account.rs",
"kind": "trait_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "pub trait ConnectorAccessToken {\n async fn get_access_token(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError>;\n\n async fn set_access_token(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n access_token: types::AccessToken,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<(), errors::StorageError>;\n}",
"after_code": "pub trait ConnectorAccessToken {\n async fn get_access_token(\n &self,\n &key: String,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError>;\n\n async fn set_access_token(\n &self,\n key: String,\n access_token: types::AccessToken,\n ) -> CustomResult<(), errors::StorageError>;\n}",
"diff_span": {
"before": " async fn get_access_token(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError>;\n\n async fn set_access_token(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n access_token: types::AccessToken,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<(), errors::StorageError>;\n}",
"after": " async fn get_access_token(\n &self,\n &key: String,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError>;\n\n async fn set_access_token(\n &self,\n key: String,\n access_token: types::AccessToken,\n ) -> CustomResult<(), errors::StorageError>;"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/db/merchant_connector_account.rs::impl::Store",
"file": "crates/router/src/db/merchant_connector_account.rs",
"kind": "impl_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "impl ConnectorAccessToken for Store {\n #[instrument(skip_all)]\n async fn get_access_token(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n //TODO: Handle race condition\n // This function should acquire a global lock on some resource, if access token is already\n // being refreshed by other request then wait till it finishes and use the same access token\n let key = common_utils::access_token::create_access_token_key(\n merchant_id,\n merchant_connector_id_or_connector_name,\n access_token_key_suffix_from_connector,\n );\n\n let maybe_token = self\n .get_redis_conn()\n .map_err(Into::<errors::StorageError>::into)?\n .get_key::<Option<Vec<u8>>>(&key.into())\n .await\n .change_context(errors::StorageError::KVError)\n .attach_printable(\"DB error when getting access token\")?;\n\n let access_token = maybe_token\n .map(|token| token.parse_struct::<types::AccessToken>(\"AccessToken\"))\n .transpose()\n .change_context(errors::StorageError::DeserializationFailed)?;\n\n Ok(access_token)\n }\n\n #[instrument(skip_all)]\n async fn set_access_token(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n access_token: types::AccessToken,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<(), errors::StorageError> {\n let key = common_utils::access_token::create_access_token_key(\n merchant_id,\n merchant_connector_id_or_connector_name,\n access_token_key_suffix_from_connector,\n );\n let serialized_access_token = access_token\n .encode_to_string_of_json()\n .change_context(errors::StorageError::SerializationFailed)?;\n self.get_redis_conn()\n .map_err(Into::<errors::StorageError>::into)?\n .set_key_with_expiry(&key.into(), serialized_access_token, access_token.expires)\n .await\n .change_context(errors::StorageError::KVError)\n }\n}",
"after_code": "impl ConnectorAccessToken for Store {\n #[instrument(skip_all)]\n async fn get_access_token(\n &self,\n key: String,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n //TODO: Handle race condition\n // This function should acquire a global lock on some resource, if access token is already\n // being refreshed by other request then wait till it finishes and use the same access token\n\n let maybe_token = self\n .get_redis_conn()\n .map_err(Into::<errors::StorageError>::into)?\n .get_key::<Option<Vec<u8>>>(&key.into())\n .await\n .change_context(errors::StorageError::KVError)\n .attach_printable(\"DB error when getting access token\")?;\n\n let access_token = maybe_token\n .map(|token| token.parse_struct::<types::AccessToken>(\"AccessToken\"))\n .transpose()\n .change_context(errors::StorageError::DeserializationFailed)?;\n\n Ok(access_token)\n }\n\n #[instrument(skip_all)]\n async fn set_access_token(\n &self,\n key: String,\n access_token: types::AccessToken,\n ) -> CustomResult<(), errors::StorageError> {\n let serialized_access_token = access_token\n .encode_to_string_of_json()\n .change_context(errors::StorageError::SerializationFailed)?;\n self.get_redis_conn()\n .map_err(Into::<errors::StorageError>::into)?\n .set_key_with_expiry(&key.into(), serialized_access_token, access_token.expires)\n .await\n .change_context(errors::StorageError::KVError)\n }\n}",
"diff_span": {
"before": " async fn get_access_token(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n //TODO: Handle race condition\n // This function should acquire a global lock on some resource, if access token is already\n // being refreshed by other request then wait till it finishes and use the same access token\n let key = common_utils::access_token::create_access_token_key(\n merchant_id,\n merchant_connector_id_or_connector_name,\n access_token_key_suffix_from_connector,\n );\n\n let maybe_token = self\n .get_redis_conn()\n .map_err(Into::<errors::StorageError>::into)?\n .get_key::<Option<Vec<u8>>>(&key.into())\n .await\n .change_context(errors::StorageError::KVError)\n .attach_printable(\"DB error when getting access token\")?;\n\n let access_token = maybe_token\n .map(|token| token.parse_struct::<types::AccessToken>(\"AccessToken\"))\n .transpose()\n .change_context(errors::StorageError::DeserializationFailed)?;\n\n Ok(access_token)\n }\n\n #[instrument(skip_all)]\n async fn set_access_token(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n access_token: types::AccessToken,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<(), errors::StorageError> {\n let key = common_utils::access_token::create_access_token_key(\n merchant_id,\n merchant_connector_id_or_connector_name,\n access_token_key_suffix_from_connector,\n );\n let serialized_access_token = access_token\n .encode_to_string_of_json()",
"after": " async fn get_access_token(\n &self,\n key: String,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n //TODO: Handle race condition\n // This function should acquire a global lock on some resource, if access token is already\n // being refreshed by other request then wait till it finishes and use the same access token\n\n let maybe_token = self\n .get_redis_conn()\n .map_err(Into::<errors::StorageError>::into)?\n .get_key::<Option<Vec<u8>>>(&key.into())\n .await\n .change_context(errors::StorageError::KVError)\n .attach_printable(\"DB error when getting access token\")?;\n\n let access_token = maybe_token\n .map(|token| token.parse_struct::<types::AccessToken>(\"AccessToken\"))\n .transpose()\n .change_context(errors::StorageError::DeserializationFailed)?;\n\n Ok(access_token)\n }\n\n #[instrument(skip_all)]\n async fn set_access_token(\n &self,\n key: String,\n access_token: types::AccessToken,\n ) -> CustomResult<(), errors::StorageError> {"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/db/kafka_store.rs::KafkaStore::function::get_access_token",
"file": "crates/router/src/db/kafka_store.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "async fn get_access_token(\n &self,\n merchant_id: &id_type::MerchantId,\n merchant_connector_id: &str,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<Option<AccessToken>, errors::StorageError> {\n self.diesel_store\n .get_access_token(\n merchant_id,\n merchant_connector_id,\n access_token_key_suffix_from_connector,\n )\n .await\n }",
"after_code": "async fn get_access_token(\n &self,\n key: String,\n ) -> CustomResult<Option<AccessToken>, errors::StorageError> {\n self.diesel_store.get_access_token(key).await\n }",
"diff_span": {
"before": "async fn get_access_token(\n &self,\n merchant_id: &id_type::MerchantId,\n merchant_connector_id: &str,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<Option<AccessToken>, errors::StorageError> {\n self.diesel_store\n .get_access_token(\n merchant_id,\n merchant_connector_id,\n access_token_key_suffix_from_connector,\n )\n .await\n }",
"after": "async fn get_access_token(\n &self,\n key: String,\n ) -> CustomResult<Option<AccessToken>, errors::StorageError> {\n self.diesel_store.get_access_token(key).await\n }"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/hyperswitch_interfaces/src/api.rs::BoxedConnector::function::get_access_token_suffix_from_connector",
"file": "crates/hyperswitch_interfaces/src/api.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n _router_data: &RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(None)\n }",
"after_code": "fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n Ok(format!(\n \"access_token_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n ))\n }",
"diff_span": {
"before": "fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n _router_data: &RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(None)\n }",
"after": "fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n Ok(format!(\n \"access_token_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n ))\n }"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/db/kafka_store.rs::KafkaStore::function::set_access_token",
"file": "crates/router/src/db/kafka_store.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "async fn set_access_token(\n &self,\n merchant_id: &id_type::MerchantId,\n merchant_connector_id: &str,\n access_token: AccessToken,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<(), errors::StorageError> {\n self.diesel_store\n .set_access_token(\n merchant_id,\n merchant_connector_id,\n access_token,\n access_token_key_suffix_from_connector,\n )\n .await\n }",
"after_code": "async fn set_access_token(\n &self,\n key: String,\n access_token: AccessToken,\n ) -> CustomResult<(), errors::StorageError> {\n self.diesel_store.set_access_token(key, access_token).await\n }",
"diff_span": {
"before": "async fn set_access_token(\n &self,\n merchant_id: &id_type::MerchantId,\n merchant_connector_id: &str,\n access_token: AccessToken,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<(), errors::StorageError> {\n self.diesel_store\n .set_access_token(\n merchant_id,\n merchant_connector_id,\n access_token,\n access_token_key_suffix_from_connector,\n )\n .await\n }",
"after": "async fn set_access_token(\n &self,\n key: String,\n access_token: AccessToken,\n ) -> CustomResult<(), errors::StorageError> {\n self.diesel_store.set_access_token(key, access_token).await\n }"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/db/merchant_connector_account.rs::MockDb::function::set_access_token",
"file": "crates/router/src/db/merchant_connector_account.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "async fn set_access_token(\n &self,\n _merchant_id: &common_utils::id_type::MerchantId,\n _merchant_connector_id_or_connector_name: &str,\n _access_token: types::AccessToken,\n _access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<(), errors::StorageError> {\n Ok(())\n }",
"after_code": "async fn set_access_token(\n &self,\n _key: String,\n _access_token: types::AccessToken,\n ) -> CustomResult<(), errors::StorageError> {\n Ok(())\n }",
"diff_span": {
"before": "async fn set_access_token(\n &self,\n _merchant_id: &common_utils::id_type::MerchantId,\n _merchant_connector_id_or_connector_name: &str,\n _access_token: types::AccessToken,\n _access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<(), errors::StorageError> {\n Ok(())",
"after": "async fn set_access_token(\n &self,\n _key: String,\n _access_token: types::AccessToken,\n ) -> CustomResult<(), errors::StorageError> {"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/hyperswitch_interfaces/src/api.rs::impl::BoxedConnector",
"file": "crates/hyperswitch_interfaces/src/api.rs",
"kind": "impl_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "impl ConnectorAccessTokenSuffix for BoxedConnector {\n fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n _router_data: &RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(None)\n }\n}",
"after_code": "impl ConnectorAccessTokenSuffix for BoxedConnector {\n fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n Ok(format!(\n \"access_token_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n ))\n }\n}",
"diff_span": {
"before": " fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n _router_data: &RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(None)\n }\n}",
"after": " fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n Ok(format!(\n \"access_token_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n ))\n }\n}"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/core/payments.rs::function::validate_customer_details_for_click_to_pay",
"file": "crates/router/src/core/payments.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "fn validate_customer_details_for_click_to_pay(customer_details: &CustomerData) -> RouterResult<()> {\n match (\n customer_details.phone.as_ref(),\n customer_details.phone_country_code.as_ref(),\n customer_details.email.as_ref()\n ) {\n (None, None, Some(_)) => Ok(()),\n (Some(_), Some(_), Some(_)) => Ok(()),\n (Some(_), Some(_), None) => Ok(()),\n (Some(_), None, Some(_)) => Ok(()),\n (None, Some(_), None) => Err(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"phone\",\n })\n .attach_printable(\"phone number is not present in payment_intent.customer_details\"),\n (Some(_), None, None) => Err(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"phone_country_code\",\n })\n .attach_printable(\"phone_country_code is not present in payment_intent.customer_details\"),\n (_, _, _) => Err(errors::ApiErrorResponse::MissingRequiredFields {\n field_names: vec![\"phone\", \"phone_country_code\", \"email\"],\n })\n .attach_printable(\"either of phone, phone_country_code or email is not present in payment_intent.customer_details\"),\n }\n}",
"after_code": "pub fn validate_customer_details_for_click_to_pay(\n customer_details: &CustomerData,\n) -> RouterResult<()> {\n match (\n customer_details.phone.as_ref(),\n customer_details.phone_country_code.as_ref(),\n customer_details.email.as_ref()\n ) {\n (None, None, Some(_)) => Ok(()),\n (Some(_), Some(_), Some(_)) => Ok(()),\n (Some(_), Some(_), None) => Ok(()),\n (Some(_), None, Some(_)) => Ok(()),\n (None, Some(_), None) => Err(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"phone\",\n })\n .attach_printable(\"phone number is not present in payment_intent.customer_details\"),\n (Some(_), None, None) => Err(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"phone_country_code\",\n })\n .attach_printable(\"phone_country_code is not present in payment_intent.customer_details\"),\n (_, _, _) => Err(errors::ApiErrorResponse::MissingRequiredFields {\n field_names: vec![\"phone\", \"phone_country_code\", \"email\"],\n })\n .attach_printable(\"either of phone, phone_country_code or email is not present in payment_intent.customer_details\"),\n }\n}",
"diff_span": {
"before": "fn validate_customer_details_for_click_to_pay(customer_details: &CustomerData) -> RouterResult<()> {\n match (\n customer_details.phone.as_ref(),",
"after": "pub fn validate_customer_details_for_click_to_pay(\n customer_details: &CustomerData,\n) -> RouterResult<()> {\n match (\n customer_details.phone.as_ref(),"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/db/merchant_connector_account.rs::Store::function::get_access_token",
"file": "crates/router/src/db/merchant_connector_account.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "async fn get_access_token(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n //TODO: Handle race condition\n // This function should acquire a global lock on some resource, if access token is already\n // being refreshed by other request then wait till it finishes and use the same access token\n let key = common_utils::access_token::create_access_token_key(\n merchant_id,\n merchant_connector_id_or_connector_name,\n access_token_key_suffix_from_connector,\n );\n\n let maybe_token = self\n .get_redis_conn()\n .map_err(Into::<errors::StorageError>::into)?\n .get_key::<Option<Vec<u8>>>(&key.into())\n .await\n .change_context(errors::StorageError::KVError)\n .attach_printable(\"DB error when getting access token\")?;\n\n let access_token = maybe_token\n .map(|token| token.parse_struct::<types::AccessToken>(\"AccessToken\"))\n .transpose()\n .change_context(errors::StorageError::DeserializationFailed)?;\n\n Ok(access_token)\n }",
"after_code": "async fn get_access_token(\n &self,\n key: String,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n //TODO: Handle race condition\n // This function should acquire a global lock on some resource, if access token is already\n // being refreshed by other request then wait till it finishes and use the same access token\n\n let maybe_token = self\n .get_redis_conn()\n .map_err(Into::<errors::StorageError>::into)?\n .get_key::<Option<Vec<u8>>>(&key.into())\n .await\n .change_context(errors::StorageError::KVError)\n .attach_printable(\"DB error when getting access token\")?;\n\n let access_token = maybe_token\n .map(|token| token.parse_struct::<types::AccessToken>(\"AccessToken\"))\n .transpose()\n .change_context(errors::StorageError::DeserializationFailed)?;\n\n Ok(access_token)\n }",
"diff_span": {
"before": "async fn get_access_token(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n //TODO: Handle race condition\n // This function should acquire a global lock on some resource, if access token is already\n // being refreshed by other request then wait till it finishes and use the same access token\n let key = common_utils::access_token::create_access_token_key(\n merchant_id,\n merchant_connector_id_or_connector_name,\n access_token_key_suffix_from_connector,\n );\n\n let maybe_token = self",
"after": "async fn get_access_token(\n &self,\n key: String,\n ) -> CustomResult<Option<types::AccessToken>, errors::StorageError> {\n //TODO: Handle race condition"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/hyperswitch_interfaces/src/connector_integration_v2.rs::impl::BoxedConnectorV2",
"file": "crates/hyperswitch_interfaces/src/connector_integration_v2.rs",
"kind": "impl_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "impl api::ConnectorAccessTokenSuffix for BoxedConnectorV2 {\n fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n _router_data: &hyperswitch_domain_models::router_data::RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(None)\n }\n}",
"after_code": "impl api::ConnectorAccessTokenSuffix for BoxedConnectorV2 {\n fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &hyperswitch_domain_models::router_data::RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n Ok(format!(\n \"access_token_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n ))\n }\n}",
"diff_span": {
"before": " fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n _router_data: &hyperswitch_domain_models::router_data::RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(None)\n }\n}",
"after": " fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &hyperswitch_domain_models::router_data::RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n Ok(format!(\n \"access_token_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n ))\n }\n}"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/hyperswitch_interfaces/src/connector_integration_v2.rs::BoxedConnectorV2::function::get_access_token_suffix_from_connector",
"file": "crates/hyperswitch_interfaces/src/connector_integration_v2.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n _router_data: &hyperswitch_domain_models::router_data::RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(None)\n }",
"after_code": "fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &hyperswitch_domain_models::router_data::RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n Ok(format!(\n \"access_token_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n ))\n }",
"diff_span": {
"before": "fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n _router_data: &hyperswitch_domain_models::router_data::RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(None)\n }",
"after": "fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n router_data: &hyperswitch_domain_models::router_data::RouterData<F, Req, Res>,\n merchant_connector_id_or_connector_name: String,\n ) -> CustomResult<String, errors::ConnectorError> {\n Ok(format!(\n \"access_token_{}_{}\",\n router_data.merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name\n ))\n }"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/router/src/db/merchant_connector_account.rs::Store::function::set_access_token",
"file": "crates/router/src/db/merchant_connector_account.rs",
"kind": "function_item",
"status": "modified",
"code_changed": true,
"imports_changed": false,
"before_code": "async fn set_access_token(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n access_token: types::AccessToken,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<(), errors::StorageError> {\n let key = common_utils::access_token::create_access_token_key(\n merchant_id,\n merchant_connector_id_or_connector_name,\n access_token_key_suffix_from_connector,\n );\n let serialized_access_token = access_token\n .encode_to_string_of_json()\n .change_context(errors::StorageError::SerializationFailed)?;\n self.get_redis_conn()\n .map_err(Into::<errors::StorageError>::into)?\n .set_key_with_expiry(&key.into(), serialized_access_token, access_token.expires)\n .await\n .change_context(errors::StorageError::KVError)\n }",
"after_code": "async fn set_access_token(\n &self,\n key: String,\n access_token: types::AccessToken,\n ) -> CustomResult<(), errors::StorageError> {\n let serialized_access_token = access_token\n .encode_to_string_of_json()\n .change_context(errors::StorageError::SerializationFailed)?;\n self.get_redis_conn()\n .map_err(Into::<errors::StorageError>::into)?\n .set_key_with_expiry(&key.into(), serialized_access_token, access_token.expires)\n .await\n .change_context(errors::StorageError::KVError)\n }",
"diff_span": {
"before": "async fn set_access_token(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n access_token: types::AccessToken,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> CustomResult<(), errors::StorageError> {\n let key = common_utils::access_token::create_access_token_key(\n merchant_id,\n merchant_connector_id_or_connector_name,\n access_token_key_suffix_from_connector,\n );\n let serialized_access_token = access_token\n .encode_to_string_of_json()",
"after": "async fn set_access_token(\n &self,\n key: String,\n access_token: types::AccessToken,\n ) -> CustomResult<(), errors::StorageError> {"
},
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/hyperswitch_interfaces/src/api.rs::ConnectorAccessTokenSuffix::function::get_access_token_suffix_from_connector",
"file": "crates/hyperswitch_interfaces/src/api.rs",
"kind": "function_item",
"status": "removed",
"before_code": "fn get_access_token_suffix_from_connector<F, Req, Res>(\n &self,\n _router_data: &RouterData<F, Req, Res>,\n ) -> CustomResult<Option<String>, errors::ConnectorError> {\n Ok(None)\n }",
"after_code": null,
"diff_span": null,
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/common_utils/src/lib.rs::mod::access_token",
"file": "crates/common_utils/src/lib.rs",
"kind": "mod_item",
"status": "removed",
"before_code": "pub mod access_token;",
"after_code": null,
"diff_span": null,
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/common_utils/src/access_token.rs::function::create_access_token_key",
"file": "crates/common_utils/src/access_token.rs",
"kind": "function_item",
"status": "removed",
"before_code": "pub fn create_access_token_key(\n merchant_id: &id_type::MerchantId,\n merchant_connector_id_or_connector_name: impl Display,\n access_token_key_suffix_from_connector: Option<String>,\n) -> String {\n merchant_id.get_access_token_key(\n merchant_connector_id_or_connector_name,\n access_token_key_suffix_from_connector,\n )\n}",
"after_code": null,
"diff_span": null,
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
},
{
"id": "crates/common_utils/src/id_type/merchant.rs::MerchantId::function::get_access_token_key",
"file": "crates/common_utils/src/id_type/merchant.rs",
"kind": "function_item",
"status": "removed",
"before_code": "pub fn get_access_token_key(\n &self,\n merchant_connector_id_or_connector_name: impl Display,\n access_token_key_suffix_from_connector: Option<String>,\n ) -> String {\n match access_token_key_suffix_from_connector {\n Some(key_suffix) => {\n format!(\n \"access_token_{}_{}_{}\",\n self.get_string_repr(),\n merchant_connector_id_or_connector_name,\n key_suffix\n )\n }\n None => {\n format!(\n \"access_token_{}_{}\",\n self.get_string_repr(),\n merchant_connector_id_or_connector_name\n )\n }\n }\n }",
"after_code": null,
"diff_span": null,
"commit_sha": "2bfa3fc048b3fe99dce120908197bf77f4de02db"
}
]
} |