From 63cfe1fd8dbbf0f07214a88d13d7e0cc08a11a0e Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Fri, 5 Jan 2024 10:19:46 +1100 Subject: [PATCH] try again --- models/user.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index a433653..e89e7ae 100644 --- a/models/user.go +++ b/models/user.go @@ -101,7 +101,6 @@ func LoginCheck(username string, password string) (string, error) { errString := fmt.Sprintf("LoginCheck error checking LDAP for user : '%s'\n", err) log.Print(errString) return "", errors.New(errString) - } if ldapUser == (User{}) { @@ -109,6 +108,7 @@ func LoginCheck(username string, password string) (string, error) { log.Print(errString) return "", errors.New(errString) } else { + log.Printf("LoginCheck verified LDAP user successfully\n") u = ldapUser } } else { @@ -120,6 +120,8 @@ func LoginCheck(username string, password string) (string, error) { log.Printf("LoginCheck retrieved user '%v' from database\n", u) } + log.Printf("u: %v\n", u) + if !u.LdapUser { err = VerifyPassword(password, u.Password) @@ -131,6 +133,8 @@ func LoginCheck(username string, password string) (string, error) { } } else { log.Printf("LoginCheck no need to verify password in database for LDAP user\n") + + // TODO - verify LDAP credentials if this LDAP user was previously stored in the database } token, err := token.GenerateToken(uint(u.UserId))