From db443d2289991f06fc832ffa70c66ee5224d2f5f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 6 Aug 2020 15:24:43 -0400
Subject: [PATCH] REFACTOR: Use the session for the `ServiceWorkerURL`

---
 .../app/initializers/register-service-worker.js | 17 +++++++----------
 .../app/pre-initializers/discourse-bootstrap.js |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/initializers/register-service-worker.js b/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
index 6b5927d5114..c39c95fe735 100644
--- a/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
+++ b/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
@@ -4,28 +4,25 @@ import getAbsoluteURL from "discourse-common/lib/get-url";
 export default {
   name: "register-service-worker",
 
-  initialize() {
+  initialize(container) {
     const isSecured =
       document.location.protocol === "https:" ||
       location.hostname === "localhost";
 
-    const isSupported = isSecured && "serviceWorker" in navigator;
-
-    if (isSupported) {
-      const caps = Discourse.__container__.lookup("capabilities:main");
+    if (isSecured && "serviceWorker" in navigator) {
+      let { serviceWorkerURL } = container.lookup("session:main");
+      const caps = container.lookup("capabilities:main");
       const isAppleBrowser =
         caps.isSafari ||
         (caps.isIOS &&
           !window.matchMedia("(display-mode: standalone)").matches);
 
-      if (Discourse.ServiceWorkerURL && !isAppleBrowser) {
+      if (serviceWorkerURL && !isAppleBrowser) {
         navigator.serviceWorker.getRegistrations().then(registrations => {
           for (let registration of registrations) {
             if (
               registration.active &&
-              !registration.active.scriptURL.includes(
-                Discourse.ServiceWorkerURL
-              )
+              !registration.active.scriptURL.includes(serviceWorkerURL)
             ) {
               this.unregister(registration);
             }
@@ -33,7 +30,7 @@ export default {
         });
 
         navigator.serviceWorker
-          .register(getAbsoluteURL(`/${Discourse.ServiceWorkerURL}`))
+          .register(getAbsoluteURL(`/${serviceWorkerURL}`))
           .catch(error => {
             // eslint-disable-next-line no-console
             console.info(`Failed to register Service Worker: ${error}`);
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js b/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
index adc5c25c0df..840c75d28ec 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
@@ -64,12 +64,12 @@ export default {
     app.ThemeSettings = PreloadStore.get("themeSettings");
     app.LetterAvatarVersion = setupData.letterAvatarVersion;
     app.MarkdownItURL = setupData.markdownItUrl;
-    app.ServiceWorkerURL = setupData.serviceWorkerUrl;
     I18n.defaultLocale = setupData.defaultLocale;
 
     window.Logster = window.Logster || {};
     window.Logster.enabled = setupData.enableJsErrorReporting === "true";
 
+    Session.currentProp("serviceWorkerURL", setupData.serviceWorkerUrl);
     Session.currentProp("assetVersion", setupData.assetVersion);
 
     Session.currentProp(