alemi/postwoman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: imlement IntoRequest for 2.0.0 too

Browse source
This commit is contained in:
əlemi 2023-06-21 00:32:44 +02:00
parent 6aeabef2b5
commit 55118ef3a0
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 52 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/model/request.rs
View file

@ -18,14 +18,64 @@ pub trait IntoRequest {
impl IntoRequest for v2_0_0::RequestClass {
fn make_request(&self) -> reqwest::RequestBuilder {
todo!()
let method = reqwest::Method::from_bytes(
self.method.as_ref().unwrap_or(&"GET".into()).as_bytes() // TODO lol?
).unwrap_or(reqwest::Method::GET); // TODO throw an error rather than replacing it silently
let mut url_str = match &self.url {
Some(v2_0_0::Url::String(x)) => x.clone(),
Some(v2_0_0::Url::UrlClass(v2_0_0::UrlClass { raw: Some(x), .. })) => x.clone(),
// TODO compose URL from UrlClass rather than only accepting those with raw set
_ => "http://localhost".into(),
};
url_str = fill_from_env(url_str);
let url = reqwest::Url::from_str(&url_str).unwrap_or_else(|e| {
eprintln!("error creating url ({}), falling back to localhost", e);
reqwest::Url::from_str("http://localhost/").unwrap()
});
let mut out = reqwest::Client::new().request(method, url);
// TODO handle more auth types than just bearer
if let Some(auth) = &self.auth {
if let Some(bearers) = &auth.bearer {
for v in bearers.values() {
if let Some(value) = &v {
out = out.header("Authorization", format!("Bearer {}", value.as_str().unwrap_or(&value.to_string())))
}
}
}
}
match &self.header {
Some(v2_0_0::HeaderUnion::HeaderArray(x)) => {
for h in x {
let k = fill_from_env(h.key.clone());
let v = fill_from_env(h.value.clone());
out = out.header(k, v); // TODO avoid cloning
}
},
_ => {},
}
match &self.body {
Some(v2_0_0::Body { raw: Some(x), .. }) => {
out = out.body(fill_from_env(x.clone())) // TODO try to avoid cloning?
},
_ => {},
}
out
}
}
impl IntoRequest for v2_1_0::RequestClass {
fn make_request(&self) -> reqwest::RequestBuilder {
let method = reqwest::Method::from_bytes(
&self.method.as_ref().unwrap_or(&"GET".into()).as_bytes() // TODO lol?
self.method.as_ref().unwrap_or(&"GET".into()).as_bytes() // TODO lol?
).unwrap_or(reqwest::Method::GET); // TODO throw an error rather than replacing it silently
let mut url_str = match &self.url {