refactor: use custom error for static subgraph

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

crates/service/src/routes/static_subgraph.rs

@@ -1,52 +1,73 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
-use axum::{body::Bytes, http::HeaderMap, response::IntoResponse, Extension};
+use axum::{body::Bytes, http::HeaderMap, response::IntoResponse, Extension, Json};
+use reqwest::StatusCode;
+use serde_json::json;
 use tracing::warn;
 
 use indexer_common::SubgraphClient;
 
-use crate::service::{IndexerServiceError, IndexerServiceImpl};
-
 #[autometrics::autometrics]
-pub async fn static_subgraph_request_handler<I>(
+pub async fn static_subgraph_request_handler(
     Extension(subgraph_client): Extension<&'static SubgraphClient>,
     Extension(required_auth_token): Extension<Option<String>>,
     headers: HeaderMap,
     body: Bytes,
-) -> Result<impl IntoResponse, IndexerServiceError<I::Error>>
-where
-    I: IndexerServiceImpl + Sync + Send + 'static,
-{
+) -> Result<impl IntoResponse, StaticSubgraphError> {
     if let Some(required_auth_token) = required_auth_token {
         let authorization = headers
             .get("authorization")
             .map(|value| value.to_str())
             .transpose()
-            .map_err(|_| IndexerServiceError::Unauthorized)?
-            .ok_or_else(|| IndexerServiceError::Unauthorized)?
+            .map_err(|_| StaticSubgraphError::Unauthorized)?
+            .ok_or_else(|| StaticSubgraphError::Unauthorized)?
             .trim_start_matches("Bearer ");
 
         if authorization != required_auth_token {
-            return Err(IndexerServiceError::Unauthorized);
+            return Err(StaticSubgraphError::Unauthorized);
         }
     }
 
-    let response = subgraph_client
-        .query_raw(body)
-        .await
-        .map_err(IndexerServiceError::FailedToQueryStaticSubgraph)?;
+    let response = subgraph_client.query_raw(body).await?;
 
     Ok((
         response.status(),
         response.headers().to_owned(),
-        response
-            .text()
-            .await
-            .map_err(|e| {
-                warn!("Failed to read response body: {}", e);
-                e
-            })
-            .map_err(|e| IndexerServiceError::FailedToQueryStaticSubgraph(e.into()))?,
+        response.text().await.inspect_err(|e| {
+            warn!("Failed to read response body: {}", e);
+        })?,
     ))
 }
+
+#[derive(Debug, thiserror::Error)]
+pub enum StaticSubgraphError {
+    #[error("No valid receipt or free query auth token provided")]
+    Unauthorized,
+
+    #[error("Failed to query subgraph: {0}")]
+    FailedToQuery(#[from] anyhow::Error),
+
+    #[error("Failed to parse subgraph response: {0}")]
+    FailedToParse(#[from] reqwest::Error),
+}
+
+impl IntoResponse for StaticSubgraphError {
+    fn into_response(self) -> axum::response::Response {
+        let status = match self {
+            StaticSubgraphError::Unauthorized => StatusCode::UNAUTHORIZED,
+            StaticSubgraphError::FailedToQuery(_) | StaticSubgraphError::FailedToParse(_) => {
+                StatusCode::INTERNAL_SERVER_ERROR
+            }
+        };
+
+        tracing::error!(%self, "StaticSubgraphError occoured.");
+        (
+            status,
+            Json(json! {{
+                "message": self.to_string(),
+            }}),
+        )
+            .into_response()
+    }
+}

crates/service/src/service/indexer_service.rs

@@ -91,8 +91,6 @@ where
     InvalidFreeQueryAuthToken,
     #[error("Failed to sign attestation")]
     FailedToSignAttestation,
-    #[error("Failed to query subgraph: {0}")]
-    FailedToQueryStaticSubgraph(anyhow::Error),
 
     #[error("Could not decode signer: {0}")]
     CouldNotDecodeSigner(tap_core::Error),
@@ -124,8 +122,6 @@ where
             | CouldNotDecodeSigner(_)
             | EscrowAccount(_)
             | ProcessingError(_) => StatusCode::BAD_REQUEST,
-
-            FailedToQueryStaticSubgraph(_) => StatusCode::INTERNAL_SERVER_ERROR,
         };
         tracing::error!(%self, "An IndexerServiceError occoured.");
         (
@@ -409,7 +405,7 @@ impl IndexerService {
 
             misc_routes = misc_routes.route(
                 "/network",
-                post(static_subgraph_request_handler::<I>)
+                post(static_subgraph_request_handler)
                     .route_layer(Extension(network_subgraph))
                     .route_layer(Extension(options.config.service.serve_auth_token.clone()))
                     .route_layer(static_subgraph_rate_limiter.clone()),
@@ -420,7 +416,7 @@ impl IndexerService {
             info!("Serving escrow subgraph at /escrow");
 
             misc_routes = misc_routes
-                .route("/escrow", post(static_subgraph_request_handler::<I>))
+                .route("/escrow", post(static_subgraph_request_handler))
                 .route_layer(Extension(escrow_subgraph))
                 .route_layer(Extension(options.config.service.serve_auth_token.clone()))
                 .route_layer(static_subgraph_rate_limiter);