Merge pull request #330 from umccr/feat/suppressed-response

feat: suppressed response and fixes

Author: mmalenic

Cargo.lock

@@ -26,6 +26,7 @@ default = []
 actix-web = { version = "4", features = ["rustls-0_23"] }
 rustls = "0.23"
 actix-cors = "0.7"
+actix-utils = "3"
 http_1 = { package = "http", version = "1" }
 http = "0.2"
 serde = { version = "1", features = ["derive"] }

htsget-actix/Cargo.toml

@@ -230,6 +230,7 @@ fn criterion_benchmark(c: &mut Criterion) {
     tags: None,
     notags: None,
     regions: None,
+    encryption_scheme: None,
   };
   bench_pair(
     &mut group,
@@ -250,6 +251,7 @@ fn criterion_benchmark(c: &mut Criterion) {
       start: None,
       end: None,
     }]),
+    encryption_scheme: None,
   };
   bench_pair(
     &mut group,
@@ -277,6 +279,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         end: Some(5008321),
       },
     ]),
+    encryption_scheme: None,
   };
   bench_pair(
     &mut group,
@@ -297,6 +300,7 @@ fn criterion_benchmark(c: &mut Criterion) {
       start: Some(1),
       end: Some(153),
     }]),
+    encryption_scheme: None,
   };
   bench_pair(
     &mut group,
@@ -317,6 +321,7 @@ fn criterion_benchmark(c: &mut Criterion) {
       start: None,
       end: None,
     }]),
+    encryption_scheme: None,
   };
   bench_pair(
     &mut group,

htsget-actix/benches/request_benchmarks.rs

@@ -4,17 +4,15 @@ use actix_web::{
   HttpRequest, Responder,
   web::{Data, Path, Query},
 };
-use tracing::info;
-use tracing::instrument;
-
 use htsget_http::{Endpoint, get};
 use htsget_search::HtsGet;
+use tracing::info;
+use tracing::instrument;
 
+use super::handle_response;
 use crate::AppState;
 use crate::handlers::extract_request;
 
-use super::handle_response;
-
 /// GET request reads endpoint
 #[instrument(skip(app_state))]
 pub async fn reads<H: HtsGet + Clone + Send + Sync + 'static>(
@@ -27,7 +25,15 @@ pub async fn reads<H: HtsGet + Clone + Send + Sync + 'static>(
 
   info!(request = ?request, "reads endpoint GET request");
 
-  handle_response(get(app_state.get_ref().htsget.clone(), request, Endpoint::Reads).await)
+  handle_response(
+    get(
+      app_state.get_ref().htsget.clone(),
+      request,
+      Endpoint::Reads,
+      app_state.auth.clone(),
+    )
+    .await,
+  )
 }
 
 /// GET request variants endpoint
@@ -47,6 +53,7 @@ pub async fn variants<H: HtsGet + Clone + Send + Sync + 'static>(
       app_state.get_ref().htsget.clone(),
       request,
       Endpoint::Variants,
+      app_state.auth.clone(),
     )
     .await,
   )

htsget-actix/src/handlers/get.rs

@@ -2,10 +2,9 @@ use std::collections::HashMap;
 
 use actix_web::web::{Path, Query};
 use actix_web::{Either, HttpRequest, Responder, http::StatusCode};
-use http::{HeaderMap as HttpHeaderMap, HeaderName, Method};
-
 use htsget_config::types::{JsonResponse, Request};
 use htsget_http::Result;
+use http::{HeaderMap as HttpHeaderMap, HeaderName, Method};
 use pretty_json::PrettyJson;
 
 pub use crate::handlers::service_info::{
@@ -16,7 +15,7 @@ pub mod get;
 pub mod post;
 pub mod service_info;
 
-mod pretty_json;
+pub(crate) mod pretty_json;
 
 pub(crate) struct HeaderMap(HttpHeaderMap);
 

htsget-actix/src/handlers/mod.rs

@@ -5,24 +5,21 @@ use actix_web::{
   HttpRequest, Responder,
   web::{Data, Json, Path},
 };
-use tracing::info;
-use tracing::instrument;
-
 use htsget_http::{Endpoint, PostRequest, post};
 use htsget_search::HtsGet;
+use tracing::info;
+use tracing::instrument;
 
+use super::{extract_request, handle_response};
 use crate::AppState;
-use crate::handlers::extract_request;
-
-use super::handle_response;
 
 /// POST request reads endpoint
 #[instrument(skip(app_state))]
 pub async fn reads<H: HtsGet + Clone + Send + Sync + 'static>(
   request: Query<HashMap<String, String>>,
-  body: Json<PostRequest>,
   path: Path<String>,
   http_request: HttpRequest,
+  body: Json<PostRequest>,
   app_state: Data<AppState<H>>,
 ) -> impl Responder {
   let request = extract_request(request, path, http_request);
@@ -35,6 +32,7 @@ pub async fn reads<H: HtsGet + Clone + Send + Sync + 'static>(
       body.into_inner(),
       request,
       Endpoint::Reads,
+      app_state.auth.clone(),
     )
     .await,
   )
@@ -44,9 +42,9 @@ pub async fn reads<H: HtsGet + Clone + Send + Sync + 'static>(
 #[instrument(skip(app_state))]
 pub async fn variants<H: HtsGet + Clone + Send + Sync + 'static>(
   request: Query<HashMap<String, String>>,
-  body: Json<PostRequest>,
   path: Path<String>,
   http_request: HttpRequest,
+  body: Json<PostRequest>,
   app_state: Data<AppState<H>>,
 ) -> impl Responder {
   let request = extract_request(request, path, http_request);
@@ -59,6 +57,7 @@ pub async fn variants<H: HtsGet + Clone + Send + Sync + 'static>(
       body.into_inner(),
       request,
       Endpoint::Variants,
+      app_state.auth.clone(),
     )
     .await,
   )

htsget-actix/src/handlers/post.rs

@@ -4,15 +4,28 @@ use serde::Serialize;
 
 pub struct PrettyJson<T>(pub T);
 
+impl<T> TryFrom<PrettyJson<T>> for String
+where
+  T: Serialize,
+{
+  type Error = serde_json::Error;
+
+  fn try_from(json: PrettyJson<T>) -> Result<Self, Self::Error> {
+    let mut body = serde_json::to_string_pretty(&json.0)?;
+    body.push('\n');
+
+    Ok(body)
+  }
+}
+
 impl<T: Serialize> Responder for PrettyJson<T> {
   type Body = BoxBody;
 
   fn respond_to(self, _: &HttpRequest) -> HttpResponse {
-    let mut body = match serde_json::to_string_pretty(&self.0) {
+    let body = match String::try_from(self) {
       Ok(body) => body,
-      Err(e) => return HttpResponse::from_error(e),
+      Err(err) => return HttpResponse::from_error(err),
     };
-    body.push('\n');
 
     HttpResponse::build(StatusCode::OK)
       .content_type("application/json")