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

schema: make user fields non-nullable

Browse Source 
They can always be empty. This simplifies mutation, since graphql_client
doesn't have an easy way to conditionally leave out fields (we could do
that with `@include`, but that's one bool per field in addition to the
field, a bit ugly).
This commit is contained in:
Valentin Tolmer
2021-09-01 09:59:01 +02:00
committed by nitnelave
parent 564c09d6ab
commit 0ac9e134de
8 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/infra/graphql/query.rs
View File

@@ -141,16 +141,16 @@ impl<Handler: BackendHandler + Sync> User<Handler> {
&self.user.email
}
fn display_name(&self) -> Option<&String> {
self.user.display_name.as_ref()
fn display_name(&self) -> &str {
&self.user.display_name
}
fn first_name(&self) -> Option<&String> {
self.user.first_name.as_ref()
fn first_name(&self) -> &str {
&self.user.first_name
}
fn last_name(&self) -> Option<&String> {
self.user.last_name.as_ref()
fn last_name(&self) -> &str {
&self.user.last_name
}
fn creation_date(&self) -> chrono::DateTime<chrono::Utc> {

21
server/src/infra/ldap_handler.rs
View File

@@ -69,12 +69,9 @@ fn get_attribute(user: &User, attribute: &str) -> Result<Vec<String>> {
]),
"uid" => Ok(vec![user.user_id.clone()]),
"mail" => Ok(vec![user.email.clone()]),
"givenName" => Ok(vec![user.first_name.clone().unwrap_or_default()]),
"sn" => Ok(vec![user.last_name.clone().unwrap_or_default()]),
"cn" => Ok(vec![user
.display_name
.clone()
.unwrap_or_else(|| user.user_id.clone())]),
"givenName" => Ok(vec![user.first_name.clone()]),
"sn" => Ok(vec![user.last_name.clone()]),
"cn" => Ok(vec![user.display_name.clone()]),
_ => bail!("Unsupported attribute: {}", attribute),
}
}
@@ -479,17 +476,17 @@ mod tests {
User {
user_id: "bob_1".to_string(),
email: "bob@bobmail.bob".to_string(),
display_name: Some("Bôb Böbberson".to_string()),
first_name: Some("Bôb".to_string()),
last_name: Some("Böbberson".to_string()),
display_name: "Bôb Böbberson".to_string(),
first_name: "Bôb".to_string(),
last_name: "Böbberson".to_string(),
..Default::default()
},
User {
user_id: "jim".to_string(),
email: "jim@cricket.jim".to_string(),
display_name: Some("Jimminy Cricket".to_string()),
first_name: Some("Jim".to_string()),
last_name: Some("Cricket".to_string()),
display_name: "Jimminy Cricket".to_string(),
first_name: "Jim".to_string(),
last_name: "Cricket".to_string(),
..Default::default()
},
])