octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-12 16:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update theerror format to show message in new Vault

Browse Source
This commit is contained in:
Miroslav Prasil 2018-08-15 15:50:07 +01:00
parent 3d1fc0f2e8
commit b3f3fd81ac
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/util.rs
View File

@ -3,19 +3,20 @@
/// ///
#[macro_export] #[macro_export]
macro_rules! err { macro_rules! err {
($err:expr, $err_desc:expr, $msg:expr) => {{ ($err:expr, $msg:expr) => {{
println!("ERROR: {}", $msg); println!("ERROR: {}", $msg);
err_json!(json!({ err_json!(json!({
"error": $err, "Message": $err,
"error_description": $err_desc, "ValidationErrors": {
"ErrorModel": { "": [$msg,],
"Message": $msg, },
"ValidationErrors": null, "ExceptionMessage": null,
"Object": "error" "ExceptionStackTrace": null,
} "InnerExceptionMessage": null,
"Object": "error",
})) }))
}}; }};
($msg:expr) => { err!("default_error", "default_error_description", $msg) } ($msg:expr) => { err!("The model state is invalid", $msg) }
} }
#[macro_export] #[macro_export]