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

change to use logging instead of print to stdout

Browse Source
This commit is contained in:
Nathan Coad
2023-04-03 12:00:01 +10:00
parent f2ac6097d6
commit 5cc67501d3
11 changed files with 88 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
models/user.go
View File

@@ -3,7 +3,7 @@ package models
import (
"ccsecrets/utils/token"
"errors"
"fmt"
"log"
"net/http"
"github.com/gin-gonic/gin"
@@ -33,19 +33,19 @@ func (u *User) SaveUser() (*User, error) {
result, err := db.NamedExec((`INSERT INTO users (RoleId, UserName, Password) VALUES (:RoleId, :UserName, :Password)`), u)
if err != nil {
fmt.Printf("SaveUser error executing sql record : '%s'\n", err)
log.Printf("SaveUser error executing sql record : '%s'\n", err)
return &User{}, err
} else {
affected, _ := result.RowsAffected()
id, _ := result.LastInsertId()
fmt.Printf("SaveUser insert returned result id '%d' affecting %d row(s).\n", id, affected)
log.Printf("SaveUser insert returned result id '%d' affecting %d row(s).\n", id, affected)
}
return u, nil
}
func VerifyPassword(password, hashedPassword string) error {
fmt.Printf("VerifyPassword comparing password vs hashed:\n'%s'\n'%s'\n", password, hashedPassword)
log.Printf("VerifyPassword comparing password vs hashed:\n'%s'\n'%s'\n", password, hashedPassword)
return bcrypt.CompareHashAndPassword([]byte(hashedPassword), []byte(password))
}
@@ -58,7 +58,7 @@ func LoginCheck(username string, password string) (string, error) {
// Query database for matching user object
err = db.QueryRowx("SELECT * FROM Users WHERE Username=?", username).StructScan(&u)
fmt.Printf("LoginCheck retrieved user '%v' from database\n", u)
log.Printf("LoginCheck retrieved user '%v' from database\n", u)
if err != nil {
return "", err
@@ -67,16 +67,16 @@ func LoginCheck(username string, password string) (string, error) {
err = VerifyPassword(password, u.Password)
if err != nil && err == bcrypt.ErrMismatchedHashAndPassword {
fmt.Printf("LoginCheck says password doesn't match stored hash.\n")
log.Printf("LoginCheck says password doesn't match stored hash.\n")
return "", err
} else {
fmt.Printf("LoginCheck verified password against stored hash.\n")
log.Printf("LoginCheck verified password against stored hash.\n")
}
token, err := token.GenerateToken(uint(u.UserId))
if err != nil {
fmt.Printf("LoginCheck error generating token : '%s'\n", err)
log.Printf("LoginCheck error generating token : '%s'\n", err)
return "", err
}
@@ -122,10 +122,10 @@ func GetUserRoleByID(uid uint) (UserRole, error) {
var ur UserRole
// Query database for matching user object
fmt.Printf("GetUserRoleByID querying for userid '%d'\n", uid)
log.Printf("GetUserRoleByID querying for userid '%d'\n", uid)
err := db.QueryRowx("SELECT users.UserId, users.RoleId, users.UserName, users.Password, roles.RoleName, roles.ReadOnly, roles.Admin FROM users INNER JOIN roles ON users.RoleId = roles.RoleId WHERE users.UserId=?", uid).StructScan(&ur)
if err != nil {
fmt.Printf("GetUserRoleByID received error when querying database : '%s'\n", err)
log.Printf("GetUserRoleByID received error when querying database : '%s'\n", err)
return ur, errors.New("GetUserRoleByID user not found")
}
@@ -144,10 +144,10 @@ func GetUserRoleFromToken(c *gin.Context) (UserRole, error) {
}
// Query database for matching user object
fmt.Printf("GetUserRoleFromToken querying for userid '%d'\n", user_id)
log.Printf("GetUserRoleFromToken querying for userid '%d'\n", user_id)
err = db.QueryRowx("SELECT users.UserId, users.RoleId, users.UserName, users.Password, roles.RoleName, roles.ReadOnly, roles.Admin FROM users INNER JOIN roles ON users.RoleId = roles.RoleId WHERE users.UserId=?", user_id).StructScan(&ur)
if err != nil {
fmt.Printf("GetUserRoleFromToken received error when querying database : '%s'\n", err)
log.Printf("GetUserRoleFromToken received error when querying database : '%s'\n", err)
return ur, errors.New("GetUserRoleFromToken user not found")
}