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

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

Browse Source
This commit is contained in:
Nathan Coad
2024-01-19 10:40:27 +11:00
parent 116a9e827b
commit 317e0ab83d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
models/user.go
View File

@@ -50,12 +50,16 @@ func (u *User) SaveUser() (*User, error) {
var err error var err error
if u.LastLogin.IsZero() {
u.LastLogin = time.Time{}
}
// Validate username not already in use // Validate username not already in use
_, err = UserGetByName(u.UserName) _, err = UserGetByName(u.UserName)
if err != nil && err.Error() == "user not found" { if err != nil && err.Error() == "user not found" {
log.Printf("SaveUser confirmed no existing user, continuing with creation of user '%s'\n", u.UserName) log.Printf("SaveUser confirmed no existing user, continuing with creation of user '%s'\n", u.UserName)
//log.Printf("u: %v\n", u) //log.Printf("u: %v\n", u)
result, err := db.NamedExec((`INSERT INTO users (GroupId, UserName, Password, LdapUser, Admin) VALUES (:GroupId, :UserName, :Password, :LdapUser, :Admin)`), u) result, err := db.NamedExec((`INSERT INTO users (GroupId, UserName, Password, LdapUser, Admin, LastLogin) VALUES (:GroupId, :UserName, :Password, :LdapUser, :Admin, :LastLogin)`), u)
if err != nil { if err != nil {
log.Printf("SaveUser error executing sql record : '%s'\n", err) log.Printf("SaveUser error executing sql record : '%s'\n", err)
@@ -474,7 +478,7 @@ func UserList() ([]User, error) {
rows, err := db.Queryx("SELECT * FROM users") rows, err := db.Queryx("SELECT * FROM users")
if err != nil { if err != nil {
log.Printf("QueryUsers error executing sql record : '%s'\n", err) log.Printf("UserList error executing sql record : '%s'\n", err)
return results, err return results, err
} else { } else {
// parse all the results into a slice // parse all the results into a slice
@@ -482,13 +486,13 @@ func UserList() ([]User, error) {
var u User var u User
err = rows.StructScan(&u) err = rows.StructScan(&u)
if err != nil { if err != nil {
log.Printf("QueryUsers error parsing sql record : '%s'\n", err) log.Printf("UserList error parsing sql record : '%s'\n", err)
return results, err return results, err
} }
results = append(results, u) results = append(results, u)
} }
log.Printf("QueryUsers retrieved '%d' results\n", len(results)) log.Printf("UserList retrieved '%d' results\n", len(results))
} }
return results, nil return results, nil