berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

address comments

This commit is contained in:
Jake Heinz 2021-08-27 03:17:08 +00:00
parent 0267333f02
commit 156445aaa3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/types/json.rs
View File

@ -146,13 +146,13 @@ where
let config = JsonConfig::from_req(req); let config = JsonConfig::from_req(req);
let limit = config.limit; let limit = config.limit;
let require_content_type = config.require_content_type; let content_type_required = config.content_type_required;
let ctype = config.content_type.as_deref(); let ctype = config.content_type.as_deref();
let err_handler = config.err_handler.clone(); let err_handler = config.err_handler.clone();
JsonExtractFut { JsonExtractFut {
req: Some(req.clone()), req: Some(req.clone()),
fut: JsonBody::new(req, payload, ctype, require_content_type).limit(limit), fut: JsonBody::new(req, payload, ctype, content_type_required).limit(limit),
err_handler, err_handler,
} }
} }
@ -238,7 +238,7 @@ pub struct JsonConfig {
limit: usize, limit: usize,
err_handler: JsonErrorHandler, err_handler: JsonErrorHandler,
content_type: Option<Arc<dyn Fn(mime::Mime) -> bool + Send + Sync>>, content_type: Option<Arc<dyn Fn(mime::Mime) -> bool + Send + Sync>>,
require_content_type: bool, content_type_required: bool,
} }
impl JsonConfig { impl JsonConfig {
@ -267,8 +267,8 @@ impl JsonConfig {
} }
/// Sets whether or not the request must have a `Content-Type` header to be parsed. /// Sets whether or not the request must have a `Content-Type` header to be parsed.
pub fn require_content_type(mut self, require_content_type: bool) -> Self { pub fn content_type_required(mut self, content_type_required: bool) -> Self {
self.require_content_type = require_content_type; self.content_type_required = content_type_required;
self self
} }
@ -288,7 +288,7 @@ const DEFAULT_CONFIG: JsonConfig = JsonConfig {
limit: DEFAULT_LIMIT, limit: DEFAULT_LIMIT,
err_handler: None, err_handler: None,
content_type: None, content_type: None,
require_content_type: true, content_type_required: true,
}; };
impl Default for JsonConfig { impl Default for JsonConfig {
@ -330,7 +330,7 @@ where
req: &HttpRequest, req: &HttpRequest,
payload: &mut Payload, payload: &mut Payload,
ctype: Option<&(dyn Fn(mime::Mime) -> bool + Send + Sync)>, ctype: Option<&(dyn Fn(mime::Mime) -> bool + Send + Sync)>,
require_content_type: bool, content_type_required: bool,
) -> Self { ) -> Self {
// check content-type // check content-type
let has_valid_content_type = if let Ok(Some(mime)) = req.mime_type() { let has_valid_content_type = if let Ok(Some(mime)) = req.mime_type() {
@ -338,7 +338,7 @@ where
|| mime.suffix() == Some(mime::JSON) || mime.suffix() == Some(mime::JSON)
|| ctype.map_or(false, |predicate| predicate(mime)) || ctype.map_or(false, |predicate| predicate(mime))
} else { } else {
!require_content_type !content_type_required
}; };
if !has_valid_content_type { if !has_valid_content_type {
@ -732,7 +732,7 @@ mod tests {
header::HeaderValue::from_static("16"), header::HeaderValue::from_static("16"),
)) ))
.set_payload(Bytes::from_static(b"{\"name\": \"test\"}")) .set_payload(Bytes::from_static(b"{\"name\": \"test\"}"))
.app_data(JsonConfig::default().require_content_type(false)) .app_data(JsonConfig::default().content_type_required(false))
.to_http_parts(); .to_http_parts();
let s = Json::<MyObject>::from_request(&req, &mut pl).await; let s = Json::<MyObject>::from_request(&req, &mut pl).await;