Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 25 additions & 26 deletions crates/sdk/src/api/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,18 @@ impl HttpClient {
}
}

/// Validates the response status, reading the body into [`ApiSdkError::ApiError`]
/// on any other non-2xx status *before* it would otherwise be discarded.
async fn check_response(&self, response: reqwest::Response) -> ApiResult<reqwest::Response> {
self.handle_response_status(&response)?;
if !response.status().is_success() {
let status = response.status().as_u16();
let message = response.text().await.unwrap_or_default();
return Err(ApiSdkError::ApiError { status, message });
}
Ok(response)
}

pub async fn get<T>(&self, endpoint: &str) -> ApiResult<T>
where
T: DeserializeOwned,
Expand All @@ -73,8 +85,7 @@ impl HttpClient {
let headers = self.build_headers(None);

let response = self.client.get(&url).headers(headers).send().await?;
self.handle_response_status(&response)?;
let response = response.error_for_status()?;
let response = self.check_response(response).await?;

Ok(response.json::<T>().await?)
}
Expand All @@ -92,8 +103,7 @@ impl HttpClient {
return Ok(None);
}

self.handle_response_status(&response)?;
let response = response.error_for_status()?;
let response = self.check_response(response).await?;
let data = response.json::<T>().await?;
Ok(Some(data))
}
Expand All @@ -112,8 +122,7 @@ impl HttpClient {
}

let response = request.send().await?;
self.handle_response_status(&response)?;
let response = response.error_for_status()?;
let response = self.check_response(response).await?;
Ok(response.json().await?)
}

Expand All @@ -126,8 +135,7 @@ impl HttpClient {
let headers = self.build_headers(None);

let response = self.client.post(&url).headers(headers).json(body).send().await?;
self.handle_response_status(&response)?;
let response = response.error_for_status()?;
let response = self.check_response(response).await?;

Ok(response.json::<T>().await?)
}
Expand All @@ -146,8 +154,7 @@ impl HttpClient {
let headers = self.build_headers(Some(headers));

let response = self.client.post(&url).headers(headers).json(body).send().await?;
self.handle_response_status(&response)?;
let response = response.error_for_status()?;
let response = self.check_response(response).await?;

Ok(response.json::<T>().await?)
}
Expand All @@ -160,8 +167,7 @@ impl HttpClient {
let headers = self.build_headers(None);

let response = self.client.post(&url).headers(headers).json(body).send().await?;
self.handle_response_status(&response)?;
response.error_for_status()?;
self.check_response(response).await?;

Ok(())
}
Expand All @@ -175,8 +181,7 @@ impl HttpClient {
let headers = self.build_headers(None);

let response = self.client.put(&url).headers(headers).json(body).send().await?;
self.handle_response_status(&response)?;
let response = response.error_for_status()?;
let response = self.check_response(response).await?;

Ok(response.json().await?)
}
Expand All @@ -195,8 +200,7 @@ impl HttpClient {
let headers = self.build_headers(Some(headers));

let response = self.client.put(&url).headers(headers).json(body).send().await?;
self.handle_response_status(&response)?;
let response = response.error_for_status()?;
let response = self.check_response(response).await?;

Ok(response.json::<T>().await?)
}
Expand All @@ -209,8 +213,7 @@ impl HttpClient {
let headers = self.build_headers(None);

let response = self.client.put(&url).headers(headers).json(body).send().await?;
self.handle_response_status(&response)?;
response.error_for_status()?;
self.check_response(response).await?;

Ok(())
}
Expand All @@ -223,8 +226,7 @@ impl HttpClient {
let headers = self.build_headers(None);

let response = self.client.delete(&url).headers(headers).send().await?;
self.handle_response_status(&response)?;
let response = response.error_for_status()?;
let response = self.check_response(response).await?;

Ok(response.json().await?)
}
Expand All @@ -234,8 +236,7 @@ impl HttpClient {
let headers = self.build_headers(None);

let response = self.client.delete(&url).headers(headers).send().await?;
self.handle_response_status(&response)?;
response.error_for_status()?;
self.check_response(response).await?;

Ok(())
}
Expand All @@ -249,8 +250,7 @@ impl HttpClient {
let headers = self.build_headers(None);

let response = self.client.delete(&url).headers(headers).json(body).send().await?;
self.handle_response_status(&response)?;
let response = response.error_for_status()?;
let response = self.check_response(response).await?;

Ok(response.json().await?)
}
Expand All @@ -260,8 +260,7 @@ impl HttpClient {
let headers = self.build_headers(None);

let response = self.client.get(&url).headers(headers).send().await?;
self.handle_response_status(&response)?;
response.error_for_status()?;
self.check_response(response).await?;

Ok(())
}
Expand Down
3 changes: 3 additions & 0 deletions crates/sdk/src/api/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ pub enum ApiSdkError {
#[error("HTTP client error: {0}")]
HttpError(#[from] reqwest::Error),

#[error("API error ({status}): {message}")]
ApiError { status: u16, message: String },

#[error("Invalid configuration: {0}")]
ConfigError(String),

Expand Down
Loading