rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-10-30 01:27:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): use redirect url from request (#76)

Browse Source
This commit is contained in:
Narayan Bhat
2022-12-07 13:01:05 +05:30
committed by GitHub
parent c208cd2be7
commit 18aed187aa
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/router/src/core/payments/helpers.rs
View File

@ -829,9 +829,14 @@ pub fn get_handle_response_url(
response: api::PaymentsResponse, response: api::PaymentsResponse,
connector: String, connector: String,
) -> RouterResult<api::RedirectionResponse> { ) -> RouterResult<api::RedirectionResponse> {
let redirection_response = make_pg_redirect_response(payment_id, response, connector); let payments_return_url = response.return_url.as_ref();
let redirection_response = make_pg_redirect_response(payment_id, &response, connector);
let return_url = make_merchant_url_with_response(merchant_account, redirection_response) let return_url = make_merchant_url_with_response(
merchant_account,
redirection_response,
payments_return_url,
)
.attach_printable("Failed to make merchant url with response")?; .attach_printable("Failed to make merchant url with response")?;
make_url_with_signature(&return_url, merchant_account) make_url_with_signature(&return_url, merchant_account)
@ -840,10 +845,11 @@ pub fn get_handle_response_url(
pub fn make_merchant_url_with_response( pub fn make_merchant_url_with_response(
merchant_account: &storage::MerchantAccount, merchant_account: &storage::MerchantAccount,
redirection_response: PgRedirectResponse, redirection_response: PgRedirectResponse,
request_return_url: Option<&String>,
) -> RouterResult<String> { ) -> RouterResult<String> {
let url = merchant_account // take return url if provided in the request else use merchant return url
.return_url let url = request_return_url
.as_ref() .or(merchant_account.return_url.as_ref())
.get_required_value("return_url")?; .get_required_value("return_url")?;
let status_check = redirection_response.status; let status_check = redirection_response.status;
@ -881,7 +887,7 @@ pub fn make_merchant_url_with_response(
pub fn make_pg_redirect_response( pub fn make_pg_redirect_response(
payment_id: String, payment_id: String,
response: api::PaymentsResponse, response: &api::PaymentsResponse,
connector: String, connector: String,
) -> PgRedirectResponse { ) -> PgRedirectResponse {
PgRedirectResponse { PgRedirectResponse {