From d3d5735098af6d1c91b5c455450c06c3d5fb1fa9 Mon Sep 17 00:00:00 2001
From: Misi <mgyongyosi@users.noreply.github.com>
Date: Wed, 2 Oct 2024 18:25:47 +0200
Subject: [PATCH] Auth; Fix shourt url redirect when
 useSessionStorageForRedirection is enabled (#94163)

Fix shourt url redirect
---
 public/app/app.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/app/app.ts b/public/app/app.ts
index 97e50653ca5..df42edc1df0 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -409,7 +409,13 @@ function handleRedirectTo(): void {
   }
 
   window.sessionStorage.removeItem(RedirectToUrlKey);
-  locationService.replace(decodeURIComponent(redirectTo));
+  const decodedRedirectTo = decodeURIComponent(redirectTo);
+  if (decodedRedirectTo.startsWith('/goto/')) {
+    // In this case there should be a request to the backend
+    window.location.replace(decodedRedirectTo);
+  } else {
+    locationService.replace(decodedRedirectTo);
+  }
 }
 
 export default new GrafanaApp();