refactor: Enhance permission checks to accept both name and ID for Administrator role

This commit is contained in:
MythEclipse
2025-10-05 19:39:15 +07:00
parent 3dde67a4ac
commit b27e4a4404
2 changed files with 11 additions and 6 deletions
@@ -46,8 +46,11 @@ pub async fn permissions_guard(
// Check permissions from database
let user_permissions: Vec<String> = user.role.permissions.as_ref().unwrap_or(&vec![]).iter().filter_map(|p| p.as_ref().and_then(|pp| pp.name.clone())).collect();
// If user has Administrator permission, allow all
if user_permissions.contains(&"Administrator".to_string()) {
// If user has Administrator permission, allow all.
// Accept either the permission name or the canonical permission id.
let admin_name = PermissionsEnum::Administrator.to_string();
let admin_id = PermissionsEnum::Administrator.id();
if user_permissions.contains(&admin_name) || user_permissions.contains(&admin_id) {
return Ok((claims, state));
}
@@ -89,10 +89,12 @@ where
}
};
let user_permissions: Vec<String> =
user.role.permissions.as_ref().unwrap_or(&vec![]).iter().filter_map(|p| p.as_ref().and_then(|pp| pp.name.clone())).collect();
// Check if user has Administrator permission - if yes, allow access to everything
let has_administrator_permission = user_permissions.contains(&PermissionsEnum::Administrator.to_string());
user.role.permissions.as_ref().unwrap_or(&vec![]).iter().filter_map(|p| p.as_ref().and_then(|pp| pp.name.clone())).collect();
// Check if user has Administrator permission - accept either the permission name or the well-known id
let admin_name = PermissionsEnum::Administrator.to_string();
let admin_id = PermissionsEnum::Administrator.id();
let has_administrator_permission = user_permissions.contains(&admin_name) || user_permissions.contains(&admin_id);
let allowed = has_administrator_permission || permissions
.iter()
.all(|p| user_permissions.contains(&p.to_string()));