actix/examples
1
0
Fork 0
mirror of https://github.com/actix/examples synced 2025-06-26 17:17:42 +02:00
Code Issues Releases Wiki Activity

reduce futures dep

Browse Source
This commit is contained in:
Rob Ede
2022-03-06 00:15:16 +00:00
parent c5f2a8fcc7
commit e8cd22d2f2
25 changed files with 62 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
auth/simple-auth-server/Cargo.toml
View File

@ -7,17 +7,16 @@ edition = "2021"
actix-web = "4"
actix-identity = "0.4"
chrono = { version = "0.4.6", features = ["serde"] }
derive_more = "0.99.0"
chrono = { version = "0.4", features = ["serde"] }
derive_more = "0.99.5"
diesel = { version = "1.4.5", features = ["postgres", "uuidv07", "r2d2", "chrono"] }
dotenv = "0.15"
env_logger = "0.9.0"
futures = "0.3.1"
env_logger = "0.9"
r2d2 = "0.8"
rust-argon2 = "1.0.0"
lazy_static = "1.4.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
sparkpost = "0.5.2"
uuid = { version = "0.8.2", features = ["serde", "v4"] }
time = "0.3.7"
rust-argon2 = "1"
lazy_static = "1.4"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
sparkpost = "0.5"
uuid = { version = "0.8", features = ["serde", "v4"] }
time = "0.3"

8
auth/simple-auth-server/src/auth_handler.rs
View File

@ -1,8 +1,9 @@
use std::future::{ready, Ready};
use actix_identity::Identity;
use actix_web::{dev::Payload, web, Error, FromRequest, HttpRequest, HttpResponse};
use diesel::prelude::*;
use diesel::PgConnection;
use futures::future::{err, ok, Ready};
use serde::Deserialize;
use crate::errors::ServiceError;
@ -27,11 +28,12 @@ impl FromRequest for LoggedUser {
if let Ok(identity) = Identity::from_request(req, pl).into_inner() {
if let Some(user_json) = identity.identity() {
if let Ok(user) = serde_json::from_str(&user_json) {
return ok(user);
return ready(Ok(user));
}
}
}
err(ServiceError::Unauthorized.into())
ready(Err(ServiceError::Unauthorized.into()))
}
}