From cf2ff7cc4b7aae9c4323cbcbd9b3758dff169897 Mon Sep 17 00:00:00 2001 From: Misi Date: Tue, 16 Sep 2025 09:13:09 +0200 Subject: [PATCH] [release-12.1.2] Fix: Fix redirection after login when Grafana is served from subpath (#111097) Fix: Fix redirection after login when Grafana is served from subpath (#110889) Fix short link (/goto) redirection when Grafana is served from subpath (cherry picked from commit ccc87a03f0ec70eb28f9ce49221834718abeca7d) --- public/app/app.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/public/app/app.ts b/public/app/app.ts index ea6400c5837..ededeb5846e 100644 --- a/public/app/app.ts +++ b/public/app/app.ts @@ -459,13 +459,18 @@ function handleRedirectTo(): void { } window.sessionStorage.removeItem(RedirectToUrlKey); - const decodedRedirectTo = decodeURIComponent(redirectTo); + let decodedRedirectTo = decodeURIComponent(redirectTo); if (decodedRedirectTo.startsWith('/goto/')) { // In this case there should be a request to the backend + if (config.appSubUrl && !decodedRedirectTo.startsWith(config.appSubUrl)) { + decodedRedirectTo = config.appSubUrl + decodedRedirectTo; + } window.location.replace(decodedRedirectTo); - } else { - locationService.replace(decodedRedirectTo); + return; } + // Ensure that the appsuburl is stripped from the redirect to in case of a frontend redirect + const stripped = locationUtil.stripBaseFromUrl(decodedRedirectTo); + locationService.replace(stripped); } export default new GrafanaApp();