supports wasm fetch credentials

seanmonstar · Mar 24, 2021 · e9ec241 · e9ec241
1 parent c6eb2c4
commit e9ec241
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -162,6 +162,7 @@ features = [
     "Blob",
     "BlobPropertyBag",
     "ServiceWorkerGlobalScope",
+    "RequestCredentials"
 ]
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]

diff --git a/src/lib.rs b/src/lib.rs
@@ -320,7 +320,7 @@ if_wasm! {
     mod wasm;
     mod util;
 
-    pub use self::wasm::{Body, Client, ClientBuilder, Request, RequestBuilder, Response};
+    pub use self::wasm::{Body, Client, ClientBuilder, Request, RequestBuilder, RequestCredentials, Response};
     #[cfg(feature = "multipart")]
     pub use self::wasm::multipart;
 }
diff --git a/src/wasm/client.rs b/src/wasm/client.rs
@@ -207,6 +207,8 @@ async fn fetch(req: Request) -> crate::Result<Response> {
         init.mode(web_sys::RequestMode::NoCors);
     }
 
+    init.credentials(req.credentials);
+
     if let Some(body) = req.body() {
         if !body.is_empty() {
             init.body(Some(&body.to_js_value()?.as_ref().as_ref()));

diff --git a/src/wasm/mod.rs b/src/wasm/mod.rs
@@ -10,7 +10,7 @@ mod response;
 
 pub use self::body::Body;
 pub use self::client::{Client, ClientBuilder};
-pub use self::request::{Request, RequestBuilder};
+pub use self::request::{Request, RequestBuilder, RequestCredentials};
 pub use self::response::Response;
 
 async fn promise<T>(promise: js_sys::Promise) -> Result<T, crate::error::BoxError>

diff --git a/src/wasm/request.rs b/src/wasm/request.rs
@@ -7,6 +7,7 @@ use serde::Serialize;
 use serde_json;
 use serde_urlencoded;
 use url::Url;
+pub use web_sys::RequestCredentials;
 
 use super::{Body, Client, Response};
 use crate::header::{HeaderMap, HeaderName, HeaderValue, CONTENT_TYPE};
@@ -18,6 +19,7 @@ pub struct Request {
     headers: HeaderMap,
     body: Option<Body>,
     pub(super) cors: bool,
+    pub(super) credentials: RequestCredentials,
 }
 
 /// A builder to construct the properties of a `Request`.
@@ -36,6 +38,7 @@ impl Request {
             headers: HeaderMap::new(),
             body: None,
             cors: true,
+            credentials: RequestCredentials::SameOrigin,
         }
     }
 
@@ -254,6 +257,22 @@ impl RequestBuilder {
         self
     }
 
+    /// Set fetch credentials
+    ///
+    /// # WASM
+    ///
+    /// This option is only effective with WebAssembly target.
+    ///
+    /// The [request credentials][mdn] will be set.
+    ///
+    /// [mdn]: https://developer.mozilla.org/zh-CN/docs/Web/API/Request/credentials
+    pub fn fetch_credentials(mut self, credentials: RequestCredentials) -> RequestBuilder {
+        if let Ok(ref mut req) = self.request {
+            req.credentials = credentials;
+        }
+        self
+    }
+
     /// Build a `Request`, which can be inspected, modified and executed with
     /// `Client::execute()`.
     pub fn build(self) -> crate::Result<Request> {
@@ -332,6 +351,7 @@ where
             headers,
             body: Some(body.into()),
             cors: true,
+            credentials: RequestCredentials::SameOrigin,
         })
     }
 }