Closes #15. No usable Error message right now

2 files changed, 46 insertions, 19 deletions

diff --git a/src/routes/device.rs b/src/routes/device.rs
index aa52cf7..5ca574a 100644
--- a/src/routes/device.rs
+++ b/src/routes/device.rs
@@ -1,18 +1,23 @@
-use std::sync::Arc;
+use crate::auth::auth;
+use crate::db::Device;
+use crate::error::Error;
 use axum::extract::State;
-use axum::Json;
 use axum::http::HeaderMap;
+use axum::Json;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
+use std::sync::Arc;
 use tracing::{debug, info};
-use crate::auth::auth;
-use crate::db::Device;
-use crate::error::Error;
 
-pub async fn get(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<GetDevicePayload>) -> Result<Json<Value>, Error> {
+pub async fn get(
+    State(state): State<Arc<crate::AppState>>,
+    headers: HeaderMap,
+    Json(payload): Json<GetDevicePayload>,
+) -> Result<Json<Value>, Error> {
     info!("add device {}", payload.id);
     let secret = headers.get("authorization");
-    if auth(&state.config, secret)? {
+    let authorized = matches!(auth(&state.config, secret)?, crate::auth::Response::Success);
+    if authorized {
         let device = sqlx::query_as!(
             Device,
             r#"
@@ -21,7 +26,9 @@ pub async fn get(State(state): State<Arc<crate::AppState>>, headers: HeaderMap,
             WHERE id = $1;
             "#,
             payload.id
-        ).fetch_one(&state.db).await?;
+        )
+        .fetch_one(&state.db)
+        .await?;
 
         debug!("got device {:?}", device);
 
@@ -36,10 +43,18 @@ pub struct GetDevicePayload {
     id: String,
 }
 
-pub async fn put(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<PutDevicePayload>) -> Result<Json<Value>, Error> {
-    info!("add device {} ({}, {}, {})", payload.id, payload.mac, payload.broadcast_addr, payload.ip);
+pub async fn put(
+    State(state): State<Arc<crate::AppState>>,
+    headers: HeaderMap,
+    Json(payload): Json<PutDevicePayload>,
+) -> Result<Json<Value>, Error> {
+    info!(
+        "add device {} ({}, {}, {})",
+        payload.id, payload.mac, payload.broadcast_addr, payload.ip
+    );
     let secret = headers.get("authorization");
-    if auth(&state.config, secret)? {
+    let authorized = matches!(auth(&state.config, secret)?, crate::auth::Response::Success);
+    if authorized {
         sqlx::query!(
             r#"
             INSERT INTO devices (id, mac, broadcast_addr, ip)
@@ -49,7 +64,9 @@ pub async fn put(State(state): State<Arc<crate::AppState>>, headers: HeaderMap,
             payload.mac,
             payload.broadcast_addr,
             payload.ip
-        ).execute(&state.db).await?;
+        )
+        .execute(&state.db)
+        .await?;
 
         Ok(Json(json!(PutDeviceResponse { success: true })))
     } else {
@@ -62,18 +79,26 @@ pub struct PutDevicePayload {
     id: String,
     mac: String,
     broadcast_addr: String,
-    ip: String
+    ip: String,
 }
 
 #[derive(Serialize)]
 pub struct PutDeviceResponse {
-    success: bool
+    success: bool,
 }
 
-pub async fn post(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<PostDevicePayload>) -> Result<Json<Value>, Error> {
-    info!("edit device {} ({}, {}, {})", payload.id, payload.mac, payload.broadcast_addr, payload.ip);
+pub async fn post(
+    State(state): State<Arc<crate::AppState>>,
+    headers: HeaderMap,
+    Json(payload): Json<PostDevicePayload>,
+) -> Result<Json<Value>, Error> {
+    info!(
+        "edit device {} ({}, {}, {})",
+        payload.id, payload.mac, payload.broadcast_addr, payload.ip
+    );
     let secret = headers.get("authorization");
-    if auth(&state.config, secret)? {
+    let authorized = matches!(auth(&state.config, secret)?, crate::auth::Response::Success);
+    if authorized {
         let device = sqlx::query_as!(
             Device,
             r#"
@@ -85,7 +110,9 @@ pub async fn post(State(state): State<Arc<crate::AppState>>, headers: HeaderMap,
             payload.broadcast_addr,
             payload.ip,
             payload.id
-        ).fetch_one(&state.db).await?;
+        )
+        .fetch_one(&state.db)
+        .await?;
 
         Ok(Json(json!(device)))
     } else {
diff --git a/src/routes/start.rs b/src/routes/start.rs
index 66b7cb4..ec4f98f 100644
--- a/src/routes/start.rs
+++ b/src/routes/start.rs
@@ -20,7 +20,7 @@ pub async fn start(
 ) -> Result<Json<Value>, Error> {
     info!("POST request");
     let secret = headers.get("authorization");
-    let authorized = auth(&state.config, secret)?;
+    let authorized = matches!(auth(&state.config, secret)?, crate::auth::Response::Success);
     if authorized {
         let device = sqlx::query_as!(
             Device,