Uniquely identify serverfn errors in URL

leptos-rs · Jan 6, 2024 · 554a593 · 554a593
1 parent 3b2e898
commit 554a593
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/integrations/actix/src/lib.rs b/integrations/actix/src/lib.rs
@@ -306,7 +306,7 @@ pub fn handle_server_fns_with_context(
                                 HttpResponse::SeeOther()
                                     .insert_header((
                                         header::LOCATION,
-                                        url.with_server_fn(&e).as_str(),
+                                        url.with_server_fn(&e, path.as_str()).as_str(),
                                     ))
                                     .finish()
                             } else {

diff --git a/integrations/axum/src/lib.rs b/integrations/axum/src/lib.rs
@@ -285,7 +285,7 @@ async fn handle_server_fns_inner(
     // Axum Path extractor doesn't remove the first slash from the path, while Actix does
     let fn_name = fn_name
         .strip_prefix('/')
-        .map(|fn_name| fn_name.to_string())
+        .map(ToString::to_string)
         .unwrap_or(fn_name);
 
     let (tx, rx) = futures::channel::oneshot::channel();
@@ -388,7 +388,7 @@ async fn handle_server_fns_inner(
                                 .status(StatusCode::SEE_OTHER)
                                 .header(
                                     header::LOCATION,
-                                    referer.with_server_fn(&e).as_str(),
+                                    referer.with_server_fn(&e, fn_name.as_str()).as_str(),
                                 )
                                 .body(Default::default())
                         } else {

diff --git a/integrations/utils/src/lib.rs b/integrations/utils/src/lib.rs
@@ -171,13 +171,13 @@ pub fn referer_to_url(referer: &HeaderValue) -> Option<Url> {
 }
 
 pub trait WithServerFn {
-    fn with_server_fn(self, e: &ServerFnError) -> Self;
+    fn with_server_fn(self, e: &ServerFnError, path: &str) -> Self;
 }
 
 impl WithServerFn for Url {
-    fn with_server_fn(mut self, e: &ServerFnError) -> Self {
+    fn with_server_fn(mut self, e: &ServerFnError, path: &str) -> Self {
         self.query_pairs_mut().append_pair(
-            "server_fn_error",
+            format!("server_fn_error_{path}").as_str(),
             serde_qs::to_string(e)
                 .expect("Could not serialize server fn error!")
                 .as_str(),

diff --git a/integrations/viz/src/lib.rs b/integrations/viz/src/lib.rs
@@ -310,7 +310,7 @@ async fn handle_server_fns_inner(
                                             .status(StatusCode::SEE_OTHER)
                                             .header(
                                                 header::LOCATION,
-                                                url.with_server_fn(&e).as_str(),
+                                                url.with_server_fn(&e, fn_name.as_str()).as_str(),
                                             )
                                             .body(Default::default())
                                     } else {