mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(webui): Javascript errors after server-side update blocking login. Fixed after cache invalidating (#3011)

Browse source
This commit is contained in:
James Hodgkinson 2024-08-28 13:07:14 +10:00 committed by GitHub
parent 3eae7be0bb
commit 0e352cf47c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/core/src/https/javascript.rs
View file

@ -53,13 +53,13 @@ impl JavaScriptFile {
}; };
if self.dynamic { if self.dynamic {
format!( format!(
r#"<meta async src="/pkg/{}" integrity="sha384-{}"{} />"#, r#"<meta async src="/pkg/{}?hash={}" integrity="sha384-{}"{} />"#,
self.filepath, &self.hash, &filetype, self.filepath, &self.hash, &self.hash, &filetype,
) )
} else { } else {
format!( format!(
r#"<script async src="/pkg/{}" integrity="sha384-{}"{}></script>"#, r#"<script async src="/pkg/{}?hash={}" integrity="sha384-{}"{}></script>"#,
self.filepath, &self.hash, &filetype, self.filepath, &self.hash, &self.hash, &filetype,
) )
} }
} }

4
server/core/src/https/tests.rs
View file

@ -10,7 +10,7 @@ fn test_javscriptfile() {
}; };
assert_eq!( assert_eq!(
jsf.as_tag(), 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 { let jsf = JavaScriptFile {
filepath: "wasmloader_admin.js", filepath: "wasmloader_admin.js",
@ -20,6 +20,6 @@ fn test_javscriptfile() {
}; };
assert_eq!( assert_eq!(
jsf.as_tag(), 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>"#
); );
} }