vividboarder
/
bitwarden_rs_ldap
mirror of https://github.com/ViViDboarder/bitwarden_rs_ldap.git
1
0
Fork 0
Code Issues Releases Wiki Activity

WIP: Update for key error

This commit is contained in:
Ian 2019-10-02 13:02:51 -07:00
parent 829ed5585c
commit e962a4bbca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/config.rs
View File

@ -131,10 +131,9 @@ impl Config {
}
pub fn get_ldap_mail_field(&self) -> String {
let default = String::from("mail");
match &self.ldap_mail_field {
Some(mail_field) => mail_field.clone(),
None => default.clone(),
None => String::from("mail").clone(),
}
}

3
src/main.rs
View File

@ -114,7 +114,8 @@ fn invite_from_ldap(
let mail_field = config.get_ldap_mail_field();
let mut num_users = 0;
for ldap_user in search_entries(config)? {
if let Some(user_email) = ldap_user.attrs[mail_field.as_str()].first() {
// Safely get first email from list of emails in field
if let Some(user_email) = ldap_user.attrs.get(mail_field.as_str()).and_then(|l| (l.first())) {
if existing_users.contains(user_email) {
println!("User with email already exists: {}", user_email);
} else {