char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix handling of headers in HttpClient

master
Jonas Platte 2020-08-08 12:20:44 +02:00
parent d016ce1848
commit 279e88d9f9
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
matrix_sdk/src/http_client.rs
View File

@ -12,9 +12,12 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
use std::{convert::TryFrom, sync::Arc}; use std::{
convert::{TryFrom, TryInto},
sync::Arc,
};
use http::{Method as HttpMethod, Response as HttpResponse}; use http::{HeaderValue, Method as HttpMethod, Response as HttpResponse};
use reqwest::{Client, Response}; use reqwest::{Client, Response};
use tracing::trace; use tracing::trace;
use url::Url; use url::Url;
@ -32,8 +35,6 @@ pub(crate) struct HttpClient {
impl HttpClient { impl HttpClient {
async fn send_request<Request>( async fn send_request<Request>(
&self, &self,
requires_auth: bool,
method: HttpMethod,
request: Request, request: Request,
session: Arc<RwLock<Option<Session>>>, session: Arc<RwLock<Option<Session>>>,
) -> Result<Response> ) -> Result<Response>
@ -46,9 +47,9 @@ impl HttpClient {
Error = FromHttpResponseError<<Request as Endpoint>::ResponseError>, Error = FromHttpResponseError<<Request as Endpoint>::ResponseError>,
>, >,
{ {
let request = { let mut request = {
let read_guard; let read_guard;
let access_token = if requires_auth { let access_token = if Request::METADATA.requires_authentication {
read_guard = session.read().await; read_guard = session.read().await;
if let Some(session) = read_guard.as_ref() { if let Some(session) = read_guard.as_ref() {
@ -63,35 +64,14 @@ impl HttpClient {
request.try_into_http_request(&self.homeserver.to_string(), access_token)? request.try_into_http_request(&self.homeserver.to_string(), access_token)?
}; };
let url = &request.uri().to_string(); if let HttpMethod::POST | HttpMethod::PUT | HttpMethod::DELETE = *request.method() {
request.headers_mut().append(
http::header::CONTENT_TYPE,
HeaderValue::from_static("application/json"),
);
}
let request_builder = match method { Ok(self.inner.execute(request.try_into()?).await?)
HttpMethod::GET => self.inner.get(url),
HttpMethod::POST => {
let body = request.body().clone();
self.inner
.post(url)
.body(body)
.header(reqwest::header::CONTENT_TYPE, "application/json")
}
HttpMethod::PUT => {
let body = request.body().clone();
self.inner
.put(url)
.body(body)
.header(reqwest::header::CONTENT_TYPE, "application/json")
}
HttpMethod::DELETE => {
let body = request.body().clone();
self.inner
.delete(url)
.body(body)
.header(reqwest::header::CONTENT_TYPE, "application/json")
}
method => panic!("Unsupported method {}", method),
};
Ok(request_builder.send().await?)
} }
async fn response_to_http_response( async fn response_to_http_response(
@ -126,14 +106,7 @@ impl HttpClient {
>, >,
Error: From<FromHttpResponseError<<Request as Endpoint>::ResponseError>>, Error: From<FromHttpResponseError<<Request as Endpoint>::ResponseError>>,
{ {
let response = self let response = self.send_request(request, session).await?;
.send_request(
Request::METADATA.requires_authentication,
Request::METADATA.method,
request,
session,
)
.await?;
trace!("Got response: {:?}", response); trace!("Got response: {:?}", response);