anna/async-graphql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fix build and gate cbor behind feature flag

Browse Source
This commit is contained in:
Erik Tesar 2021-09-02 15:58:37 +02:00
parent ff0469a09f
commit 0c1d4963aa
No known key found for this signature in database
GPG Key ID: 56CAC71D97116B83
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/http/mod.rs
View File

@ -43,16 +43,6 @@ pub async fn receive_batch_body(
let content_type: mime::Mime = content_type.parse()?;
match (content_type.type_(), content_type.subtype()) {
// application/json -> try json
(mime::APPLICATION, mime::JSON) => receive_batch_json(body).await,
// cbor is in application/octet-stream.
// TODO: wait for mime to add application/cbor and match against that too
#[cfg(feature = "cbor")]
(mime::OCTET_STREAM, _) | (mime::APPLICATION, mime::OCTET_STREAM) => {
receive_batch_cbor(body).await
}
// try to use multipart
(mime::MULTIPART, _) => {
if let Some(boundary) = content_type.get_param("boundary") {
@ -65,11 +55,9 @@ pub async fn receive_batch_body(
}
// application/json or cbor (currently)
// cbor is in application/octet-stream.
// Note: cbor will only match if feature ``cbor`` is active
// TODO: wait for mime to add application/cbor and match against that too
(mime::APPLICATION, mime::JSON)
| (mime::OCTET_STREAM, _)
| (mime::APPLICATION, mime::OCTET_STREAM)
| _ => receive_batch_body_no_multipart(&content_type, body).await,
_ => receive_batch_body_no_multipart(&content_type, body).await,
}
}
@ -81,13 +69,14 @@ pub(super) async fn receive_batch_body_no_multipart(
) -> Result<BatchRequest, ParseRequestError> {
assert_ne!(content_type.type_(), mime::MULTIPART, "received multipart");
match (content_type.type_(), content_type.subtype()) {
#[cfg(feature = "cbor")]
// cbor is in application/octet-stream.
// TODO: wait for mime to add application/cbor and match against that too
(mime::OCTET_STREAM, _) | (mime::APPLICATION, mime::OCTET_STREAM) => {
receive_batch_cbor(body).await
}
// application/json -> try json
(mime::APPLICATION, mime::JSON) | _ => receive_batch_json(body).await,
// default to json
_ => receive_batch_json(body).await,
}
}
/// Receive a GraphQL request from a body as JSON.

18
src/http/multipart.rs
View File

@ -81,23 +81,25 @@ pub(super) async fn receive_batch_multipart(
}
Some("map") => {
let map_bytes = field.bytes().await?;
// Note: we actually differ here from the inoffical spec for this:
// (https://github.com/jaydenseric/graphql-multipart-request-spec#multipart-form-field-structure)
// It says: "map: A JSON encoded map of where files occurred in the operations.
// For each file, the key is the file multipart form field name and the value is an array of operations paths."
// However, I think, that since we accepct CBOR as operation, which is valid, we should also accepct it
// as the mapping for the files.
match (content_type.type_(), content_type.subtype()) {
// cbor is in application/octet-stream.
// TODO: wait for mime to add application/cbor and match against that too
// Note: we actually differ here from the inoffical spec for this:
// (https://github.com/jaydenseric/graphql-multipart-request-spec#multipart-form-field-structure)
// It says: "map: A JSON encoded map of where files occurred in the operations.
// For each file, the key is the file multipart form field name and the value is an array of operations paths."
// However, I think, that since we accepct CBOR as operation, which is valid, we should also accept it
// as the mapping for the files.
#[cfg(feature = "cbor")]
(mime::OCTET_STREAM, _) | (mime::APPLICATION, mime::OCTET_STREAM) => {
map = Some(
serde_cbor::from_slice::<HashMap<String, Vec<String>>>(&map_bytes)
.map_err(|e| ParseRequestError::InvalidFilesMap(Box::new(e)))?,
);
}
// application/json -> try json
(mime::APPLICATION, mime::JSON) | _ => {
// default to json
_ => {
map = Some(
serde_json::from_slice::<HashMap<String, Vec<String>>>(&map_bytes)
.map_err(|e| ParseRequestError::InvalidFilesMap(Box::new(e)))?,