Rip out reqwest-middleware

Cargo.toml

@@ -19,7 +19,6 @@ futures = "0.3"
 tempfile = "3"
 tokio = { version = "1", features = ["macros", "rt-multi-thread", "fs", "process"] }
 reqwest = { version = "0.12.8", default-features = false, features = ["blocking", "json", "rustls-tls", "rustls-tls-native-roots"] }
-reqwest-middleware = { version = "0.4", features = ["rustls-tls"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", default-features = false, features = [
   "ansi",

crates/criticalup-core/Cargo.toml

@@ -18,7 +18,6 @@ toml_edit = { version = "0.22.22", features = ["serde"] }
 sha2 = { version = "0.10.8" }
 dirs = { version = "5.0.1", default-features = false }
 tokio.workspace = true
-reqwest-middleware.workspace = true
 tracing.workspace = true
 
 [dev-dependencies]

crates/criticalup-core/src/download_server_client.rs

@@ -9,14 +9,14 @@ use criticaltrust::manifests::ReleaseManifest;
 use criticaltrust::manifests::{KeysManifest, ReleaseArtifactFormat};
 use criticaltrust::signatures::Keychain;
 use reqwest::header::{HeaderValue, AUTHORIZATION};
-use reqwest::StatusCode;
+use reqwest::Client;
+use reqwest::{RequestBuilder, StatusCode};
 use reqwest::{Response, Url};
-use reqwest_middleware::{ClientBuilder, ClientWithMiddleware, RequestBuilder};
 use serde::Deserialize;
 
 pub struct DownloadServerClient {
     base_url: String,
-    client: ClientWithMiddleware,
+    client: Client,
     state: State,
     trust_root: PublicKey,
 }
@@ -27,7 +27,6 @@ impl DownloadServerClient {
             .user_agent(config.whitelabel.http_user_agent)
             .build()
             .expect("failed to configure http client");
-        let client = ClientBuilder::new(client).build();
 
         DownloadServerClient {
             base_url: config.whitelabel.download_server_url.clone(),
@@ -137,7 +136,7 @@ impl DownloadServerClient {
         let response_result = self.client.execute(req).await;
 
         let response = response_result.map_err(|e| Error::DownloadServerError {
-            kind: DownloadServerError::NetworkWithMiddleware(e),
+            kind: DownloadServerError::Network(e),
             url,
         })?;
 

crates/criticalup-core/src/errors.rs

@@ -123,8 +123,6 @@ pub enum DownloadServerError {
     UnexpectedResponseData(#[source] serde_json::Error),
     #[error("Failed to send the network request.")]
     Network(#[source] reqwest::Error),
-    #[error("Failed to send the network request.")]
-    NetworkWithMiddleware(#[source] reqwest_middleware::Error),
 }
 
 #[derive(Debug, thiserror::Error)]