From 5ca2555b765405bfa80afeeca44b9e0edc9e4d53 Mon Sep 17 00:00:00 2001
From: Chris Mann <chris@lesgrandsvoisins.com>
Date: Sat, 22 Jul 2023 13:20:40 +0200
Subject: [PATCH] Factoring the model user and correcting password

---
 invite.go                         | 6 +++---
 templates/invite_new_account.html | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/invite.go b/invite.go
index e554f94..6585938 100644
--- a/invite.go
+++ b/invite.go
@@ -151,13 +151,13 @@ func handleNewAccount(w http.ResponseWriter, r *http.Request, l *ldap.Conn, invi
 		newUser := User{}
 		// login := checkLogin(w, r)
 
-		newUser.CN = fmt.Sprintf("%s@%s", strings.TrimSpace(strings.Join(r.Form["username"], "")), "lesgv.com")
+		// newUser.Mail = fmt.Sprintf("%s@%s", strings.TrimSpace(strings.Join(r.Form["username"], "")), "lesgv.com")
 		newUser.DisplayName = strings.TrimSpace(strings.Join(r.Form["displayname"], ""))
 		newUser.GivenName = strings.TrimSpace(strings.Join(r.Form["givenname"], ""))
 		newUser.SN = strings.TrimSpace(strings.Join(r.Form["surname"], ""))
-		newUser.UID = strings.TrimSpace(strings.Join(r.Form["username"], ""))
-		newUser.OtherMailbox = strings.TrimSpace(strings.Join(r.Form["otherMailbox"], ""))
 		newUser.Mail = strings.TrimSpace(strings.Join(r.Form["mail"], ""))
+		newUser.UID = strings.TrimSpace(strings.Join(r.Form["username"], ""))
+		newUser.CN = strings.TrimSpace(strings.Join(r.Form["otherMailbox"], ""))
 		newUser.DN = "cn=" + newUser.CN + "," + config.InvitationBaseDN
 
 		password1 := strings.Join(r.Form["password"], "")
diff --git a/templates/invite_new_account.html b/templates/invite_new_account.html
index ca3ba1b..0e89a41 100644
--- a/templates/invite_new_account.html
+++ b/templates/invite_new_account.html
@@ -31,8 +31,8 @@
     <input type="text" id="surname" name="surname" class="form-control" value="{{ .Surname }}" />
   </div>
   <div class="form-group">
-    <label for="mail">Email de secours:</label>
-    <input type="text" id="othermailbox" name="othermailbox" class="form-control" value="{{ .OtherMailbox }}" />
+    <label for="cn">Email de secours:</label>
+    <input type="text" id="cn" name="cn" class="form-control" value="{{ .CN }}" />
     <small class="form-text text-muted">
       Le courriel de l'utilisateur.
     </small>
@@ -42,7 +42,7 @@
     <input type="text" id="displayname" name="displayname" class="form-control" value="{{ .DisplayName }}" />
   </div>
   <div class="form-group">
-    <label for="username">Identifiant souhaité :</label>
+    <label for="username">Identifiant :</label>
     <input type="text" id="username" name="username" class="form-control" value="{{ .Username }}" />
     <small class="form-text text-muted">
       Votre identifiant doit être en minuscule.