mirror of
				https://github.com/dani-garcia/vaultwarden.git
				synced 2025-10-30 01:38:20 +02:00 
			
		
		
		
	Merge pull request #140 from mprasil/error_format
Update the error format to show message in new Vault
This commit is contained in:
		
							
								
								
									
										19
									
								
								src/util.rs
									
									
									
									
									
								
							
							
						
						
									
										19
									
								
								src/util.rs
									
									
									
									
									
								
							| @@ -3,19 +3,20 @@ | ||||
| /// | ||||
| #[macro_export] | ||||
| macro_rules! err { | ||||
|     ($err:expr, $err_desc:expr, $msg:expr) => {{ | ||||
|     ($err:expr, $msg:expr) => {{ | ||||
|         println!("ERROR: {}", $msg); | ||||
|         err_json!(json!({ | ||||
|           "error": $err, | ||||
|           "error_description": $err_desc, | ||||
|           "ErrorModel": { | ||||
|             "Message": $msg, | ||||
|             "ValidationErrors": null, | ||||
|             "Object": "error" | ||||
|           } | ||||
|           "Message": $err, | ||||
|           "ValidationErrors": { | ||||
|             "": [$msg,], | ||||
|           }, | ||||
|           "ExceptionMessage": null, | ||||
|           "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] | ||||
|   | ||||
		Reference in New Issue
	
	Block a user