* Replace all uses of axum::Json with wrapped Json type (this allowing api access to broken clients that do not set Content-Type correctly)

Author: chrivers

src/routes/api.rs

@@ -4,7 +4,7 @@ use axum::{
     extract::{Path, State},
     response::IntoResponse,
     routing::{get, post, put},
-    Json, Router,
+    Router,
 };
 
 use bytes::Bytes;
@@ -13,19 +13,17 @@ use serde_json::{json, Value};
 use tokio::sync::MutexGuard;
 use uuid::Uuid;
 
+use crate::error::{ApiError, ApiResult};
 use crate::hue::api::{Device, GroupedLight, Light, RType, ResourceLink, Room, Scene, V1Reply};
 use crate::hue::legacy_api::{
-    ApiGroup, ApiLight, ApiLightStateUpdate, ApiResourceType, ApiScene, ApiUserConfig,
-    Capabilities, HueResult, NewUser, NewUserReply,
+    ApiGroup, ApiGroupActionUpdate, ApiLight, ApiLightStateUpdate, ApiResourceType, ApiScene,
+    ApiUserConfig, Capabilities, HueResult, NewUser, NewUserReply,
 };
 use crate::resource::Resources;
+use crate::routes::extractor::Json;
 use crate::server::appstate::AppState;
 use crate::z2m::request::ClientRequest;
 use crate::z2m::update::DeviceUpdate;
-use crate::{
-    error::{ApiError, ApiResult},
-    hue::legacy_api::ApiGroupActionUpdate,
-};
 
 async fn get_api_config(State(state): State<AppState>) -> impl IntoResponse {
     Json(state.api_short_config().await)

src/routes/clip/device.rs

@@ -1,13 +1,14 @@
 use axum::{
     extract::{Path, State},
     routing::put,
-    Json, Router,
+    Router,
 };
 use serde_json::Value;
 use uuid::Uuid;
 
 use crate::hue::api::{Device, DeviceUpdate, RType, V2Reply};
 use crate::routes::clip::ApiV2Result;
+use crate::routes::extractor::Json;
 use crate::server::appstate::AppState;
 
 async fn put_device(

src/routes/clip/generic.rs

@@ -2,14 +2,15 @@ use axum::{
     extract::{Path, State},
     response::IntoResponse,
     routing::{delete, get, post, put},
-    Json, Router,
+    Router,
 };
 use serde_json::Value;
 use uuid::Uuid;
 
 use crate::error::ApiError;
 use crate::hue::api::{RType, Resource, ResourceLink, V2Reply};
 use crate::routes::clip::ApiV2Result;
+use crate::routes::extractor::Json;
 use crate::server::appstate::AppState;
 
 async fn get_root(State(state): State<AppState>) -> impl IntoResponse {

src/routes/clip/grouped_light.rs

@@ -1,13 +1,14 @@
 use axum::{
     extract::{Path, State},
     routing::put,
-    Json, Router,
+    Router,
 };
 use serde_json::Value;
 use uuid::Uuid;
 
 use crate::hue::api::{GroupedLight, GroupedLightUpdate, RType, V2Reply};
 use crate::routes::clip::ApiV2Result;
+use crate::routes::extractor::Json;
 use crate::server::appstate::AppState;
 use crate::z2m::request::ClientRequest;
 use crate::z2m::update::DeviceUpdate;

src/routes/clip/light.rs

@@ -1,13 +1,14 @@
 use axum::{
     extract::{Path, State},
     routing::put,
-    Json, Router,
+    Router,
 };
 use serde_json::Value;
 use uuid::Uuid;
 
 use crate::hue::api::{Light, LightUpdate, RType, V2Reply};
 use crate::routes::clip::ApiV2Result;
+use crate::routes::extractor::Json;
 use crate::server::appstate::AppState;
 use crate::z2m::request::ClientRequest;
 use crate::z2m::update::DeviceUpdate;

src/routes/clip/mod.rs

@@ -4,12 +4,13 @@ pub mod grouped_light;
 pub mod light;
 pub mod scene;
 
-use axum::{Json, Router};
+use axum::Router;
 use serde::Serialize;
 use serde_json::Value;
 
 use crate::error::ApiResult;
 use crate::hue::api::V2Reply;
+use crate::routes::extractor::Json;
 use crate::server::appstate::AppState;
 
 type ApiV2Result = ApiResult<Json<V2Reply<Value>>>;

src/routes/clip/scene.rs

@@ -2,7 +2,7 @@ use axum::{
     extract::{Path, State},
     response::IntoResponse,
     routing::{delete, post, put},
-    Json, Router,
+    Router,
 };
 use serde_json::Value;
 use uuid::Uuid;
@@ -13,6 +13,7 @@ use crate::hue::api::{
 };
 use crate::model::state::AuxData;
 use crate::routes::clip::ApiV2Result;
+use crate::routes::extractor::Json;
 use crate::server::appstate::AppState;
 use crate::z2m::request::ClientRequest;
 

src/routes/licenses.rs

@@ -1,9 +1,10 @@
 use axum::response::IntoResponse;
 use axum::routing::get;
-use axum::{Json, Router};
+use axum::Router;
 use itertools::Itertools;
 use serde_json::{json, Value};
 
+use crate::routes::extractor::Json;
 use crate::server::appstate::AppState;
 
 async fn packages() -> Json<Value> {

src/routes/mod.rs

@@ -1,10 +1,11 @@
 use axum::response::{IntoResponse, Response};
-use axum::{Json, Router};
+use axum::Router;
 use hyper::StatusCode;
 use serde_json::Value;
 
 use crate::error::ApiError;
 use crate::hue::api::V2Reply;
+use crate::routes::extractor::Json;
 use crate::server::appstate::AppState;
 
 pub mod api;