nathan/smt
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 2 Wiki Activity

try again
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nathan Coad
2024-01-05 10:19:46 +11:00
parent b51468db8c
commit 63cfe1fd8d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
models/user.go
View File

@@ -101,7 +101,6 @@ func LoginCheck(username string, password string) (string, error) {
errString := fmt.Sprintf("LoginCheck error checking LDAP for user : '%s'\n", err) errString := fmt.Sprintf("LoginCheck error checking LDAP for user : '%s'\n", err)
log.Print(errString) log.Print(errString)
return "", errors.New(errString) return "", errors.New(errString)
} }
if ldapUser == (User{}) { if ldapUser == (User{}) {
@@ -109,6 +108,7 @@ func LoginCheck(username string, password string) (string, error) {
log.Print(errString) log.Print(errString)
return "", errors.New(errString) return "", errors.New(errString)
} else { } else {
log.Printf("LoginCheck verified LDAP user successfully\n")
u = ldapUser u = ldapUser
} }
} else { } 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("LoginCheck retrieved user '%v' from database\n", u)
} }
log.Printf("u: %v\n", u)
if !u.LdapUser { if !u.LdapUser {
err = VerifyPassword(password, u.Password) err = VerifyPassword(password, u.Password)
@@ -131,6 +133,8 @@ func LoginCheck(username string, password string) (string, error) {
} }
} else { } else {
log.Printf("LoginCheck no need to verify password in database for LDAP user\n") 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)) token, err := token.GenerateToken(uint(u.UserId))