feat(http): forward a wrapped error completely

Author: mmalenic

htsget-http/src/error.rs

@@ -1,6 +1,6 @@
 use http::StatusCode;
 use http::header::{InvalidHeaderName, InvalidHeaderValue};
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 use crate::HtsGetError::InternalError;
@@ -30,18 +30,20 @@ pub enum HtsGetError {
   MethodNotAllowed(String),
   #[error("InternalError")]
   InternalError(String),
+  #[error("Wrapped")]
+  Wrapped(WrappedHtsGetError, StatusCode),
 }
 
 /// A helper struct implementing [serde's Serialize trait](Serialize) to allow
 /// easily converting HtsGetErrors to JSON
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
 pub struct JsonHtsGetError {
   error: String,
   message: String,
 }
 
 /// The "htsget" container wrapping the actual error response above
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
 pub struct WrappedHtsGetError {
   htsget: JsonHtsGetError,
 }
@@ -60,6 +62,7 @@ impl HtsGetError {
       | HtsGetError::InvalidRange(err) => (err, StatusCode::BAD_REQUEST),
       HtsGetError::MethodNotAllowed(err) => (err, StatusCode::METHOD_NOT_ALLOWED),
       HtsGetError::InternalError(err) => (err, StatusCode::INTERNAL_SERVER_ERROR),
+      HtsGetError::Wrapped(err, status) => return (err.clone(), *status),
     };
 
     (

htsget-http/src/middleware/auth.rs

@@ -1,7 +1,7 @@
 //! The htsget authorization middleware.
 //!
 
-use crate::error::Result as HtsGetResult;
+use crate::error::{Result as HtsGetResult, WrappedHtsGetError};
 use crate::middleware::error::Error::AuthBuilderError;
 use crate::middleware::error::Result;
 use crate::{Endpoint, HtsGetError};
@@ -98,14 +98,22 @@ impl Auth {
       .await?;
     trace!("response: {:?}", response);
 
+    let status = response.status();
+
+    // Forward a valid htsget error if that's what the backend returns.
     let value = response.json::<Value>().await.map_err(|err| {
       HtsGetError::InternalError(format!("failed to fetch data from {url}: {err}"))
     })?;
+    trace!("value: {}", value);
+
     match serde_json::from_value::<D>(value.clone()) {
       Ok(response) => Ok(response),
-      Err(_) => Err(HtsGetError::InternalError(format!(
-        "unexpected JSON: {value}"
-      ))),
+      Err(_) => match serde_json::from_value::<WrappedHtsGetError>(value.clone()) {
+        Ok(err) => Err(HtsGetError::Wrapped(err, status)),
+        Err(_) => Err(HtsGetError::InternalError(format!(
+          "failed to fetch data from {url}: {value}"
+        ))),
+      },
     }
   }