wasm: Omit request body if it's empty (seanmonstar#1012)

This should allow creating GET and HEAD requests from http::Request
skeet70 · Aug 20, 2020 · d42385e · d42385e
1 parent 9e23103
commit d42385e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/wasm/body.rs b/src/wasm/body.rs
@@ -44,6 +44,13 @@ impl Body {
             inner: Inner::Multipart(f),
         }
     }
+
+    pub(crate) fn is_empty(&self) -> bool {
+        match &self.inner {
+            Inner::Bytes(bytes) => bytes.is_empty(),
+            Inner::Multipart(form) => form.is_empty(),
+        }
+    }
 }
 
 impl From<Bytes> for Body {

diff --git a/src/wasm/client.rs b/src/wasm/client.rs
@@ -158,7 +158,9 @@ async fn fetch(req: Request) -> crate::Result<Response> {
     }
 
     if let Some(body) = req.body() {
-        init.body(Some(&body.to_js_value()?.as_ref().as_ref()));
+        if !body.is_empty() {
+            init.body(Some(&body.to_js_value()?.as_ref().as_ref()));
+        }
     }
 
     let js_req = web_sys::Request::new_with_str_and_init(req.url().as_str(), &init)

diff --git a/src/wasm/multipart.rs b/src/wasm/multipart.rs
@@ -13,6 +13,12 @@ pub struct Form {
     inner: FormParts<Part>,
 }
 
+impl Form {
+    pub(crate) fn is_empty(&self) -> bool {
+        self.inner.fields.is_empty()
+    }
+}
+
 /// A field in a multipart form.
 pub struct Part {
     meta: PartMetadata,