Skip to content

A platform for community discussion. Free, open, simple.

FIX: Use `history.replace` for external permalink redirects (#38824)

Régis Hanole8f4e72ce1b6
diff --git a/frontend/discourse/app/lib/ajax.js b/frontend/discourse/app/lib/ajax.js
index 5c4bfbacafb..de048e90cd3 100644
--- a/frontend/discourse/app/lib/ajax.js
+++ b/frontend/discourse/app/lib/ajax.js
@@ -57,7 +57,7 @@ export function handleLogoff(xhr) {
function handleRedirect(xhr) {
if (xhr && xhr.getResponseHeader("Discourse-Xhr-Redirect")) {
- DiscourseURL.redirectAbsolute(xhr.responseText);
+ DiscourseURL.redirectAbsolute(xhr.responseText, { replace: true });
return true;
}
return false;
diff --git a/frontend/discourse/app/lib/url.js b/frontend/discourse/app/lib/url.js
index 45a9ce7a9d1..b0b3fec0515 100644
--- a/frontend/discourse/app/lib/url.js
+++ b/frontend/discourse/app/lib/url.js
@@ -308,12 +308,16 @@ class DiscourseURL extends EmberObject {
rewrites.push({ regexp, replacement, opts: opts || {} });
}
- redirectAbsolute(url) {
+ redirectAbsolute(url, { replace = false } = {}) {
// Redirects will kill a test runner
if (isTesting()) {
return true;
}
- window.location = url;
+ if (replace) {
+ window.location.replace(url);
+ } else {
+ window.location = url;
+ }
return true;
}
diff --git a/frontend/discourse/tests/acceptance/permalink-redirect-test.js b/frontend/discourse/tests/acceptance/permalink-redirect-test.js
index f09adc51e09..aae0c8738d6 100644
--- a/frontend/discourse/tests/acceptance/permalink-redirect-test.js
+++ b/frontend/discourse/tests/acceptance/permalink-redirect-test.js
@@ -19,7 +19,9 @@ acceptance("External Permalink Redirect via XHR", function (needs) {
await visit("/t/a-deleted-topic/99");
assert.true(
- DiscourseURL.redirectAbsolute.calledWith("https://www.example.com")
+ DiscourseURL.redirectAbsolute.calledWith("https://www.example.com", {
+ replace: true,
+ })
);
});
});