gractwo/mnemosyne
4
0
Fork 0
Code Pull Requests Actions Packages Activity

redirect to /login and redirect back, instead of showing small msg

Browse Source
This commit is contained in:
jmanczak
2026-04-09 15:20:02 +02:00
parent 3c111212f0
commit b93cdfba63
10 changed files with 217 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/web/pages/users.rs
View File

@@ -1,6 +1,6 @@
use axum::{
extract::Request,
response::{IntoResponse, Response},
response::{IntoResponse, Redirect, Response},
};
use maud::{PreEscaped, html};
@@ -22,49 +22,45 @@ pub mod create;
pub mod profile;
pub async fn page(req: Request) -> Result<Response, AuthError> {
let u = User::authenticate(req.headers())?;
let conn = database::conn()?;
let us = match u.is_some() {
true => User::get_all(&conn),
false => Ok(vec![]),
let u = match User::authenticate(req.headers())? {
Some(u) => u,
None => return Ok(Redirect::to(&format!("/login?r={}", req.uri().path())).into_response()),
};
let conn = database::conn()?;
let us = User::get_all(&conn);
Ok(base(
"Users | Mnemosyne",
html!(
(nav(u.as_ref(), req.uri().path()))
(nav(Some(&u), req.uri().path()))
@if let Some(u) = u {
div class="mx-auto max-w-4xl px-2 my-4" {
p class="flex items-center gap-2" {
span class="text-neutral-500" {(PreEscaped(icons::USERS))}
span class="text-2xl font-semibold font-lora" {"Users"}
}
p class="text-neutral-500 text-sm font-light" {
@if let Ok(v) = &us {
(v.len()) " users registered with Mnemosyne."
} @else {
"Could not fetch user count."
}
@if let Ok(true) = u.has_permission(&conn, Permission::ManuallyCreateUsers) {
" "
a href="/users/create" class="text-blue-500 hover:text-blue-400 hover:underline" {
"Create a new user"
}
}
}
div class="mx-auto max-w-4xl px-2 my-4" {
p class="flex items-center gap-2" {
span class="text-neutral-500" {(PreEscaped(icons::USERS))}
span class="text-2xl font-semibold font-lora" {"Users"}
}
div class="mx-auto max-w-4xl flex flex-wrap gap-4" {
@if let Ok(vec) = &us {
@for user in vec {
(user_miniprofile(user))
}
p class="text-neutral-500 text-sm font-light" {
@if let Ok(v) = &us {
(v.len()) " users registered with Mnemosyne."
} @else {
p class="text-center py-4 text-light text-red-500" {"Failed to load users."}
"Could not fetch user count."
}
@if let Ok(true) = u.has_permission(&conn, Permission::ManuallyCreateUsers) {
" "
a href="/users/create" class="text-blue-500 hover:text-blue-400 hover:underline" {
"Create a new user"
}
}
}
} @else {
p class="text-center p-2" {"You must be logged in to view this page."}
}
div class="mx-auto max-w-4xl flex flex-wrap gap-4" {
@if let Ok(vec) = &us {
@for user in vec {
(user_miniprofile(user))
}
} @else {
p class="text-center py-4 text-light text-red-500" {"Failed to load users."}
}
}
),
)