Implement custom headers in graphql-client-web

Author: tomhoule

graphql_client_web/Cargo.toml

@@ -13,7 +13,7 @@ futures = "*"
 graphql_client = { path = "../graphql_client", version = "0.5.1" }
 log = "0.4.5"
 serde_json = "1.0.32"
-wasm-bindgen = "0.2.25"
+wasm-bindgen = "0.2.29"
 wasm-bindgen-futures = "0.3.2"
 js-sys = "0.3.5"
 

graphql_client_web/src/lib.rs

@@ -4,7 +4,6 @@
 
 // #![deny(warnings)]
 #![deny(missing_docs)]
-#![feature(non_exhaustive)]
 
 #[macro_use]
 pub extern crate graphql_client;
@@ -36,7 +35,6 @@ pub struct Client {
 ///
 /// not exhaustive
 #[derive(Debug, Fail, PartialEq)]
-#[non_exhaustive]
 pub enum ClientError {
     /// The body couldn't be built
     #[fail(display = "Request body is not a valid string")]
@@ -92,6 +90,7 @@ impl Client {
     {
         // this can be removed when we convert to async/await
         let endpoint = self.endpoint.clone();
+        let custom_headers = self.headers.clone();
 
         web_sys::window()
             .ok_or_else(|| ClientError::NoWindow)
@@ -113,20 +112,21 @@ impl Client {
                 // "Request constructor threw");
             })
             .and_then(move |(window, request)| {
-                let request: Result<web_sys::Request, _> = request
-                    .headers()
+                let mut headers = request.headers();
+                headers
                     .set("Content-Type", "application/json")
-                    .map_err(|_| ClientError::RequestError)
-                    .map(|_| request);
+                    .map_err(|_| ClientError::RequestError)?;
+                headers
+                    .set("Accept", "application/json")
+                    .map_err(|_| ClientError::RequestError)?;
 
-                let request: Result<web_sys::Request, _> = request.and_then(|req| {
-                    req.headers()
-                        .set("Accept", "application/json")
-                        .map_err(|_| ClientError::RequestError)
-                        .map(|_| req)
-                });
+                for (header_name, header_value) in custom_headers.iter() {
+                    headers.set(header_name, header_value)
+                        .map_err(|_| ClientError::RequestError)?;
 
-                request.map(move |request| (window, request))
+                }
+
+                Ok((window, request))
             })
             .and_then(move |(window, request)| {
                 JsFuture::from(window.fetch_with_request(&request))

graphql_client_web/tests/web.rs

@@ -101,12 +101,6 @@ fn test_bad_url() -> impl Future<Item = (), Error = JsValue> {
                     "NetworkError when attempting to fetch resource.".into()
                 )
             );
-            JsValue::NULL
         })
         .then(|_| Ok(()))
 }
-
-#[wasm_bindgen_test]
-fn test_404() {
-    unimplemented!()
-}