sentry - ResponseError fix issue with BadRequest

elpiel · elpiel · commit 05014cd59b6a · 2022-08-18T19:53:42.000+03:00
diff --git a/primitives/examples/channel_pay_request.rs b/primitives/examples/channel_pay_request.rs
@@ -1,6 +1,5 @@
 use primitives::sentry::ChannelPayRequest;
 use serde_json::json;
-use std::str::FromStr;
 
 fn main() {
     let channel_pay_json = json!({
diff --git a/sentry/src/response.rs b/sentry/src/response.rs
@@ -21,7 +21,11 @@ impl IntoResponse for ResponseError {
             ResponseError::NotFound => {
                 (StatusCode::NOT_FOUND, "Not found".to_string()).into_response()
             }
-            ResponseError::BadRequest(err) => (StatusCode::BAD_REQUEST, err).into_response(),
+            ResponseError::BadRequest(err) => {
+                let error_response = [("message", err)].into_iter().collect::<HashMap<_, _>>();
+
+                (StatusCode::BAD_REQUEST, Json(error_response)).into_response()
+            }
             ResponseError::Unauthorized => {
                 (StatusCode::UNAUTHORIZED, "invalid authorization").into_response()
             }
@@ -46,9 +50,7 @@ where
     T: std::error::Error + 'static,
 {
     fn from(error: T) -> Self {
-        // @TODO use a error proper logger?
-        println!("{:#?}", error);
-        ResponseError::BadRequest("Bad Request: try again later".into())
+        ResponseError::BadRequest(error.to_string())
     }
 }
 impl From<ResponseError> for Response<Body> {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,11 @@ impl IntoResponse for ResponseError {`
`21`	`21`	`ResponseError::NotFound => {`
`22`	`22`	`(StatusCode::NOT_FOUND, "Not found".to_string()).into_response()`
`23`	`23`	`}`
`24`		`- ResponseError::BadRequest(err) => (StatusCode::BAD_REQUEST, err).into_response(),`
	`24`	`+ ResponseError::BadRequest(err) => {`
	`25`	`+ let error_response = [("message", err)].into_iter().collect::<HashMap<_, _>>();`
	`26`	`+`
	`27`	`+ (StatusCode::BAD_REQUEST, Json(error_response)).into_response()`
	`28`	`+ }`
`25`	`29`	`ResponseError::Unauthorized => {`
`26`	`30`	`(StatusCode::UNAUTHORIZED, "invalid authorization").into_response()`
`27`	`31`	`}`
`@@ -46,9 +50,7 @@ where`
`46`	`50`	`T: std::error::Error + 'static,`
`47`	`51`	`{`
`48`	`52`	`fn from(error: T) -> Self {`
`49`		`- // @TODO use a error proper logger?`
`50`		`- println!("{:#?}", error);`
`51`		`- ResponseError::BadRequest("Bad Request: try again later".into())`
	`53`	`+ ResponseError::BadRequest(error.to_string())`
`52`	`54`	`}`
`53`	`55`	`}`
`54`	`56`	`impl From<ResponseError> for Response<Body> {`