From ae916574de6596c39ca1ac277b3fd33d7afd75b0 Mon Sep 17 00:00:00 2001
From: rustmailer <pollybase@zohomail.com>
Date: Wed, 31 Dec 2025 02:43:57 +0800
Subject: [PATCH] Fix: modifying the admin user

---
 src/modules/users/mod.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/modules/users/mod.rs b/src/modules/users/mod.rs
index 39e0653..c9bb7d3 100644
--- a/src/modules/users/mod.rs
+++ b/src/modules/users/mod.rs
@@ -498,12 +498,15 @@ impl BichonUserV2 {
     pub async fn update(id: u64, request: UserUpdateRequest) -> BichonResult<()> {
         let _ = &request.validate().await?;
         let password_changed = request.password.is_some();
+        //
+        let is_default_admin = id == DEFAULT_ADMIN_USER_ID;
+        let is_valid_admin_roles = matches!(
+            request.global_roles.as_deref(),
+            Some([role]) if *role == DEFAULT_ADMIN_ROLE_ID
+        );
 
-        if DEFAULT_ADMIN_USER_ID == id && request.global_roles.is_some() {
-            return Err(raise_error!(
-                format!("The role assignments for default admin (id={}) are immutable to ensure system accessibility.", id),
-                ErrorCode::Forbidden
-            ));
+        if is_default_admin && !is_valid_admin_roles {
+            return Err(raise_error!(format!("The role assignments for default admin (id={}) are immutable to ensure system accessibility.", id), ErrorCode::Forbidden));
         }
 
         if let Some(username) = &request.username {