-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #33 from meilisearch/actix-web/query-parameter
Provide an extractor for the query parameters in actix-web
- Loading branch information
Showing
4 changed files
with
80 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,9 @@ | ||
#[cfg(feature = "serde-json")] | ||
mod query_parameters; | ||
#[cfg(feature = "serde-json")] | ||
mod serde_json; | ||
|
||
#[cfg(feature = "serde-json")] | ||
pub use self::query_parameters::AwebQueryParameter; | ||
#[cfg(feature = "serde-json")] | ||
pub use self::serde_json::{AwebJson, AwebJsonExtractFut}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
//! A module to parse query parameter as String with deserr | ||
|
||
use std::marker::PhantomData; | ||
use std::{fmt, ops}; | ||
|
||
use crate::{DeserializeError, Deserr}; | ||
use actix_http::Payload; | ||
use actix_utils::future::{err, ok, Ready}; | ||
use actix_web::web::Query; | ||
use actix_web::{FromRequest, HttpRequest, ResponseError}; | ||
|
||
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)] | ||
pub struct AwebQueryParameter<T, E>(pub T, PhantomData<*const E>); | ||
|
||
impl<T, E> AwebQueryParameter<T, E> { | ||
/// Unwrap into inner `T` value. | ||
pub fn into_inner(self) -> T { | ||
self.0 | ||
} | ||
} | ||
|
||
impl<T, E> AwebQueryParameter<T, E> | ||
where | ||
T: Deserr<E>, | ||
E: DeserializeError + ResponseError + 'static, | ||
{ | ||
pub fn from_query(query_str: &str) -> Result<Self, actix_web::Error> { | ||
let value = Query::<serde_json::Value>::from_query(query_str)?; | ||
|
||
match deserr::deserialize::<_, _, E>(value.0) { | ||
Ok(data) => Ok(AwebQueryParameter(data, PhantomData)), | ||
Err(e) => Err(e)?, | ||
} | ||
} | ||
} | ||
|
||
impl<T, E> ops::Deref for AwebQueryParameter<T, E> { | ||
type Target = T; | ||
|
||
fn deref(&self) -> &T { | ||
&self.0 | ||
} | ||
} | ||
|
||
impl<T, E> ops::DerefMut for AwebQueryParameter<T, E> { | ||
fn deref_mut(&mut self) -> &mut T { | ||
&mut self.0 | ||
} | ||
} | ||
|
||
impl<T: fmt::Display, E> fmt::Display for AwebQueryParameter<T, E> { | ||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
self.0.fmt(f) | ||
} | ||
} | ||
|
||
impl<T, E> FromRequest for AwebQueryParameter<T, E> | ||
where | ||
T: Deserr<E>, | ||
E: DeserializeError + ResponseError + 'static, | ||
{ | ||
type Error = actix_web::Error; | ||
type Future = Ready<Result<Self, actix_web::Error>>; | ||
|
||
#[inline] | ||
fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future { | ||
AwebQueryParameter::from_query(req.query_string()) | ||
.map(ok) | ||
.unwrap_or_else(err) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters