From 58efdd2fc657baa82d8e386cab9c21292bc8131f Mon Sep 17 00:00:00 2001 From: Chris Mann Date: Wed, 26 Jul 2023 14:51:03 +0200 Subject: [PATCH] Working on signup workfow --- model-passwd.go | 3 +-- model-user.go | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model-passwd.go b/model-passwd.go index fd8cb6e..f11d8a8 100644 --- a/model-passwd.go +++ b/model-passwd.go @@ -45,8 +45,6 @@ func passwordLost(user User, config *ConfigFile, ldapConn *ldap.Conn) error { searchFilter += ")" searchReq := ldap.NewSearchRequest(config.UserBaseDN, ldap.ScopeSingleLevel, ldap.NeverDerefAliases, 0, 0, false, searchFilter, []string{"cn", "uid", "mail", "carLicense", "sn", "displayName", "givenName"}, nil) searchRes, err := ldapConn.Search(searchReq) - log.Printf("passwordLost search : %v", searchReq) - log.Printf("passwordLost search : %v", searchRes) if err != nil { log.Printf("passwordLost search : %v %v", err, ldapConn) log.Printf("passwordLost search : %v", searchReq) @@ -67,6 +65,7 @@ func passwordLost(user User, config *ConfigFile, ldapConn *ldap.Conn) error { // Préparation du courriel à envoyer user.Password = suggestPassword() code := b64.URLEncoding.EncodeToString([]byte(user.UID + ";" + user.Password)) + user.DN = "uid=" + searchRes.Entries[0].GetAttributeValue("cn") + "," + config.InvitationBaseDN user.UID = searchRes.Entries[0].GetAttributeValue("cn") user.CN = searchRes.Entries[0].GetAttributeValue("cn") diff --git a/model-user.go b/model-user.go index 5d18219..703ef30 100644 --- a/model-user.go +++ b/model-user.go @@ -115,6 +115,7 @@ func add(user User, config *ConfigFile, ldapConn *ldap.Conn) error { // Send the email newUserLdapConn, _ := openNewUserLdap(config) + user.OtherMailbox = "" err = passwordLost(user, config, newUserLdapConn) if err != nil { log.Printf("add User PasswordLost %v", err)