schn33fuchs/ticketsystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Better error message

Browse Source 
German now
This commit is contained in:
Silas
2026-05-29 09:36:56 +02:00
parent 6ef50d06aa
commit f96db06a33
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/handlers/auth.rs
View File

@@ -145,7 +145,7 @@ pub async fn login(
.ok_or_else(|| { .ok_or_else(|| {
( (
StatusCode::BAD_REQUEST, 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 { if !valid_pwd {
let error_response = serde_json::json!({ let error_response = serde_json::json!({
"status": "error", "status": "error",
"message": "Invalid password" "message": "Ungültiges passwort"
}); });
return Err((StatusCode::BAD_REQUEST, Json(error_response))); return Err((StatusCode::BAD_REQUEST, Json(error_response)));
} }
@@ -338,10 +338,7 @@ pub async fn get_users(
(StatusCode::INTERNAL_SERVER_ERROR, Json(error)) (StatusCode::INTERNAL_SERVER_ERROR, Json(error))
})?; })?;
let response = users let response = users.iter().map(filter_user).collect::<Vec<FilteredUser>>();
.iter()
.map(filter_user)
.collect::<Vec<FilteredUser>>();
let json_respnse = json!(response); let json_respnse = json!(response);
Ok(Json(json_respnse)) Ok(Json(json_respnse))
} }
@@ -381,12 +378,10 @@ pub async fn get_user_by_id(
}); });
Err((StatusCode::NOT_FOUND, Json(error_response))) Err((StatusCode::NOT_FOUND, Json(error_response)))
} }
Err(e) => { Err(e) => Err((
Err((
StatusCode::INTERNAL_SERVER_ERROR, StatusCode::INTERNAL_SERVER_ERROR,
Json(json!({"status": "error", "message": format!("{:?}", e)})), Json(json!({"status": "error", "message": format!("{:?}", e)})),
)) )),
}
} }
} }

8
frontend/src/pages/user.rs
View File

@@ -1,3 +1,4 @@
use crate::dequote;
use gloo_net::http::Request; use gloo_net::http::Request;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use wasm_bindgen_futures::spawn_local; use wasm_bindgen_futures::spawn_local;
@@ -333,8 +334,9 @@ pub fn login_component() -> Html {
navigator.push(&crate::Route::Home); navigator.push(&crate::Route::Home);
} }
Ok(r) => { Ok(r) => {
let text = r.text().await.unwrap_or_else(|_| "unbekannt".into()); let text: serde_json::Value =
error.set(format!("HTTP {}: {}", r.status(), text)); r.json().await.unwrap_or_else(|_| "unbekannt".into());
error.set(dequote!(format!("{}", text["message"].to_string())));
} }
Err(err) => error.set(format!("Netzwerkfehler: {}", err)), Err(err) => error.set(format!("Netzwerkfehler: {}", err)),
} }
@@ -343,7 +345,7 @@ pub fn login_component() -> Html {
}; };
html! { html! {
<main class="content"> <main class="content login">
<div class="form-container"> <div class="form-container">
<div class="page-header"> <div class="page-header">
<h1>{ "Anmelden" }</h1> <h1>{ "Anmelden" }</h1>