forked/reqwest-impersonate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Closes #1247
This commit is contained in:
bensadiku
2021-04-21 18:42:09 +02:00
committed by GitHub
parent 9293cd2061
commit 42b31600c3
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wasm/client.rs
View File

@@ -207,7 +207,9 @@ async fn fetch(req: Request) -> crate::Result<Response> {
init.mode(web_sys::RequestMode::NoCors); 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 let Some(body) = req.body() {
if !body.is_empty() { if !body.is_empty() {

12
src/wasm/request.rs
View File

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