From 55494f0d1f6d3106ba61a966423af9e80e034749 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Wed, 4 Oct 2023 10:51:00 +0200 Subject: user management on dedicated page --- server/src/routes/mod.rs | 8 +++- server/src/routes/ui/admin/mod.rs | 34 ++----------- server/src/routes/ui/admin/user.rs | 98 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 32 deletions(-) create mode 100644 server/src/routes/ui/admin/user.rs (limited to 'server/src') diff --git a/server/src/routes/mod.rs b/server/src/routes/mod.rs index a80ea4c..cb7d90f 100644 --- a/server/src/routes/mod.rs +++ b/server/src/routes/mod.rs @@ -22,8 +22,10 @@ use ui::{ settings::{r_account_settings, r_account_settings_post}, }, admin::{ - log::r_admin_log, r_admin_dashboard, r_admin_delete_cache, r_admin_import, r_admin_invite, - r_admin_remove_invite, r_admin_remove_user, + log::r_admin_log, + r_admin_dashboard, r_admin_delete_cache, r_admin_import, r_admin_invite, + r_admin_remove_invite, + user::{r_admin_remove_user, r_admin_user, r_admin_users}, }, assets::r_item_assets, browser::r_all_items_filter, @@ -99,6 +101,8 @@ pub fn build_rocket(database: Database, federation: Federation) -> Rocket r_admin_dashboard, r_admin_invite, r_admin_remove_user, + r_admin_user, + r_admin_users, r_admin_remove_invite, r_admin_import, r_admin_delete_cache, diff --git a/server/src/routes/ui/admin/mod.rs b/server/src/routes/ui/admin/mod.rs index c6a89ca..0d1ee0a 100644 --- a/server/src/routes/ui/admin/mod.rs +++ b/server/src/routes/ui/admin/mod.rs @@ -4,6 +4,7 @@ Copyright (C) 2023 metamuffin */ pub mod log; +pub mod user; use super::account::session::AdminSession; use crate::{ @@ -22,6 +23,7 @@ use jellybase::CONF; use rand::Rng; use rocket::{form::Form, get, post, FromForm, State}; use std::time::Instant; +use user::rocket_uri_macro_r_admin_users; #[get("/admin/dashboard")] pub fn r_admin_dashboard( @@ -35,8 +37,6 @@ pub fn admin_dashboard<'a>( database: &Database, flash: Option>, ) -> MyResult> { - // TODO this doesnt scale, pagination! - let users = database.user.iter().collect::, _>>()?; let invites = database.invite.iter().collect::, _>>()?; let flash = flash.map(|f| f.map_err(|e| format!("{e:?}"))); @@ -56,6 +56,8 @@ pub fn admin_dashboard<'a>( form[method="POST", action=uri!(r_admin_delete_cache())] { input[type="submit", value="Delete Cache"]; } + h2 { "Users" } + p { a[href=uri!(r_admin_users())] "Manage Users" } h2 { "Invitations" } form[method="POST", action=uri!(r_admin_invite())] { input[type="submit", value="Generate new invite code"]; @@ -69,14 +71,6 @@ pub fn admin_dashboard<'a>( } } }} - h2 { "Users" } - ul { @for (_, u) in &users { - li { form[method="POST", action=uri!(r_admin_remove_user())] { - span { @format!("{:?}", u.display_name) " (" @u.name ")" } - input[type="text", name="name", value=&u.name, hidden]; - input[type="submit", value="Remove(!)"]; - }} - }} }, ..Default::default() }) @@ -93,26 +87,6 @@ pub fn r_admin_invite( admin_dashboard(database, Some(Ok(format!("Invite: {}", i)))) } -#[derive(FromForm)] -pub struct DeleteUser { - name: String, -} - -#[post("/admin/remove_user", data = "
")] -pub fn r_admin_remove_user( - session: AdminSession, - database: &State, - form: Form, -) -> MyResult> { - drop(session); - database - .user - .remove(&form.name)? - .ok_or(anyhow!("user did not exist"))?; - - admin_dashboard(database, Some(Ok("User removed".into()))) -} - #[derive(FromForm)] pub struct DeleteInvite { invite: String, diff --git a/server/src/routes/ui/admin/user.rs b/server/src/routes/ui/admin/user.rs new file mode 100644 index 0000000..9868343 --- /dev/null +++ b/server/src/routes/ui/admin/user.rs @@ -0,0 +1,98 @@ +use crate::{ + database::Database, + routes::ui::{ + account::session::AdminSession, + error::MyResult, + layout::{DynLayoutPage, FlashDisplay, LayoutPage}, + }, + uri, +}; +use anyhow::anyhow; +use rocket::{form::Form, get, post, FromForm, State}; + +#[get("/admin/users")] +pub fn r_admin_users( + _session: AdminSession, + database: &State, +) -> MyResult> { + user_management(database, None) +} + +fn user_management<'a>( + database: &Database, + flash: Option>, +) -> MyResult> { + // TODO this doesnt scale, pagination! + let users = database.user.iter().collect::, _>>()?; + let flash = flash.map(|f| f.map_err(|e| format!("{e:?}"))); + + Ok(LayoutPage { + title: "User management".to_string(), + content: markup::new! { + h1 { "User Management" } + @FlashDisplay { flash: flash.clone() } + h2 { "All Users" } + ul { @for (_, u) in &users { + li { + a[href=uri!(r_admin_user(&u.name))] { @format!("{:?}", u.display_name) " (" @u.name ")" } + } + }} + }, + ..Default::default() + }) +} + +#[get("/admin/user/")] +pub fn r_admin_user<'a>( + _session: AdminSession, + database: &State, + name: &'a str, +) -> MyResult> { + manage_single_user(database, None, name) +} + +fn manage_single_user<'a>( + database: &Database, + flash: Option>, + name: &'a str, +) -> MyResult> { + // TODO this doesnt scale, pagination! + let user = database + .user + .get(&name.to_string())? + .ok_or(anyhow!("user does not exist"))?; + let flash = flash.map(|f| f.map_err(|e| format!("{e:?}"))); + + Ok(LayoutPage { + title: "User management".to_string(), + content: markup::new! { + h1 { "Manage User" } + @FlashDisplay { flash: flash.clone() } + h2 { @format!("{:?}", user.display_name) " (" @user.name ")" } + form[method="POST", action=uri!(r_admin_remove_user())] { + input[type="text", name="name", value=&user.name, hidden]; + input[type="submit", value="Remove(!)"]; + } + }, + ..Default::default() + }) +} + +#[derive(FromForm)] +pub struct DeleteUser { + name: String, +} + +#[post("/admin/remove_user", data = "")] +pub fn r_admin_remove_user( + session: AdminSession, + database: &State, + form: Form, +) -> MyResult> { + drop(session); + database + .user + .remove(&form.name)? + .ok_or(anyhow!("user did not exist"))?; + user_management(database, Some(Ok("User removed".into()))) +} -- cgit v1.2.3-70-g09d2