actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-02-17 08:33:30 +01:00
Code Issues Releases Wiki Activity

Merge pull request #36 from Dowwie/master

Browse Source 
turned inner methods into async ones
This commit is contained in:
Nikolay Kim 2019-12-20 14:01:16 +06:00 committed by GitHub
commit 8f97550c7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/session.rs
View File

@ -10,7 +10,7 @@ use actix_web::cookie::{Cookie, CookieJar, Key, SameSite};
use actix_web::dev::{ServiceRequest, ServiceResponse}; use actix_web::dev::{ServiceRequest, ServiceResponse};
use actix_web::http::header::{self, HeaderValue}; use actix_web::http::header::{self, HeaderValue};
use actix_web::{error, Error, HttpMessage}; use actix_web::{error, Error, HttpMessage};
use futures::future::{err, ok, Either, Future, FutureExt, Ready}; use futures::future::{err, ok, Future, Ready};
use rand::{distributions::Alphanumeric, rngs::OsRng, Rng}; use rand::{distributions::Alphanumeric, rngs::OsRng, Rng};
use redis_async::resp::RespValue; use redis_async::resp::RespValue;
use time::{self, Duration}; use time::{self, Duration};
@ -207,10 +207,10 @@ struct Inner {
} }
impl Inner { impl Inner {
fn load( async fn load(
&self, &self,
req: &ServiceRequest, req: &ServiceRequest,
) -> impl Future<Output = Result<Option<(HashMap<String, String>, String)>, Error>> ) -> Result<Option<(HashMap<String, String>, String)>, Error>
{ {
if let Ok(cookies) = req.cookies() { if let Ok(cookies) = req.cookies() {
for cookie in cookies.iter() { for cookie in cookies.iter() {
@ -220,60 +220,58 @@ impl Inner {
if let Some(cookie) = jar.signed(&self.key).get(&self.name) { if let Some(cookie) = jar.signed(&self.key).get(&self.name) {
let value = cookie.value().to_owned(); let value = cookie.value().to_owned();
let cachekey = (self.cache_keygen)(&cookie.value()); let cachekey = (self.cache_keygen)(&cookie.value());
return Either::Left( return
self.addr.send(Command(resp_array!["GET", cachekey])).map( match self.addr.send(Command(resp_array!["GET", cachekey]))
|result| match result { .await {
Err(e) => Err(Error::from(e)), Err(e) => Err(Error::from(e)),
Ok(res) => match res { Ok(res) => match res {
Ok(val) => { Ok(val) => {
match val { match val {
RespValue::Error(err) => { RespValue::Error(err) => {
return Err( return Err(
error::ErrorInternalServerError( error::ErrorInternalServerError(
err, err,
), ),
); );
}
RespValue::SimpleString(s) => {
if let Ok(val) =
serde_json::from_str(&s)
{
return Ok(Some((val, value)));
}
}
RespValue::BulkString(s) => {
if let Ok(val) =
serde_json::from_slice(&s)
{
return Ok(Some((val, value)));
}
}
_ => (),
} }
Ok(None) RespValue::SimpleString(s) => {
if let Ok(val) =
serde_json::from_str(&s)
{
return Ok(Some((val, value)));
}
}
RespValue::BulkString(s) => {
if let Ok(val) =
serde_json::from_slice(&s)
{
return Ok(Some((val, value)));
}
}
_ => (),
} }
Err(err) => { Ok(None)
Err(error::ErrorInternalServerError(err)) }
} Err(err) => {
}, Err(error::ErrorInternalServerError(err))
}
}, },
), }
);
} else { } else {
return Either::Right(ok(None)); return Ok(None)
} }
} }
} }
} }
Either::Right(ok(None)) Ok(None)
} }
fn update<B>( async fn update<B>(
&self, &self,
mut res: ServiceResponse<B>, mut res: ServiceResponse<B>,
state: impl Iterator<Item = (String, String)>, state: impl Iterator<Item = (String, String)>,
value: Option<String>, value: Option<String>,
) -> impl Future<Output = Result<ServiceResponse<B>, Error>> { ) -> Result<ServiceResponse<B>, Error> {
let (value, jar) = if let Some(value) = value { let (value, jar) = if let Some(value) = value {
(value.clone(), None) (value.clone(), None)
} else { } else {
@ -311,11 +309,11 @@ impl Inner {
let state: HashMap<_, _> = state.collect(); let state: HashMap<_, _> = state.collect();
match serde_json::to_string(&state) { match serde_json::to_string(&state) {
Err(e) => Either::Left(err(e.into())), Err(e) => Err(e.into()),
Ok(body) => Either::Right( Ok(body) => {
self.addr match self.addr
.send(Command(resp_array!["SET", cachekey, body, "EX", &self.ttl])) .send(Command(resp_array!["SET", cachekey, body, "EX", &self.ttl]))
.map(|result| match result { .await {
Err(e) => Err(Error::from(e)), Err(e) => Err(Error::from(e)),
Ok(redis_result) => match redis_result { Ok(redis_result) => match redis_result {
Ok(_) => { Ok(_) => {
@ -331,18 +329,18 @@ impl Inner {
} }
Err(err) => Err(error::ErrorInternalServerError(err)), Err(err) => Err(error::ErrorInternalServerError(err)),
}, },
}), }
), }
} }
} }
/// removes cache entry /// removes cache entry
fn clear_cache(&self, key: String) -> impl Future<Output = Result<(), Error>> { async fn clear_cache(&self, key: String) -> Result<(), Error> {
let cachekey = (self.cache_keygen)(&key); let cachekey = (self.cache_keygen)(&key);
self.addr match self.addr
.send(Command(resp_array!["DEL", cachekey])) .send(Command(resp_array!["DEL", cachekey]))
.map(|res| match res { .await {
Err(e) => Err(Error::from(e)), Err(e) => Err(Error::from(e)),
Ok(res) => { Ok(res) => {
match res { match res {
@ -353,7 +351,7 @@ impl Inner {
)), )),
} }
} }
}) }
} }
/// invalidates session cookie /// invalidates session cookie