From b900c74423fff7a60929ecbdbca487187486d160 Mon Sep 17 00:00:00 2001
From: Chris Mann <chris@lesgrandsvoisins.com>
Date: Sat, 22 Jul 2023 08:31:35 +0200
Subject: [PATCH] Factoring the model user and correcting password

---
 login.go      | 4 +++-
 model-user.go | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/login.go b/login.go
index 06fa3eb..ca5e7aa 100644
--- a/login.go
+++ b/login.go
@@ -92,10 +92,12 @@ func checkLogin(w http.ResponseWriter, r *http.Request) *LoginStatus {
 		DN: login_info.DN,
 	}, config, l)
 
+	userEntry := ldapUser.UserEntry
+
 	loginStatus := &LoginStatus{
 		Info:      login_info,
 		conn:      l,
-		UserEntry: ldapUser.UserEntry,
+		UserEntry: userEntry,
 		CanAdmin:  ldapUser.CanAdmin,
 		CanInvite: ldapUser.CanInvite,
 	}
diff --git a/model-user.go b/model-user.go
index ffbec03..6d92186 100644
--- a/model-user.go
+++ b/model-user.go
@@ -47,6 +47,7 @@ func get(user User, config *ConfigFile, ldapConn *ldap.Conn) (*User, error) {
 	if err != nil {
 		return nil, err
 	}
+	userEntry := searchRes.Entries[0]
 	resUser := User{
 		DN:          user.DN,
 		GivenName:   searchRes.Entries[0].GetAttributeValue("givenName"),
@@ -56,7 +57,7 @@ func get(user User, config *ConfigFile, ldapConn *ldap.Conn) (*User, error) {
 		CN:          searchRes.Entries[0].GetAttributeValue("cn"),
 		CanAdmin:    strings.EqualFold(user.DN, config.AdminAccount),
 		CanInvite:   true,
-		UserEntry:   searchRes.Entries[0],
+		UserEntry:   userEntry,
 	}
 	return &resUser, nil
 }