MyFavMirrors/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-12-29 00:23:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #140 from mprasil/error_format

Browse Source 
Update the error format to show message in new Vault
This commit is contained in:
Daniel García 2018-08-16 00:52:46 +02:00 committed by GitHub
commit 6fdeeb56ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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]