nebkor/what2watch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

migrate to latest tower_sessions

Browse source
This commit is contained in:
Joe Ardent 2024-03-12 19:05:12 -07:00
parent 94e26f8080
commit 30b75cc936
4 changed files with 279 additions and 292 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

542
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

11
Cargo.toml
View file

@ -14,7 +14,7 @@ askama = { version = "0.12", features = ["with-axum"] }
askama_axum = "0.4" askama_axum = "0.4"
async-trait = "0.1" async-trait = "0.1"
axum = { version = "0.7", features = ["macros"] } axum = { version = "0.7", features = ["macros"] }
axum-login = "0.11" axum-login = "0.14"
axum-macros = "0.4" axum-macros = "0.4"
chrono = { version = "0.4", default-features = false, features = ["std", "clock"] } chrono = { version = "0.4", default-features = false, features = ["std", "clock"] }
clap = { version = "4", features = ["derive", "env", "unicode", "suggestions", "usage"] } clap = { version = "4", features = ["derive", "env", "unicode", "suggestions", "usage"] }
@ -23,18 +23,19 @@ dirs = "5"
http = "1" http = "1"
julid-rs = "1" julid-rs = "1"
justerror = "1" justerror = "1"
parse_duration = "2.1.1" parse_duration = "2"
password-auth = "1" password-auth = "1"
password-hash = { version = "0.5", features = ["std", "getrandom"] } password-hash = { version = "0.5", features = ["std", "getrandom"] }
rand = "0.8" rand = "0.8"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
sha256 = { version = "1.4.0", default-features = false } sha256 = { version = "1", default-features = false }
sqlx = { version = "0.7", default-features = false, features = ["runtime-tokio", "sqlite", "tls-none", "migrate"] } sqlx = { version = "0.7", default-features = false, features = ["runtime-tokio", "sqlite", "tls-none", "migrate"] }
thiserror = "1" thiserror = "1"
tokio = { version = "1", features = ["full", "tracing"], default-features = false } tokio = { version = "1", features = ["rt-multi-thread", "signal", "tracing"], default-features = false }
tower = { version = "0.4", features = ["util", "timeout"], default-features = false } tower = { version = "0.4", features = ["util", "timeout"], default-features = false }
tower-http = { version = "0.5", features = ["add-extension", "trace", "tracing", "fs"], default-features = false } tower-http = { version = "0.5", features = ["add-extension", "trace", "tracing", "fs"], default-features = false }
tower-sessions = { version = "0.8", default-features = false, features = ["sqlite-store"] } tower-sessions = { version = "0.11", default-features = false }
tower-sessions-sqlx-store = { version = "0.11.0", default-features = false, features = ["sqlite"] }
tracing = "0.1" tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] } tracing-subscriber = { version = "0.3", features = ["env-filter"] }
unicode-segmentation = "1" unicode-segmentation = "1"

7
src/auth.rs
View file

@ -1,9 +1,12 @@
use async_trait::async_trait; use async_trait::async_trait;
use axum_login::{AuthUser, AuthnBackend, UserId}; use axum_login::{
tower_sessions::{cookie::time::Duration, Expiry, SessionManagerLayer},
AuthUser, AuthnBackend, UserId,
};
use julid::Julid; use julid::Julid;
use password_auth::verify_password; use password_auth::verify_password;
use sqlx::SqlitePool; use sqlx::SqlitePool;
use tower_sessions::{cookie::time::Duration, Expiry, SessionManagerLayer, SqliteStore}; use tower_sessions_sqlx_store::SqliteStore;
use crate::User; use crate::User;

11
src/lib.rs
View file

@ -1,9 +1,8 @@
use axum::{ use axum::{
error_handling::HandleErrorLayer,
middleware, middleware,
routing::{get, post, IntoMakeService}, routing::{get, post, IntoMakeService},
BoxError,
}; };
use axum_login::AuthManagerLayerBuilder;
use sqlx::SqlitePool; use sqlx::SqlitePool;
#[macro_use] #[macro_use]
extern crate justerror; extern crate justerror;
@ -57,13 +56,9 @@ pub async fn app(db_pool: sqlx::SqlitePool) -> IntoMakeService<axum::Router> {
}; };
let auth_layer = { let auth_layer = {
let sessions = session_layer(db_pool.clone()).await; let session_layer = session_layer(db_pool.clone()).await;
let store = AuthStore::new(db_pool.clone()); let store = AuthStore::new(db_pool.clone());
tower::ServiceBuilder::new() AuthManagerLayerBuilder::new(store, session_layer).build()
.layer(HandleErrorLayer::new(|_: BoxError| async {
http::StatusCode::BAD_REQUEST
}))
.layer(axum_login::AuthManagerLayerBuilder::new(store, sessions).build())
}; };
let assets_dir = std::env::current_dir().unwrap().join("assets"); let assets_dir = std::env::current_dir().unwrap().join("assets");