From f96db06a33231ed5ede939f862c6d97e6b30ea54 Mon Sep 17 00:00:00 2001 From: schn33fuchs Date: Fri, 29 May 2026 09:36:56 +0200 Subject: [PATCH] Better error message German now --- backend/src/handlers/auth.rs | 19 +++++++------------ frontend/src/pages/user.rs | 8 +++++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/backend/src/handlers/auth.rs b/backend/src/handlers/auth.rs index bcfc76a..2ae8be8 100644 --- a/backend/src/handlers/auth.rs +++ b/backend/src/handlers/auth.rs @@ -145,7 +145,7 @@ pub async fn login( .ok_or_else(|| { ( StatusCode::BAD_REQUEST, - Json(json!({"status": "error", "message": "Invalid username"})), + Json(json!({"status": "error", "message": "Ungültiger Benutzername"})), ) })?; @@ -157,7 +157,7 @@ pub async fn login( if !valid_pwd { let error_response = serde_json::json!({ "status": "error", - "message": "Invalid password" + "message": "Ungültiges passwort" }); return Err((StatusCode::BAD_REQUEST, Json(error_response))); } @@ -338,10 +338,7 @@ pub async fn get_users( (StatusCode::INTERNAL_SERVER_ERROR, Json(error)) })?; - let response = users - .iter() - .map(filter_user) - .collect::>(); + let response = users.iter().map(filter_user).collect::>(); let json_respnse = json!(response); Ok(Json(json_respnse)) } @@ -381,12 +378,10 @@ pub async fn get_user_by_id( }); Err((StatusCode::NOT_FOUND, Json(error_response))) } - Err(e) => { - Err(( - StatusCode::INTERNAL_SERVER_ERROR, - Json(json!({"status": "error", "message": format!("{:?}", e)})), - )) - } + Err(e) => Err(( + StatusCode::INTERNAL_SERVER_ERROR, + Json(json!({"status": "error", "message": format!("{:?}", e)})), + )), } } diff --git a/frontend/src/pages/user.rs b/frontend/src/pages/user.rs index b67e802..927d319 100644 --- a/frontend/src/pages/user.rs +++ b/frontend/src/pages/user.rs @@ -1,3 +1,4 @@ +use crate::dequote; use gloo_net::http::Request; use serde::{Deserialize, Serialize}; use wasm_bindgen_futures::spawn_local; @@ -333,8 +334,9 @@ pub fn login_component() -> Html { navigator.push(&crate::Route::Home); } Ok(r) => { - let text = r.text().await.unwrap_or_else(|_| "unbekannt".into()); - error.set(format!("HTTP {}: {}", r.status(), text)); + let text: serde_json::Value = + r.json().await.unwrap_or_else(|_| "unbekannt".into()); + error.set(dequote!(format!("{}", text["message"].to_string()))); } Err(err) => error.set(format!("Netzwerkfehler: {}", err)), } @@ -343,7 +345,7 @@ pub fn login_component() -> Html { }; html! { -
+