fix ldap sync for disabled users, check if admin username is an email address, rename username to email

This commit is contained in:
Christoph Haas
2021-02-26 23:43:29 +01:00
parent 5bc3aa0036
commit e1c7a43496
4 changed files with 15 additions and 9 deletions

View File

@@ -93,16 +93,16 @@ func (s *Server) SyncLdapWithUserDatabase() {
}
}
if err = s.users.UpdateUser(user); err != nil {
logrus.Errorf("failed to update ldap user %s in database: %v", user.Email, err)
continue
}
if ldapDeactivated {
if err = s.users.DeleteUser(user); err != nil {
logrus.Errorf("failed to delete deactivated user %s in database: %v", user.Email, err)
continue
}
} else {
if err = s.users.UpdateUser(user); err != nil {
logrus.Errorf("failed to update ldap user %s in database: %v", user.Email, err)
continue
}
}
}
}