Skip to content
Merged
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
2 changes: 1 addition & 1 deletion apps/labrinth/src/routes/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ pub enum ApiError {
PasswordHashing(#[from] argon2::password_hash::Error),
#[error("{0}")]
Mail(#[from] crate::queue::email::MailError),
#[error("Error while rerouting request: {0}")]
#[error("Error while rerouting request: {0:?}")]
Reroute(#[from] reqwest::Error),
#[error("Unable to read Zip Archive: {0}")]
Zip(#[from] zip::result::ZipError),
Expand Down
18 changes: 14 additions & 4 deletions apps/labrinth/src/util/avalara1099.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,20 @@ pub async fn check_form(
let response = request_builder.send().await?;

Ok(if response.status().is_success() {
let mut list_wrapper =
response.json::<ListWrapper<W9FormsResponse>>().await?;

Ok(list_wrapper.data.pop().map(|data| DataWrapper { data }))
let body = response.text().await?;
let serde_result =
serde_json::from_str::<ListWrapper<W9FormsResponse>>(&body);

match serde_result {
Ok(mut list_wrapper) => {
Ok(list_wrapper.data.pop().map(|data| DataWrapper { data }))
}
Err(e) => {
return Err(ApiError::InvalidInput(format!(
"Error parsing avalara1099 response: {e}. Actual response body: {body}"
)));
}
}
} else {
Err(response.json().await?)
})
Expand Down