From cabb1973372935a71d78a416cf8a18a6503d8cb2 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Sun, 18 Mar 2018 23:14:38 +0900 Subject: [PATCH 1/2] Synchronize HTML page cache with sessions (#6815) --- .babelrc | 2 ++ .../mastodon/service_worker/entry.js | 30 +++++++++++++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.babelrc b/.babelrc index de922f3899..ed28aa5003 100644 --- a/.babelrc +++ b/.babelrc @@ -4,6 +4,8 @@ [ "env", { + "debug": true, + "exclude": ["transform-async-to-generator", "transform-regenerator"], "loose": true, "modules": false, "targets": { diff --git a/app/javascript/mastodon/service_worker/entry.js b/app/javascript/mastodon/service_worker/entry.js index ad933b95ee..8b65f27a33 100644 --- a/app/javascript/mastodon/service_worker/entry.js +++ b/app/javascript/mastodon/service_worker/entry.js @@ -1,5 +1,9 @@ import './web_push_notifications'; +function openCache() { + return caches.open('mastodon-web'); +} + function fetchRoot() { return fetch('/', { credentials: 'include' }); } @@ -7,10 +11,7 @@ function fetchRoot() { // Cause a new version of a registered Service Worker to replace an existing one // that is already installed, and replace the currently active worker on open pages. self.addEventListener('install', function(event) { - const promises = Promise.all([caches.open('mastodon-web'), fetchRoot()]); - const asyncAdd = promises.then(([cache, root]) => cache.put('/', root)); - - event.waitUntil(asyncAdd); + event.waitUntil(Promise.all([openCache(), fetchRoot()]).then(([cache, root]) => cache.put('/', root))); }); self.addEventListener('activate', function(event) { event.waitUntil(self.clients.claim()); @@ -19,12 +20,29 @@ self.addEventListener('fetch', function(event) { const url = new URL(event.request.url); if (url.pathname.startsWith('/web/')) { - event.respondWith(fetchRoot().then(response => { + const asyncResponse = fetchRoot(); + const asyncCache = openCache(); + + event.respondWith(asyncResponse.then(async response => { if (response.ok) { - return response; + const cache = await asyncCache; + await cache.put('/', response); + return response.clone(); } throw null; }).catch(() => caches.match('/'))); + } else if (url.pathname === '/auth/sign_out') { + const asyncResponse = fetch(event.request); + const asyncCache = openCache(); + + event.respondWith(asyncResponse.then(async response => { + if (response.ok || response.type === 'opaqueredirect') { + const cache = await asyncCache; + await cache.delete('/'); + } + + return response; + })); } }); From 77badbc85a1d70c41cdc485c475cfc154ca819e2 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 18 Mar 2018 16:57:04 +0100 Subject: [PATCH 2/2] If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817) Fix #6784 --- app/controllers/concerns/localized.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/concerns/localized.rb b/app/controllers/concerns/localized.rb index e697284a8c..abd85ea27a 100644 --- a/app/controllers/concerns/localized.rb +++ b/app/controllers/concerns/localized.rb @@ -17,7 +17,11 @@ module Localized end def default_locale - request_locale || I18n.default_locale + if ENV['DEFAULT_LOCALE'].present? + I18n.default_locale + else + request_locale || I18n.default_locale + end end def request_locale