cleanup: rename token_user into auth_id_filter

This commit is contained in:
Dietmar Maurer 2021-03-05 08:36:18 +01:00
parent 6b303323be
commit cf90a369e2

View File

@ -15,19 +15,19 @@ fn extract_acl_node_data(
path: &str, path: &str,
list: &mut Vec<AclListItem>, list: &mut Vec<AclListItem>,
exact: bool, exact: bool,
token_user: &Option<Authid>, auth_id_filter: &Option<Authid>,
) { ) {
// tokens can't have tokens, so we can early return // tokens can't have tokens, so we can early return
if let Some(token_user) = token_user { if let Some(auth_id_filter) = auth_id_filter {
if token_user.is_token() { if auth_id_filter.is_token() {
return; return;
} }
} }
for (user, roles) in &node.users { for (user, roles) in &node.users {
if let Some(token_user) = token_user { if let Some(auth_id_filter) = auth_id_filter {
if !user.is_token() if !user.is_token()
|| user.user() != token_user.user() { || user.user() != auth_id_filter.user() {
continue; continue;
} }
} }
@ -43,7 +43,7 @@ fn extract_acl_node_data(
} }
} }
for (group, roles) in &node.groups { for (group, roles) in &node.groups {
if token_user.is_some() { if auth_id_filter.is_some() {
continue; continue;
} }
@ -62,7 +62,7 @@ fn extract_acl_node_data(
} }
for (comp, child) in &node.children { for (comp, child) in &node.children {
let new_path = format!("{}/{}", path, comp); let new_path = format!("{}/{}", path, comp);
extract_acl_node_data(child, &new_path, list, exact, token_user); extract_acl_node_data(child, &new_path, list, exact, auth_id_filter);
} }
} }