From 09f31e172b2ee3f007ef88a533fd76de38038d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Thu, 14 Nov 2019 13:20:45 +0000
Subject: [PATCH] fix(ui): follow redirects when fetching alerts from the UI

---
 ui/src/Common/Fetch.js                                 |  5 ++++-
 ui/src/Common/Fetch.test.js                            | 10 +++++++---
 .../SilenceModal/SilencePreview/index.test.js          |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ui/src/Common/Fetch.js b/ui/src/Common/Fetch.js
index 15a1e2e11..6d4a8f068 100644
--- a/ui/src/Common/Fetch.js
+++ b/ui/src/Common/Fetch.js
@@ -1,6 +1,9 @@
 import merge from "lodash.merge";
 
 const FetchWithCredentials = async (uri, options) =>
-  await fetch(uri, merge({}, { credentials: "include" }, options));
+  await fetch(
+    uri,
+    merge({}, { credentials: "include", redirect: "follow" }, options)
+  );
 
 export { FetchWithCredentials };
diff --git a/ui/src/Common/Fetch.test.js b/ui/src/Common/Fetch.test.js
index 14483d44c..ed244d32a 100644
--- a/ui/src/Common/Fetch.test.js
+++ b/ui/src/Common/Fetch.test.js
@@ -13,7 +13,8 @@ describe("FetchWithCredentials", () => {
     const request = FetchWithCredentials("http://example.com", {});
     await expect(request).resolves.toBeUndefined();
     expect(fetch).toHaveBeenCalledWith("http://example.com", {
-      credentials: "include"
+      credentials: "include",
+      redirect: "follow"
     });
   });
 
@@ -24,17 +25,20 @@ describe("FetchWithCredentials", () => {
     await expect(request).resolves.toBeUndefined();
     expect(fetch).toHaveBeenCalledWith("http://example.com", {
       credentials: "include",
+      redirect: "follow",
       foo: "bar"
     });
   });
 
   it("custom credentials are used when passed", async () => {
     const request = FetchWithCredentials("http://example.com", {
-      credentials: "none"
+      credentials: "none",
+      redirect: "follow"
     });
     await expect(request).resolves.toBeUndefined();
     expect(fetch).toHaveBeenCalledWith("http://example.com", {
-      credentials: "none"
+      credentials: "none",
+      redirect: "follow"
     });
   });
 });
diff --git a/ui/src/Components/SilenceModal/SilencePreview/index.test.js b/ui/src/Components/SilenceModal/SilencePreview/index.test.js
index 5bac321de..e4d3ec9ad 100644
--- a/ui/src/Components/SilenceModal/SilencePreview/index.test.js
+++ b/ui/src/Components/SilenceModal/SilencePreview/index.test.js
@@ -89,7 +89,7 @@ describe("<SilencePreview />", () => {
       fetch
     ).toHaveBeenCalledWith(
       "./alerts.json?q=foo%3Dbar&q=%40alertmanager%3D~%5E%28amValue%29%24",
-      { credentials: "include" }
+      { credentials: "include", redirect: "follow" }
     );
   });
 
@@ -105,7 +105,7 @@ describe("<SilencePreview />", () => {
       fetch
     ).toHaveBeenCalledWith(
       "./alerts.json?q=foo%3Dbar&q=%40alertmanager%3D~%5E%28am1%7Cam2%29%24",
-      { credentials: "include" }
+      { credentials: "include", redirect: "follow" }
     );
   });