yume/juniper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10 from zaeleus/graphqlerror-to-json

Browse source 
Remove JSON wrapper object from GraphQLError::to_json
This commit is contained in:
Magnus Hallin 2017-01-06 12:43:19 +01:00 committed by GitHub
commit ccf6b8399a
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/integrations/iron_handlers.rs
View file

@ -108,11 +108,12 @@ impl<'a, CtxFactory, Query, Mutation, CtxT>
let result = execute(query, None, &self.root_node, variables, &context); let result = execute(query, None, &self.root_node, variables, &context);
let content_type = "application/json".parse::<Mime>().unwrap(); let content_type = "application/json".parse::<Mime>().unwrap();
let mut map = BTreeMap::new();
match result { match result {
Ok((result, errors)) => { Ok((result, errors)) => {
let mut map = BTreeMap::new();
map.insert("data".to_owned(), result.to_json()); map.insert("data".to_owned(), result.to_json());
if !errors.is_empty() { if !errors.is_empty() {
map.insert("errors".to_owned(), errors.to_json()); map.insert("errors".to_owned(), errors.to_json());
} }
@ -124,7 +125,9 @@ impl<'a, CtxFactory, Query, Mutation, CtxT>
} }
Err(err) => { Err(err) => {
let data = err.to_json(); map.insert("errors".to_owned(), err.to_json());
let data = Json::Object(map);
let json = data.pretty(); let json = data.pretty();
Ok(Response::with((content_type, status::BadRequest, json.to_string()))) Ok(Response::with((content_type, status::BadRequest, json.to_string())))

10
src/lib.rs
View file

@ -286,20 +286,16 @@ impl<'a> From<Spanning<ParseError<'a>>> for GraphQLError<'a> {
impl<'a> ToJson for GraphQLError<'a> { impl<'a> ToJson for GraphQLError<'a> {
fn to_json(&self) -> Json { fn to_json(&self) -> Json {
let errs = match *self { match *self {
GraphQLError::ParseError(ref err) => parse_error_to_json(err), GraphQLError::ParseError(ref err) => parse_error_to_json(err),
GraphQLError::ValidationError(ref errs) => errs.to_json(), GraphQLError::ValidationError(ref errs) => errs.to_json(),
GraphQLError::MultipleOperationsProvided => Json::String( GraphQLError::MultipleOperationsProvided => Json::String(
"Must provide operation name if query contains multiple operations.".to_owned()), "Must provide operation name if query contains multiple operations".to_owned()),
GraphQLError::NoOperationProvided => Json::String( GraphQLError::NoOperationProvided => Json::String(
"Must provide an operation".to_owned()), "Must provide an operation".to_owned()),
GraphQLError::UnknownOperationName => Json::String( GraphQLError::UnknownOperationName => Json::String(
"Unknown operation".to_owned()), "Unknown operation".to_owned()),
}; }
Json::Object(vec![
("errors".to_owned(), errs),
].into_iter().collect())
} }
} }