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

fix: correctly handle external origins in redirect hook (closes #2269)

Browse source
This commit is contained in:
Greg Johnston 2024-02-10 14:58:57 -05:00
parent 4222c832b1
commit 6766082536
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
router/src/components/router.rs
View file

@ -58,13 +58,25 @@ pub fn Router(
let navigate = SendWrapper::new(navigate); let navigate = SendWrapper::new(navigate);
let router_hook = Box::new(move |path: &str| { let router_hook = Box::new(move |path: &str| {
let path = path.to_string(); let path = path.to_string();
let Ok(origin) = window().location().origin() else {
return;
};
let Ok(to_url) = web_sys::Url::new_with_base(&path, &origin) else {
logging::error!("could not parse url {path:?}");
return;
};
let to_origin = to_url.origin();
// delay by a tick here, so that the Action updates *before* the redirect // delay by a tick here, so that the Action updates *before* the redirect
if to_origin != origin {
_ = window().location().set_href(&path);
} else {
request_animation_frame({ request_animation_frame({
let navigate = navigate.clone(); let navigate = navigate.clone();
move || { move || {
navigate(&path, Default::default()); navigate(&path, Default::default());
} }
}); });
}
}) as RedirectHook; }) as RedirectHook;
_ = server_fn::redirect::set_redirect_hook(router_hook); _ = server_fn::redirect::set_redirect_hook(router_hook);