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

Bump poem from 1.0.7 to 1.0.11

Browse Source
This commit is contained in:
Sunli 2021-10-27 13:57:05 +08:00
parent 16f216c18f
commit 886eeb7129
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integrations/poem/Cargo.toml
View File

@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
async-graphql = { path = "../..", version = "2.10.6" }
poem = { version = "1.0.7", features = ["websocket"] }
poem = { version = "1.0.11", features = ["websocket"] }
futures-util = { version = "0.3.13", default-features = false }
serde_json = "1.0.66"
tokio-util = { version = "0.6.7", features = ["compat"] }

10
integrations/poem/src/extractor.rs
View File

@ -1,4 +1,5 @@
use async_graphql::http::MultipartOptions;
use poem::error::BadRequest;
use poem::http::{header, Method};
use poem::web::Query;
use poem::{async_trait, Error, FromRequest, Request, RequestBody, Result};
@ -49,7 +50,7 @@ impl<'a> FromRequest<'a> for GraphQLRequest {
.await?
.0
.into_single()
.map_err(Error::bad_request)?,
.map_err(BadRequest)?,
))
}
}
@ -63,10 +64,7 @@ impl<'a> FromRequest<'a> for GraphQLBatchRequest {
async fn from_request(req: &'a Request, body: &mut RequestBody) -> Result<Self> {
if req.method() == Method::GET {
let req = Query::from_request(req, body)
.await
.map_err(Error::bad_request)?
.0;
let req = Query::from_request(req, body).await.map_err(BadRequest)?.0;
Ok(Self(async_graphql::BatchRequest::Single(req)))
} else {
let content_type = req
@ -81,7 +79,7 @@ impl<'a> FromRequest<'a> for GraphQLBatchRequest {
MultipartOptions::default(),
)
.await
.map_err(Error::bad_request)?,
.map_err(BadRequest)?,
))
}
}