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

Adds From trait for http::Request

Browse Source
This commit is contained in:
Yuhao Fang
2020-02-28 19:35:44 +08:00
committed by Sean McArthur
parent a5f3de0740
commit f267e1435d
1 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/async_impl/request.rs
View File

@@ -17,6 +17,7 @@ use super::multipart;
use super::response::Response; use super::response::Response;
use crate::header::{HeaderMap, HeaderName, HeaderValue, CONTENT_LENGTH, CONTENT_TYPE}; use crate::header::{HeaderMap, HeaderName, HeaderValue, CONTENT_LENGTH, CONTENT_TYPE};
use crate::{Method, Url}; use crate::{Method, Url};
use http::{Request as HttpRequest, request::Parts};
/// A request which can be executed with `Client::execute()`. /// A request which can be executed with `Client::execute()`.
pub struct Request { pub struct Request {
@@ -514,9 +515,29 @@ pub(crate) fn extract_authority(url: &mut Url) -> Option<(String, Option<String>
None None
} }
impl<T> From<HttpRequest<T>> for Request where T:Into<Body>{
fn from(req: HttpRequest<T>) -> Self {
let (parts, body) = req.into_parts();
let Parts {
method,
uri,
headers,
..
} = parts;
let url = Url::parse(&uri.to_string()).unwrap();
Request {
method,
url,
headers,
body: Some(body.into()),
timeout: None,
}
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::Client; use super::{Client, HttpRequest, Request};
use crate::Method; use crate::Method;
use serde::Serialize; use serde::Serialize;
use std::collections::BTreeMap; use std::collections::BTreeMap;
@@ -686,6 +707,23 @@ mod tests {
assert_eq!(req.headers()["authorization"], "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=="); assert_eq!(req.headers()["authorization"], "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
} }
#[test]
fn convert_from_http_request() {
let http_request = HttpRequest::builder().method("GET")
.uri("http://localhost/")
.header("User-Agent", "my-awesome-agent/1.0")
.body("test test test")
.unwrap();
let req: Request = http_request.into();
assert_eq!(req.body().is_none(), false);
let test_data = b"test test test";
assert_eq!(req.body().unwrap().as_bytes(), Some(&test_data[..]));
let headers = req.headers();
assert_eq!(headers.get("User-Agent").unwrap(), "my-awesome-agent/1.0");
assert_eq!(req.method(), Method::GET);
assert_eq!(req.url().as_str(), "http://localhost/");
}
/* /*
use {body, Method}; use {body, Method};
use super::Client; use super::Client;