From 65d6b253fb4d8a81d41ecfa25078205569fcef21 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Wed, 16 May 2018 11:59:44 +0900
Subject: [PATCH] Let navigator follow redirect instead that handling redirect
in fetch (#7500)
* Let navigator follow redirect instead that handling redirect in fetch
* Do not use cache when fetched resource is to redirect
---
app/javascript/mastodon/service_worker/entry.js | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/app/javascript/mastodon/service_worker/entry.js b/app/javascript/mastodon/service_worker/entry.js
index 89414f100..5955e9146 100644
--- a/app/javascript/mastodon/service_worker/entry.js
+++ b/app/javascript/mastodon/service_worker/entry.js
@@ -10,7 +10,7 @@ function openWebCache() {
}
function fetchRoot() {
- return fetch('/', { credentials: 'include' });
+ return fetch('/', { credentials: 'include', redirect: 'manual' });
}
const firefox = navigator.userAgent.match(/Firefox\/(\d+)/);
@@ -31,14 +31,10 @@ self.addEventListener('fetch', function(event) {
const asyncResponse = fetchRoot();
const asyncCache = openWebCache();
- event.respondWith(asyncResponse.then(response => {
- if (response.ok) {
- return asyncCache.then(cache => cache.put('/', response.clone()))
- .then(() => response);
- }
-
- throw null;
- }).catch(() => asyncCache.then(cache => cache.match('/'))));
+ event.respondWith(asyncResponse.then(
+ response => asyncCache.then(cache => cache.put('/', response.clone()))
+ .then(() => response),
+ () => asyncCache.then(cache => cache.match('/'))));
} else if (url.pathname === '/auth/sign_out') {
const asyncResponse = fetch(event.request);
const asyncCache = openWebCache();