diff --git a/model-user.go b/model-user.go index 2109168..6c22903 100644 --- a/model-user.go +++ b/model-user.go @@ -39,17 +39,18 @@ func get(user User, config *ConfigFile, ldapConn *ldap.Conn) (*User, error) { } userEntry := searchRes.Entries[0] resUser := User{ - DN: user.DN, - GivenName: searchRes.Entries[0].GetAttributeValue("givenName"), - DisplayName: searchRes.Entries[0].GetAttributeValue("displayName"), - Description: searchRes.Entries[0].GetAttributeValue("description"), - SN: searchRes.Entries[0].GetAttributeValue("sn"), - UID: searchRes.Entries[0].GetAttributeValue("uid"), - CN: searchRes.Entries[0].GetAttributeValue("cn"), - Mail: searchRes.Entries[0].GetAttributeValue("mail"), - CanAdmin: strings.EqualFold(user.DN, config.AdminAccount), - CanInvite: true, - UserEntry: userEntry, + DN: user.DN, + GivenName: searchRes.Entries[0].GetAttributeValue("givenName"), + DisplayName: searchRes.Entries[0].GetAttributeValue("displayName"), + Description: searchRes.Entries[0].GetAttributeValue("description"), + SN: searchRes.Entries[0].GetAttributeValue("sn"), + UID: searchRes.Entries[0].GetAttributeValue("uid"), + CN: searchRes.Entries[0].GetAttributeValue("cn"), + Mail: searchRes.Entries[0].GetAttributeValue("mail"), + OtherMailbox: searchRes.Entries[0].GetAttributeValue("carLicense"), + CanAdmin: strings.EqualFold(user.DN, config.AdminAccount), + CanInvite: true, + UserEntry: userEntry, } searchReq.BaseDN = config.GroupCanAdmin searchReq.Filter = "(member=" + user.DN + ")" diff --git a/utils.go b/utils.go index d8dbdeb..6df0e42 100644 --- a/utils.go +++ b/utils.go @@ -61,7 +61,7 @@ func sendMail(sendMailTplData SendMailTplData) error { message := buf.Bytes() auth := smtp.PlainAuth("", config.SMTPUsername, config.SMTPPassword, config.SMTPServer) log.Printf("auth: %v", auth) - err = smtp.SendMail(config.SMTPServer+":587", auth, config.SMTPUsername, []string{user.OtherMailbox}, message) + err = smtp.SendMail(config.SMTPServer+":587", auth, config.SMTPUsername, []string{sendMailTplData.To}, message) if err != nil { log.Printf("email send error %v", err) return err