searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-04 04:17:10 +02:00
Code Issues Releases Wiki Activity

Apply suggestion

Browse source 
- remove the payload_error_handler in favor of a PayloadError::from

- merge the two match branch into one

- makes the accepted content type a const instead of recalculating it for every error
This commit is contained in:
Tamo 2021-10-06 11:49:34 +02:00
parent 37b267ffb3
commit 9a1e44dc78
No known key found for this signature in database
GPG key ID: 20CD8020AFA88D69
3 changed files with 38 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

39
meilisearch-http/src/lib.rs
View file

@ -11,13 +11,14 @@ pub mod routes;
use std::path::Path;
use std::time::Duration;
use crate::error::{MeilisearchHttpError, ResponseError};
use crate::error::MeilisearchHttpError;
use crate::extractors::authentication::AuthConfig;
use actix_web::error::JsonPayloadError;
use error::PayloadError;
use http::header::CONTENT_TYPE;
pub use option::Opt;
use actix_web::web;
use actix_web::{web, HttpRequest};
use extractors::authentication::policies::*;
use extractors::payload::PayloadConfig;
@ -102,32 +103,24 @@ pub fn configure_data(config: &mut web::ServiceConfig, data: MeiliSearch, opt: &
.app_data(
web::JsonConfig::default()
.content_type(|mime| mime == mime::APPLICATION_JSON)
.error_handler(|err, req| match err {
JsonPayloadError::ContentType if req.headers().get(CONTENT_TYPE).is_none() => {
ResponseError::from(MeilisearchHttpError::MissingContentType(vec![
mime::APPLICATION_JSON.to_string(),
]))
.into()
}
JsonPayloadError::ContentType => {
ResponseError::from(MeilisearchHttpError::InvalidContentType(
req.headers()
.get(CONTENT_TYPE)
.unwrap()
.to_str()
.unwrap_or("unknown")
.to_string(),
.error_handler(|err, req: &HttpRequest| match err {
JsonPayloadError::ContentType => match req.headers().get(CONTENT_TYPE) {
Some(content_type) => MeilisearchHttpError::InvalidContentType(
content_type.to_str().unwrap_or("unknown").to_string(),
vec![mime::APPLICATION_JSON.to_string()],
))
.into()
}
err => error::payload_error_handler(err).into(),
)
.into(),
None => MeilisearchHttpError::MissingContentType(vec![
mime::APPLICATION_JSON.to_string(),
])
.into(),
},
err => PayloadError::from(err).into(),
}),
)
.app_data(PayloadConfig::new(http_payload_size_limit))
.app_data(
web::QueryConfig::default()
.error_handler(|err, _req| error::payload_error_handler(err).into()),
web::QueryConfig::default().error_handler(|err, _req| PayloadError::from(err).into()),
);
}