From b319421c1f57690ec8dba7826c037353f119e481 Mon Sep 17 00:00:00 2001 From: Fabien Le Frapper Date: Tue, 25 Mar 2025 11:50:44 +0100 Subject: [PATCH] Do not render a different view when user is found --- main.go | 9 +++------ templates/login.html | 10 ++-------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/main.go b/main.go index e1b0eb8..f327b8b 100644 --- a/main.go +++ b/main.go @@ -237,8 +237,6 @@ func handleLogout(w http.ResponseWriter, r *http.Request) { // --- Login Controller --- type LoginFormData struct { Username string - WrongUser bool - WrongPass bool ErrorMessage string } @@ -266,10 +264,9 @@ func handleLogin(w http.ResponseWriter, r *http.Request) { data := &LoginFormData{ Username: username, } - if ldap.IsErrorWithCode(err, ldap.LDAPResultInvalidCredentials) { - data.WrongPass = true - } else if ldap.IsErrorWithCode(err, ldap.LDAPResultNoSuchObject) { - data.WrongUser = true + if ldap.IsErrorWithCode(err, ldap.LDAPResultInvalidCredentials) || + ldap.IsErrorWithCode(err, ldap.LDAPResultNoSuchObject) { + data.ErrorMessage = "Le mot de passe et identifiant ne correspondent pas." } else { data.ErrorMessage = err.Error() } diff --git a/templates/login.html b/templates/login.html index 84742e1..e35684b 100644 --- a/templates/login.html +++ b/templates/login.html @@ -4,15 +4,9 @@

S'identifier

- {{if .WrongUser}} -
Identifiant invalide.
- {{end}} - {{if .WrongPass}} -
Mot de passe invalide.
- {{end}} - {{if .ErrorMessage}} + {{ with .ErrorMessage}}
Impossible de se connecter. -
{{ .ErrorMessage }}
+
{{ . }}
{{end}}