Medzik
/
HomeDisk
mirror of https://github.com/MedzikUser/HomeDisk.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

chore(server): send error message in the json `error` field in response 

Previously it returned enum in json in `error_message` filed.
This commit is contained in:
MedzikUser 2022-07-13 11:07:07 +02:00
parent cca7dd3efd
commit 5f920d66cf
No known key found for this signature in database
GPG Key ID: A5FAC1E185C112DB
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
types/src/errors/server.rs
View File

@ -7,9 +7,9 @@ use super::{AuthError, FsError};
#[derive(Debug, Clone, Serialize, Deserialize, Error)]
#[serde(tag = "error", content = "error_message", rename_all = "kebab-case")]
pub enum Error {
#[error("auth error - {0}")]
#[error("auth error: {0}")]
AuthError(#[from] AuthError),
#[error("fs error - {0}")]
#[error("fs error: {0}")]
FsError(#[from] FsError),
#[error("too may requests, please slow down")]
TooManyRequests,
@ -21,10 +21,22 @@ pub enum Error {
JsonSyntaxError,
#[error("failed to extract the request body")]
BytesRejection,
#[error("other error - {0}")]
#[error("other error: {0}")]
Other(String),
}
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")]
enum ResponseError {
Error(String)
}
impl Error {
fn into_response(self) -> ResponseError {
ResponseError::Error(self.to_string())
}
}
#[cfg(feature = "axum")]
impl axum::response::IntoResponse for Error {
fn into_response(self) -> axum::response::Response {
@ -51,7 +63,7 @@ impl axum::response::IntoResponse for Error {
_ => StatusCode::BAD_REQUEST,
};
let mut response = axum::Json(self).into_response();
let mut response = axum::Json(self.into_response()).into_response();
*response.status_mut() = status;
response