From 0e352cf47c789dc90f87e465d251cdc04e02410d Mon Sep 17 00:00:00 2001
From: James Hodgkinson <james@terminaloutcomes.com>
Date: Wed, 28 Aug 2024 13:07:14 +1000
Subject: [PATCH] fix(webui): Javascript errors after server-side update
 blocking login. Fixed after cache invalidating (#3011)

---
 server/core/src/https/javascript.rs | 8 ++++----
 server/core/src/https/tests.rs      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/core/src/https/javascript.rs b/server/core/src/https/javascript.rs
index 7cc62e813..f84901fd5 100644
--- a/server/core/src/https/javascript.rs
+++ b/server/core/src/https/javascript.rs
@@ -53,13 +53,13 @@ impl JavaScriptFile {
         };
         if self.dynamic {
             format!(
-                r#"<meta async src="/pkg/{}" integrity="sha384-{}"{} />"#,
-                self.filepath, &self.hash, &filetype,
+                r#"<meta async src="/pkg/{}?hash={}" integrity="sha384-{}"{} />"#,
+                self.filepath, &self.hash, &self.hash, &filetype,
             )
         } else {
             format!(
-                r#"<script async src="/pkg/{}" integrity="sha384-{}"{}></script>"#,
-                self.filepath, &self.hash, &filetype,
+                r#"<script async src="/pkg/{}?hash={}" integrity="sha384-{}"{}></script>"#,
+                self.filepath, &self.hash, &self.hash, &filetype,
             )
         }
     }
diff --git a/server/core/src/https/tests.rs b/server/core/src/https/tests.rs
index 3508b0746..bc032c9b3 100644
--- a/server/core/src/https/tests.rs
+++ b/server/core/src/https/tests.rs
@@ -10,7 +10,7 @@ fn test_javscriptfile() {
     };
     assert_eq!(
         jsf.as_tag(),
-        r#"<script async src="/pkg/wasmloader_admin.js" integrity="sha384-1234567890" type="module"></script>"#
+        r#"<script async src="/pkg/wasmloader_admin.js?hash=1234567890" integrity="sha384-1234567890" type="module"></script>"#
     );
     let jsf = JavaScriptFile {
         filepath: "wasmloader_admin.js",
@@ -20,6 +20,6 @@ fn test_javscriptfile() {
     };
     assert_eq!(
         jsf.as_tag(),
-        r#"<script async src="/pkg/wasmloader_admin.js" integrity="sha384-1234567890"></script>"#
+        r#"<script async src="/pkg/wasmloader_admin.js?hash=1234567890" integrity="sha384-1234567890"></script>"#
     );
 }