From 2c85f61e62fa97f7b6370b99106b8ec69bbf3a58 Mon Sep 17 00:00:00 2001
From: Pavel Djundik <xPaw@users.noreply.github.com>
Date: Thu, 21 Mar 2019 11:22:01 +0200
Subject: [PATCH] Handle redirected requests correctly in service worker

---
 client/service-worker.js | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/client/service-worker.js b/client/service-worker.js
index aa36f885..0aa8f86f 100644
--- a/client/service-worker.js
+++ b/client/service-worker.js
@@ -47,9 +47,33 @@ async function putInCache(request, response) {
 	await cache.put(request, response);
 }
 
+async function cleanRedirect(response) {
+	// Not all browsers support the Response.body stream, so fall back
+	// to reading the entire body into memory as a blob.
+	const bodyPromise = "body" in response ?
+		Promise.resolve(response.body) :
+		response.blob();
+
+	const body = await bodyPromise;
+
+	// new Response() is happy when passed either a stream or a Blob.
+	return new Response(body, {
+		headers: response.headers,
+		status: response.status,
+		statusText: response.statusText,
+	});
+}
+
 async function networkOrCache(event) {
 	try {
-		const response = await fetch(event.request, {cache: "no-cache"});
+		let response = await fetch(event.request, {
+			cache: "no-cache",
+			redirect: "follow",
+		});
+
+		if (response.redirected) {
+			response = await cleanRedirect(response.clone());
+		}
 
 		if (response.ok) {
 			event.waitUntil(putInCache(event.request, response));