[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 ccc87a03f0)
This commit is contained in:
+8
-3
@@ -459,13 +459,18 @@ function handleRedirectTo(): void {
|
|||||||
}
|
}
|
||||||
|
|
||||||
window.sessionStorage.removeItem(RedirectToUrlKey);
|
window.sessionStorage.removeItem(RedirectToUrlKey);
|
||||||
const decodedRedirectTo = decodeURIComponent(redirectTo);
|
let decodedRedirectTo = decodeURIComponent(redirectTo);
|
||||||
if (decodedRedirectTo.startsWith('/goto/')) {
|
if (decodedRedirectTo.startsWith('/goto/')) {
|
||||||
// In this case there should be a request to the backend
|
// 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);
|
window.location.replace(decodedRedirectTo);
|
||||||
} else {
|
return;
|
||||||
locationService.replace(decodedRedirectTo);
|
|
||||||
}
|
}
|
||||||
|
// 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();
|
export default new GrafanaApp();
|
||||||
|
|||||||
Reference in New Issue
Block a user