web synchronized with the new changes

This commit is contained in:
Priec
2026-08-09 16:30:27 +02:00
parent e66b025188
commit fd551ef7fb
44 changed files with 1215 additions and 88 deletions

View File

@@ -1,17 +1,72 @@
use axum::{
Form,
extract::State,
extract::{Query, State},
http::{HeaderMap, HeaderValue, StatusCode, header},
response::{Html, IntoResponse, Response},
};
use tonic::Request;
use crate::{AppState, auth::LoginRequest, ui::Nav};
use crate::{AppState, auth::{LoginRequest, SetInitialPasswordRequest}, services::reject_cross_site, ui::Nav};
use super::{state::LoginInput, ui};
use super::{state::{InitialPasswordInput, LoginInput, LoginQuery}, ui};
pub(crate) async fn login_page(headers: HeaderMap) -> Html<String> {
Html(ui::render_page(Nav::new(&headers, "login")))
pub(crate) async fn login_page(
headers: HeaderMap,
Query(query): Query<LoginQuery>,
) -> Html<String> {
Html(ui::render_page(
Nav::new(&headers, "login"),
query.permissions_changed,
query.initial_password_set,
))
}
pub(crate) async fn initial_password_page(headers: HeaderMap) -> Html<String> {
Html(ui::render_initial_password_page(Nav::new(&headers, "login")))
}
pub(crate) async fn set_initial_password(
State(state): State<AppState>,
headers: HeaderMap,
Form(input): Form<InitialPasswordInput>,
) -> Response {
if let Some(rejection) = reject_cross_site(&headers) {
return rejection;
}
let username = input.username.trim();
if !matches!(username, "admin" | "superadmin") {
return error(
StatusCode::UNPROCESSABLE_ENTITY,
"Only the bootstrap admin or superadmin account can be claimed here.",
);
}
let mut auth = state.auth;
match auth
.set_initial_password(tonic::Request::new(SetInitialPasswordRequest {
username: username.to_string(),
password: input.password,
password_confirmation: input.password_confirmation,
}))
.await
{
Ok(_) => {
let mut response = StatusCode::SEE_OTHER.into_response();
response.headers_mut().insert(
header::LOCATION,
HeaderValue::from_static("/login?initial_password_set=1"),
);
response.headers_mut().insert(
"hx-redirect",
HeaderValue::from_static("/login?initial_password_set=1"),
);
response
}
Err(status) => (
StatusCode::UNPROCESSABLE_ENTITY,
Html(ui::render_initial_password_error(status.message())),
)
.into_response(),
}
}
pub(crate) async fn login(
@@ -49,9 +104,19 @@ pub(crate) async fn login(
let mut response = Html(String::new()).into_response();
response.headers_mut().insert(header::SET_COOKIE, cookie);
response
.headers_mut()
.insert("hx-redirect", HeaderValue::from_static("/admin"));
let destination = if login
.authorization
.as_ref()
.is_some_and(crate::authz::can_open_admin)
{
"/admin"
} else {
"/"
};
response.headers_mut().insert(
"hx-redirect",
HeaderValue::from_static(destination),
);
response
}