Skip to content

refactor: handle redirections for iframed content #5591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 12, 2024
Merged

refactor: handle redirections for iframed content #5591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b400a70
refactor: handle redirections for iframed content
kashif-m Aug 12, 2024
1fec70d
docs(openapi): re-generate OpenAPI specification
hyperswitch-bot[bot] Aug 12, 2024
325e784
Merge remote-tracking branch 'origin/main' into iframe-redirections
kashif-m Aug 13, 2024
67b8e51
refactor(payment_link): replace console log with postLog for pushing …
kashif-m Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion crates/router/src/core/generic_link/payout_link/status/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,17 @@ function redirectToEndUrl(returnUrl) {
}
if (secondsLeft === 0) {
setTimeout(function () {
window.location.href = returnUrl.toString();
try {
window.top.location.href = returnUrl.toString();
} catch (error) {
console.error(
"CRITICAL ERROR",
"Failed to redirect top document. Error - ",
error
);
console.info("Redirecting in current document");
window.location.href = returnUrl.toString();
}
}, 1000);
}
}, i * 1000);
Expand Down
2 changes: 1 addition & 1 deletion crates/router/src/core/payment_link/payment_link_initiate/payment_link.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,10 @@
</svg>
</div>
<script>
{{logging_template}}
{{locale_template}}
{{rendered_js}}
{{payment_link_initiator}}
{{logging_template}}
</script>
{{ hyperloader_sdk_link }}
</body>
Expand Down
33 changes: 31 additions & 2 deletions crates/router/src/core/payment_link/payment_link_initiate/secure_payment_link_initiator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if (!isFramed) {
});
var type =
paymentDetails.sdk_layout === "spaced_accordion" ||
paymentDetails.sdk_layout === "accordion"
paymentDetails.sdk_layout === "accordion"
? "accordion"
: paymentDetails.sdk_layout;

Expand Down Expand Up @@ -103,6 +103,35 @@ if (!isFramed) {
arr.splice(0, 3);
arr.unshift("status");
arr.unshift("payment_link");
window.location.href = window.location.origin + "/" + arr.join("/")+ "?locale=" + paymentDetails.locale;
let returnUrl =
window.location.origin +
"/" +
arr.join("/") +
"?locale=" +
paymentDetails.locale;
try {
window.top.location.href = returnUrl;

// Push logs to logs endpoint
} catch (error) {
var url = window.location.href;
var { paymentId, merchantId, attemptId, connector } = parseRoute(url);
var urlToPost = getEnvRoute(url);
var message = {
message: "CRITICAL ERROR - Failed to redirect top document. Falling back to redirecting using window.location",
reason: error.message,
}
var log = {
message,
url,
paymentId,
merchantId,
attemptId,
connector,
};
postLog(log, urlToPost);

window.location.href = returnUrl;
}
}
}
2 changes: 1 addition & 1 deletion crates/router/src/core/payment_link/payment_link_status/status.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700;800"
/>
<script>
{{logging_template}}
{{locale_template}}
{{ rendered_js }}
{{logging_template}}
</script>
</head>
<body onload="boot()">
Expand Down
Loading