From 3b15caade07e8fbe351fed9aceb3f435bf58368e Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 26 May 2025 18:24:16 +0200 Subject: move all direct database access to logic crate --- logic/src/admin/user.rs | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) (limited to 'logic/src/admin/user.rs') diff --git a/logic/src/admin/user.rs b/logic/src/admin/user.rs index 3ec3852..e277077 100644 --- a/logic/src/admin/user.rs +++ b/logic/src/admin/user.rs @@ -4,14 +4,48 @@ Copyright (C) 2025 metamuffin */ -use crate::session::AdminSession; -use anyhow::Result; -use jellycommon::api::ApiAdminUsersResponse; -use jellydb::Database; +use crate::{DATABASE, session::AdminSession}; +use anyhow::{Result, anyhow}; +use jellycommon::{ + api::ApiAdminUsersResponse, + user::{User, UserPermission}, +}; -pub fn admin_users(db: &Database, _session: &AdminSession) -> Result { +pub fn admin_users(_session: &AdminSession) -> Result { // TODO dont return useless info like passwords Ok(ApiAdminUsersResponse { - users: db.list_users()?, + users: DATABASE.list_users()?, + }) +} +pub fn get_user(_session: &AdminSession, username: &str) -> Result { + DATABASE + .get_user(username)? + .ok_or(anyhow!("user not found")) +} +pub fn delete_user(_session: &AdminSession, username: &str) -> Result<()> { + if !DATABASE.delete_user(&username)? { + Err(anyhow!("user did not exist"))?; + } + Ok(()) +} + +pub enum GrantState { + Grant, + Revoke, + Unset, +} +pub fn update_user_perms( + _session: &AdminSession, + username: &str, + perm: UserPermission, + action: GrantState, +) -> Result<()> { + DATABASE.update_user(username, |user| { + match action { + GrantState::Grant => drop(user.permissions.0.insert(perm.clone(), true)), + GrantState::Revoke => drop(user.permissions.0.insert(perm.clone(), false)), + GrantState::Unset => drop(user.permissions.0.remove(&perm)), + } + Ok(()) }) } -- cgit v1.2.3-70-g09d2