WASM: set RequestCredentials to None by default (seanmonstar#1249)

Closes seanmonstar#1247
tcharding · Apr 21, 2021 · 42b3160 · 42b3160
1 parent 9293cd2
commit 42b3160
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/wasm/client.rs b/src/wasm/client.rs
@@ -207,7 +207,9 @@ async fn fetch(req: Request) -> crate::Result<Response> {
         init.mode(web_sys::RequestMode::NoCors);
     }
 
-    init.credentials(req.credentials);
+    if let Some(creds) = req.credentials {
+        init.credentials(creds);
+    }
 
     if let Some(body) = req.body() {
         if !body.is_empty() {

diff --git a/src/wasm/request.rs b/src/wasm/request.rs
@@ -19,7 +19,7 @@ pub struct Request {
     headers: HeaderMap,
     body: Option<Body>,
     pub(super) cors: bool,
-    pub(super) credentials: RequestCredentials,
+    pub(super) credentials: Option<RequestCredentials>,
 }
 
 /// A builder to construct the properties of a `Request`.
@@ -38,7 +38,7 @@ impl Request {
             headers: HeaderMap::new(),
             body: None,
             cors: true,
-            credentials: RequestCredentials::SameOrigin,
+            credentials: None,
         }
     }
 
@@ -268,7 +268,7 @@ impl RequestBuilder {
     /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/Request/credentials
     pub fn fetch_credentials_same_origin(mut self) -> RequestBuilder {
         if let Ok(ref mut req) = self.request {
-            req.credentials = RequestCredentials::SameOrigin;
+            req.credentials = Some(RequestCredentials::SameOrigin);
         }
         self
     }
@@ -284,7 +284,7 @@ impl RequestBuilder {
     /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/Request/credentials
     pub fn fetch_credentials_include(mut self) -> RequestBuilder {
         if let Ok(ref mut req) = self.request {
-            req.credentials = RequestCredentials::Include;
+            req.credentials = Some(RequestCredentials::Include);
         }
         self
     }
@@ -300,7 +300,7 @@ impl RequestBuilder {
     /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/Request/credentials
     pub fn fetch_credentials_omit(mut self) -> RequestBuilder {
         if let Ok(ref mut req) = self.request {
-            req.credentials = RequestCredentials::Omit;
+            req.credentials = Some(RequestCredentials::Omit);
         }
         self
     }
@@ -383,7 +383,7 @@ where
             headers,
             body: Some(body.into()),
             cors: true,
-            credentials: RequestCredentials::SameOrigin,
+            credentials: None,
         })
     }
 }