From 7c9faf93bb7e9abf65a39435083728c61712fac7 Mon Sep 17 00:00:00 2001
From: Chris Mann <chris@lesgrandsvoisins.com>
Date: Fri, 21 Jul 2023 10:26:35 +0200
Subject: [PATCH] Implementing Activate User

---
 login.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/login.go b/login.go
index 5515b3b..4e989b8 100644
--- a/login.go
+++ b/login.go
@@ -213,8 +213,8 @@ func handleLogin(w http.ResponseWriter, r *http.Request) *LoginInfo {
 		if strings.EqualFold(username, config.AdminAccount) {
 			user_dn = username
 		}
-		loginInfo := doLogin(w, r, username, user_dn, password)
-		return &loginInfo
+		_, loginInfo := doLogin(w, r, username, user_dn, password)
+		return loginInfo
 
 	} else {
 		http.Error(w, "Unsupported method", http.StatusBadRequest)
@@ -222,11 +222,11 @@ func handleLogin(w http.ResponseWriter, r *http.Request) *LoginInfo {
 	}
 }
 
-func doLogin(w http.ResponseWriter, r *http.Request, username string, user_dn string, password string) LoginInfo {
+func doLogin(w http.ResponseWriter, r *http.Request, username string, user_dn string, password string) (error, *LoginInfo) {
 	l := ldapOpen(w)
-	if l == nil {
-		return nil
-	}
+	// if l == nil {
+	// 	return nil, nil
+	// }
 
 	err := l.Bind(user_dn, password)
 	if err == nil {
@@ -242,7 +242,7 @@ func doLogin(w http.ResponseWriter, r *http.Request, username string, user_dn st
 			data.ErrorMessage = err.Error()
 		}
 		templateLogin.Execute(w, data)
-		return nil
+		return err, nil
 	}
 
 	// Successfully logged in, save it to session
@@ -258,10 +258,10 @@ func doLogin(w http.ResponseWriter, r *http.Request, username string, user_dn st
 	err = session.Save(r, w)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return nil
+		return err, nil
 	}
 
-	return LoginInfo{
+	return nil, &LoginInfo{
 		DN:       user_dn,
 		Username: username,
 		Password: password,