fix: only add json content type if no content type was explicitly set by user #5

Author: chfoidl

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "drupal_kit"
 description = "Flexible Drupal HTTP client supporting a variety of popular contrib modules"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2021"
 license = "Apache-2.0 OR MIT"
 

Cargo.toml

@@ -153,11 +153,17 @@ pub trait HttpClient {
     {
         async move {
             // Add Content-Type: application/json header by default
+            // Only add Content-Type if not already set
             let mut options = options;
-            options.push(HttpRequestOption::Header(
-                HeaderName::from_static("content-type"),
-                HeaderValue::from_static("application/json"),
-            ));
+            if !options.iter().any(|opt| match opt {
+                HttpRequestOption::Header(name, _) => name == "content-type",
+                _ => false,
+            }) {
+                options.push(HttpRequestOption::Header(
+                    HeaderName::from_static("content-type"),
+                    HeaderValue::from_static("application/json"),
+                ));
+            }
 
             match self.request(method, path, body, options).await {
                 Ok(response) => {

src/http_client.rs

@@ -1,6 +1,8 @@
 use drupal_kit::http::Method;
-use drupal_kit::http_client::HttpClient;
+use drupal_kit::http_client::{HttpClient, HttpRequestOption};
 use reqwest::Client;
+use http;
+use http::header;
 
 struct TestHttpClient {
     client: Client,
@@ -49,3 +51,36 @@ async fn test_request_json_adds_content_type_header() {
     // The request should succeed because the mock expects the Content-Type header
     assert!(result.is_ok());
 }
+
+#[tokio::test]
+async fn test_request_json_custom_content_type() {
+    let mut server = mockito::Server::new_async().await;
+    let base_url = server.url();
+
+    // Create a mock that expects a custom Content-Type header
+    let _mock = server
+        .mock("GET", "/test")
+        .match_header("content-type", "application/xml")
+        .with_status(200)
+        .with_body("{}")
+        .create_async()
+        .await;
+
+    let client = TestHttpClient::new(base_url);
+
+    // Make a request with a custom Content-Type header
+    let result: Result<serde_json::Value, _> = client
+        .request_json(
+            Method::GET,
+            "/test",
+            "",
+            vec![HttpRequestOption::Header(
+                http::header::CONTENT_TYPE,
+                http::HeaderValue::from_static("application/xml"),
+            )],
+        )
+        .await;
+
+    // The request should succeed because the mock expects the custom Content-Type header
+    assert!(result.is_ok());
+}