diff options
Diffstat (limited to 'server/src/ui/admin/user.rs')
| -rw-r--r-- | server/src/ui/admin/user.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/server/src/ui/admin/user.rs b/server/src/ui/admin/user.rs index 77bcc71..fb646ab 100644 --- a/server/src/ui/admin/user.rs +++ b/server/src/ui/admin/user.rs @@ -3,7 +3,7 @@ which is licensed under the GNU Affero General Public License (version 3); see /COPYING. Copyright (C) 2025 metamuffin <metamuffin.org> */ -use crate::{database::Database, locale::AcceptLanguage, ui::error::MyResult}; +use crate::{database::Database, helper::A, locale::AcceptLanguage, ui::error::MyResult}; use anyhow::{anyhow, Context}; use jellycommon::user::UserPermission; use jellyimport::is_importing; @@ -17,12 +17,12 @@ use rocket::{form::Form, get, post, response::content::RawHtml, FromForm, FromFo #[get("/admin/users")] pub fn r_admin_users( - session: AdminSession, + session: A<AdminSession>, database: &State<Database>, lang: AcceptLanguage, ) -> MyResult<RawHtml<String>> { let AcceptLanguage(lang) = lang; - let r = admin_users(database, &session)?; + let r = admin_users(database, &session.0)?; Ok(RawHtml(render_page( &AdminUsersPage { flash: None, @@ -32,7 +32,7 @@ pub fn r_admin_users( RenderInfo { importing: is_importing(), session: Some(SessionInfo { - user: session.0.user, + user: session.0 .0.user, }), }, lang, @@ -41,7 +41,7 @@ pub fn r_admin_users( #[get("/admin/user/<name>")] pub fn r_admin_user<'a>( - session: AdminSession, + session: A<AdminSession>, database: &State<Database>, name: &'a str, lang: AcceptLanguage, @@ -60,7 +60,7 @@ pub fn r_admin_user<'a>( RenderInfo { importing: is_importing(), session: Some(SessionInfo { - user: session.0.user, + user: session.0 .0.user, }), }, lang, @@ -82,7 +82,7 @@ pub enum GrantState { #[post("/admin/user/<name>/update_permission", data = "<form>")] pub fn r_admin_user_permission( - session: AdminSession, + session: A<AdminSession>, database: &State<Database>, form: Form<UserPermissionForm>, name: &str, @@ -92,7 +92,7 @@ pub fn r_admin_user_permission( let perm = serde_json::from_str::<UserPermission>(&form.permission) .context("parsing provided permission")?; - database.update_user(&form.name, |user| { + database.update_user(name, |user| { match form.action { GrantState::Grant => drop(user.permissions.0.insert(perm.clone(), true)), GrantState::Revoke => drop(user.permissions.0.insert(perm.clone(), false)), @@ -114,7 +114,7 @@ pub fn r_admin_user_permission( RenderInfo { importing: is_importing(), session: Some(SessionInfo { - user: session.0.user, + user: session.0 .0.user, }), }, lang, @@ -123,7 +123,7 @@ pub fn r_admin_user_permission( #[post("/admin/<name>/remove")] pub fn r_admin_remove_user( - session: AdminSession, + session: A<AdminSession>, database: &State<Database>, name: &str, lang: AcceptLanguage, @@ -132,7 +132,7 @@ pub fn r_admin_remove_user( if !database.delete_user(&name)? { Err(anyhow!("user did not exist"))?; } - let r = admin_users(database, &session)?; + let r = admin_users(database, &session.0)?; Ok(RawHtml(render_page( &AdminUsersPage { @@ -143,7 +143,7 @@ pub fn r_admin_remove_user( RenderInfo { importing: is_importing(), session: Some(SessionInfo { - user: session.0.user, + user: session.0 .0.user, }), }, lang, |