Mirrors/leptos
2
0
Fork 0
mirror of https://github.com/leptos-rs/leptos synced 2024-11-10 06:44:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove panic for axum ResponseOptions (#2468)

Browse source
This commit is contained in:
Alex Lazar 2024-03-29 00:37:12 -07:00 committed by GitHub
parent fd2817de26
commit 642504f2ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
integrations/axum/src/lib.rs
View file

@ -302,12 +302,6 @@ async fn handle_server_fns_inner(
// actually run the server fn // actually run the server fn
let mut res = service.run(req).await; let mut res = service.run(req).await;
// update response as needed
let res_options = expect_context::<ResponseOptions>().0;
let res_options_inner = res_options.read();
let (status, mut res_headers) =
(res_options_inner.status, res_options_inner.headers.clone());
// if it accepts text/html (i.e., is a plain form post) and doesn't already have a // if it accepts text/html (i.e., is a plain form post) and doesn't already have a
// Location set, then redirect to Referer // Location set, then redirect to Referer
if accepts_html { if accepts_html {
@ -320,11 +314,22 @@ async fn handle_server_fns_inner(
} }
} }
// apply status code and headers if used changed them // update response as needed
if let Some(status) = status { if let Some(res_options) = use_context::<ResponseOptions>() {
*res.status_mut() = status; let res_options_inner = res_options.0.read();
let (status, mut res_headers) = (
res_options_inner.status,
res_options_inner.headers.clone(),
);
// apply status code and headers if used changed them
if let Some(status) = status {
*res.status_mut() = status;
}
res.headers_mut().extend(res_headers.drain());
} else {
eprintln!("Failed to find ResponseOptions for {path}");
} }
res.headers_mut().extend(res_headers.drain());
// clean up the scope // clean up the scope
runtime.dispose(); runtime.dispose();