Respect some config values (#175)

* Respect create_default_peer in config

* Respect user_identifier in LDAP field map
This commit is contained in:
Ruoxi Wang 2023-10-20 04:54:51 +08:00 committed by GitHub
parent 4c061a1aa9
commit 66aadf9d42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

View File

@ -46,10 +46,12 @@ func (m Manager) connectToMessageBus() {
func (m Manager) handleUserCreationEvent(user *domain.User) { func (m Manager) handleUserCreationEvent(user *domain.User) {
logrus.Errorf("handling new user event for %s", user.Identifier) logrus.Errorf("handling new user event for %s", user.Identifier)
err := m.CreateDefaultPeer(context.Background(), user) if m.cfg.Core.CreateDefaultPeer {
if err != nil { err := m.CreateDefaultPeer(context.Background(), user)
logrus.Errorf("failed to create default peer for %s: %v", user.Identifier, err) if err != nil {
return logrus.Errorf("failed to create default peer for %s: %v", user.Identifier, err)
return
}
} }
} }

View File

@ -84,7 +84,7 @@ func LdapConvertEntries(sr *ldap.SearchResult, fields *config.LdapFields) []RawL
for i, entry := range sr.Entries { for i, entry := range sr.Entries {
userData := make(RawLdapUser) userData := make(RawLdapUser)
userData[fields.UserIdentifier] = entry.DN userData[fields.UserIdentifier] = entry.GetAttributeValue(fields.UserIdentifier)
userData[fields.Email] = entry.GetAttributeValue(fields.Email) userData[fields.Email] = entry.GetAttributeValue(fields.Email)
userData[fields.Firstname] = entry.GetAttributeValue(fields.Firstname) userData[fields.Firstname] = entry.GetAttributeValue(fields.Firstname)
userData[fields.Lastname] = entry.GetAttributeValue(fields.Lastname) userData[fields.Lastname] = entry.GetAttributeValue(fields.Lastname)