From 8729b5a2943f44ce2bf30ccec599d337eca456a1 Mon Sep 17 00:00:00 2001 From: JSR Date: Wed, 18 Mar 2026 17:56:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E5=A4=8D=20sender?= =?UTF-8?q?=5Fid=20=E4=B8=BA=E7=A9=BA=E6=97=B6=E6=9D=83=E9=99=90=E8=AF=AF?= =?UTF-8?q?=E5=88=A4=E5=AF=BC=E8=87=B4=E7=9A=84=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=A2=AB=E6=8B=92=E7=BB=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-tauri/src/commands/auth.rs | 10 +++++----- src-tauri/src/commands/auto_score.rs | 7 ++----- src-tauri/src/commands/reason.rs | 7 ++----- src-tauri/src/commands/settings.rs | 14 ++++---------- src-tauri/src/commands/student.rs | 14 ++++---------- src-tauri/src/commands/tag.rs | 14 ++++---------- src-tauri/src/commands/theme.rs | 7 ++----- 7 files changed, 23 insertions(+), 50 deletions(-) diff --git a/src-tauri/src/commands/auth.rs b/src-tauri/src/commands/auth.rs index bdcfb63..2391b2e 100644 --- a/src-tauri/src/commands/auth.rs +++ b/src-tauri/src/commands/auth.rs @@ -61,7 +61,7 @@ pub async fn auth_login( sender_id: Option, state: State<'_, Arc>>, ) -> Result, String> { - let sender = sender_id.ok_or("Invalid sender")?; + let sender = sender_id.unwrap_or(0); let iv_hex = get_iv_hex(); @@ -122,7 +122,7 @@ pub async fn auth_set_passwords( sender_id: Option, state: State<'_, Arc>>, ) -> Result, String> { - let sender = sender_id.ok_or("Invalid sender")?; + let sender = sender_id.unwrap_or(0); let iv_hex = get_iv_hex(); @@ -166,7 +166,7 @@ pub async fn auth_generate_recovery( sender_id: Option, state: State<'_, Arc>>, ) -> Result, String> { - let sender = sender_id.ok_or("Invalid sender")?; + let sender = sender_id.unwrap_or(0); let iv_hex = get_iv_hex(); @@ -199,7 +199,7 @@ pub async fn auth_reset_by_recovery( sender_id: Option, state: State<'_, Arc>>, ) -> Result, String> { - let sender = sender_id.ok_or("Invalid sender")?; + let sender = sender_id.unwrap_or(0); let iv_hex = get_iv_hex(); @@ -238,7 +238,7 @@ pub async fn auth_clear_all( sender_id: Option, state: State<'_, Arc>>, ) -> Result, String> { - let sender = sender_id.ok_or("Invalid sender")?; + let sender = sender_id.unwrap_or(0); let result = { let state_guard = state.read(); diff --git a/src-tauri/src/commands/auto_score.rs b/src-tauri/src/commands/auto_score.rs index c7d584c..ee0d00f 100644 --- a/src-tauri/src/commands/auto_score.rs +++ b/src-tauri/src/commands/auto_score.rs @@ -14,11 +14,8 @@ fn check_admin_permission( permissions: &mut crate::services::PermissionService, sender_id: Option, ) -> bool { - if let Some(id) = sender_id { - permissions.require_permission(id, PermissionLevel::Admin) - } else { - false - } + let id = sender_id.unwrap_or(0); + permissions.require_permission(id, PermissionLevel::Admin) } #[derive(Debug, Clone, Serialize, Deserialize)] diff --git a/src-tauri/src/commands/reason.rs b/src-tauri/src/commands/reason.rs index ff8c730..fb9a84e 100644 --- a/src-tauri/src/commands/reason.rs +++ b/src-tauri/src/commands/reason.rs @@ -42,11 +42,8 @@ pub struct DeleteResult { fn check_admin_permission(state: &Arc>, sender_id: Option) -> bool { let state_guard = state.read(); let mut permissions = state_guard.permissions.write(); - if let Some(id) = sender_id { - permissions.require_permission(id, PermissionLevel::Admin) - } else { - false - } + let id = sender_id.unwrap_or(0); + permissions.require_permission(id, PermissionLevel::Admin) } #[tauri::command] diff --git a/src-tauri/src/commands/settings.rs b/src-tauri/src/commands/settings.rs index 65a3606..c5c5460 100644 --- a/src-tauri/src/commands/settings.rs +++ b/src-tauri/src/commands/settings.rs @@ -38,18 +38,12 @@ fn check_write_permission( match requirement { PermissionRequirement::Any => true, PermissionRequirement::Admin => { - if let Some(id) = sender_id { - permissions.require_permission(id, PermissionLevel::Admin) - } else { - false - } + let id = sender_id.unwrap_or(0); + permissions.require_permission(id, PermissionLevel::Admin) } PermissionRequirement::Points => { - if let Some(id) = sender_id { - permissions.require_permission(id, PermissionLevel::Points) - } else { - false - } + let id = sender_id.unwrap_or(0); + permissions.require_permission(id, PermissionLevel::Points) } PermissionRequirement::View => true, } diff --git a/src-tauri/src/commands/student.rs b/src-tauri/src/commands/student.rs index b7774e5..efc6223 100644 --- a/src-tauri/src/commands/student.rs +++ b/src-tauri/src/commands/student.rs @@ -26,21 +26,15 @@ pub struct ImportStudentsParams { fn check_admin_permission(state: &Arc>, sender_id: Option) -> bool { let state_guard = state.read(); let mut permissions = state_guard.permissions.write(); - if let Some(id) = sender_id { - permissions.require_permission(id, PermissionLevel::Admin) - } else { - false - } + let id = sender_id.unwrap_or(0); + permissions.require_permission(id, PermissionLevel::Admin) } fn check_view_permission(state: &Arc>, sender_id: Option) -> bool { let state_guard = state.read(); let mut permissions = state_guard.permissions.write(); - if let Some(id) = sender_id { - permissions.require_permission(id, PermissionLevel::View) - } else { - false - } + let id = sender_id.unwrap_or(0); + permissions.require_permission(id, PermissionLevel::View) } #[tauri::command] diff --git a/src-tauri/src/commands/tag.rs b/src-tauri/src/commands/tag.rs index 7a13c8c..bfbbea2 100644 --- a/src-tauri/src/commands/tag.rs +++ b/src-tauri/src/commands/tag.rs @@ -14,21 +14,15 @@ use super::response::{IpcResponse, TagResponse}; fn check_admin_permission(state: &Arc>, sender_id: Option) -> bool { let state_guard = state.read(); let mut permissions = state_guard.permissions.write(); - if let Some(id) = sender_id { - permissions.require_permission(id, PermissionLevel::Admin) - } else { - false - } + let id = sender_id.unwrap_or(0); + permissions.require_permission(id, PermissionLevel::Admin) } fn check_view_permission(state: &Arc>, sender_id: Option) -> bool { let state_guard = state.read(); let mut permissions = state_guard.permissions.write(); - if let Some(id) = sender_id { - permissions.require_permission(id, PermissionLevel::View) - } else { - false - } + let id = sender_id.unwrap_or(0); + permissions.require_permission(id, PermissionLevel::View) } #[tauri::command] diff --git a/src-tauri/src/commands/theme.rs b/src-tauri/src/commands/theme.rs index f8573d7..7f18d78 100644 --- a/src-tauri/src/commands/theme.rs +++ b/src-tauri/src/commands/theme.rs @@ -11,11 +11,8 @@ fn check_admin_permission( permissions: &mut crate::services::PermissionService, sender_id: Option, ) -> bool { - if let Some(id) = sender_id { - permissions.require_permission(id, PermissionLevel::Admin) - } else { - false - } + let id = sender_id.unwrap_or(0); + permissions.require_permission(id, PermissionLevel::Admin) } #[tauri::command]