selfhoster1312/llldap
Watch
1
0
Fork
You've already forked llldap
 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

refactor: HttpSession/OptionalHttpSession axum extractors

Browse source
This commit is contained in:
selfhoster selfhoster 2026-09-19 12:30:47 +02:00
commit 44c083a8ef
7 changed files with 111 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

91
src/http/home.rs
View file

@ -1,63 +1,58 @@
use axum::extract::State;
use axum::response::{Html, IntoResponse, Response};
use axum_extra::extract::cookie::CookieJar;
use http::StatusCode;
use minijinja::context;
use crate::db::{DatabaseInterface, Operation};
use crate::http::HttpState;
use crate::http::login::login_page;
use crate::http::{HttpSession, HttpState};
pub async fn home<D: DatabaseInterface>(
State(state): State<HttpState<D>>,
cookies: CookieJar,
// Only logged in users are allowed here
session: HttpSession,
) -> Response {
if let Some(session) = state.sessions.get_session(&cookies) {
// When the user has no domain (service admin) list all domains
let op = Operation::ListUsers(session.user.domain.clone());
let other_users = if session.user.can_perform(&op) {
match state
.db
.list_domain_users(session.user.domain.clone())
.await
{
Ok(other_users) => other_users,
Err(e) => {
return format!("Database error: {e}").into_response();
}
}
} else {
vec![]
};
tracing::info!(
"Found {} users on domain {:?}",
other_users.len(),
session.user.domain
);
let domains = match state.db.domains_user_can_see(&session.user).await {
Ok(domains) => domains,
// When the user has no domain (service admin) list all domains
let op = Operation::ListUsers(session.user.domain.clone());
let other_users = if session.user.can_perform(&op) {
match state
.db
.list_domain_users(session.user.domain.clone())
.await
{
Ok(other_users) => other_users,
Err(e) => {
return format!("Database error: {e}").into_response();
}
};
let ctx = context! {
domains,
user => session.user,
can_create_domain => session.user.can_create_domain(),
other_users,
};
let page = state
.templates
.get_template("home.html")
.unwrap()
.render(ctx)
.unwrap();
(StatusCode::OK, Html(page)).into_response()
}
} else {
login_page(State(state), None).await
}
vec![]
};
tracing::info!(
"Found {} users on domain {:?}",
other_users.len(),
session.user.domain
);
let domains = match state.db.domains_user_can_see(&session.user).await {
Ok(domains) => domains,
Err(e) => {
return format!("Database error: {e}").into_response();
}
};
let ctx = context! {
domains,
user => session.user,
can_create_domain => session.user.can_create_domain(),
other_users,
};
let page = state
.templates
.get_template("home.html")
.unwrap()
.render(ctx)
.unwrap();
(StatusCode::OK, Html(page)).into_response()
}