paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

deactivated_redirect: Preserve URL hash when redirecting.

Browse Source 
URL hash from old url is lost using this JS method for redirecting,
preserved by extracting the hash and appending it to the new URL.

In case user clicks on the new url link, we do this by updating that url to
include the hash, and using that URL for the automated redirect as well.

(cherry picked from commit a0c198ad99)
This commit is contained in:
Aman Agrawal
2025-08-28 01:31:52 +05:30
committed by Tim Abbott
parent 858aac9e4b
commit 5351f9cc0c
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
web/src/portico/signup.ts
View File

@@ -495,6 +495,19 @@ $(() => {
});
if ($("a#deactivated-org-auto-redirect").length > 0) {
// Update the href of the deactivated organization auto-redirect link
// to include the current URL hash, if it exists.
const $deactivated_org_auto_redirect = $("a#deactivated-org-auto-redirect");
let new_org_url = $deactivated_org_auto_redirect.attr("href")!;
const url_hash = window.location.hash;
if (url_hash.startsWith("#")) {
// Ensure we don't double-add hashes and handle query parameters properly
const url = new URL(new_org_url);
url.hash = url_hash;
new_org_url = url.toString();
}
$deactivated_org_auto_redirect.attr("href", new_org_url);
// This is a special case for the deactivated organization page,
// where we want to redirect to the login page after 5 seconds.
const interval_id = setInterval(() => {
@@ -503,7 +516,8 @@ $(() => {
if (current_countdown > 0) {
$countdown_elt.text((current_countdown - 1).toString());
} else {
window.location.href = $("a#deactivated-org-auto-redirect").attr("href")!;
const new_org_url = $deactivated_org_auto_redirect.attr("href")!;
window.location.href = new_org_url;
clearInterval(interval_id);
}
}, 1000);