gandc/lldap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server: Correctly handle removal of the display_name attribute

Browse Source
This commit is contained in:
Valentin Tolmer 2024-10-29 15:26:06 +01:00 committed by nitnelave
parent c8601b9169
commit 35fe521cbe
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/infra/graphql/mutation.rs
View File

@ -265,6 +265,14 @@ impl<Handler: BackendHandler> Mutation<Handler> {
display_name,
attributes: insert_attributes,
} = unpack_attributes(user_insert_attributes, &schema, is_admin)?;
let display_name = display_name.or_else(|| {
// If the display name is not inserted, but removed, reset it.
user.remove_attributes
.iter()
.flatten()
.find(|attr| *attr == "display_name")
.map(|_| String::new())
});
handler
.update_user(UpdateUserRequest {
user_id,
@ -277,7 +285,7 @@ impl<Handler: BackendHandler> Mutation<Handler> {
.remove_attributes
.unwrap_or_default()
.into_iter()
.filter(|attr| attr != "mail") // mail can be sent when editing an admin user
.filter(|attr| attr != "mail" && attr != "display_name")
.map(Into::into)
.collect(),
insert_attributes,