added login and test admin page
This commit is contained in:
@@ -1,6 +1,12 @@
|
||||
package models
|
||||
|
||||
import "fmt"
|
||||
import (
|
||||
"ccsecrets/utils/token"
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
type User struct {
|
||||
UserId int `db:"UserId"`
|
||||
@@ -27,3 +33,69 @@ func (u *User) SaveUser() (*User, error) {
|
||||
|
||||
return u, nil
|
||||
}
|
||||
|
||||
func VerifyPassword(password, hashedPassword string) error {
|
||||
fmt.Printf("VerifyPassword comparing password vs hashed:\n'%s'\n'%s'\n", password, hashedPassword)
|
||||
return bcrypt.CompareHashAndPassword([]byte(hashedPassword), []byte(password))
|
||||
}
|
||||
|
||||
func LoginCheck(username string, password string) (string, error) {
|
||||
|
||||
var err error
|
||||
|
||||
u := User{}
|
||||
|
||||
// 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)
|
||||
|
||||
//err = DB.Model(User{}).Where("username = ?", username).Take(&u).Error
|
||||
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
err = VerifyPassword(password, u.Password)
|
||||
|
||||
if err != nil && err == bcrypt.ErrMismatchedHashAndPassword {
|
||||
fmt.Printf("LoginCheck says password doesn't match stored hash.\n")
|
||||
return "", err
|
||||
} else {
|
||||
fmt.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)
|
||||
return "", err
|
||||
}
|
||||
|
||||
return token, nil
|
||||
|
||||
}
|
||||
|
||||
func GetUserByID(uid uint) (User, error) {
|
||||
|
||||
var u User
|
||||
|
||||
// Query database for matching user object
|
||||
err := db.QueryRowx("SELECT * FROM Users WHERE UserId=?", uid).StructScan(&u)
|
||||
if err != nil {
|
||||
return u, errors.New("user not found")
|
||||
}
|
||||
/*
|
||||
if err := DB.First(&u, uid).Error; err != nil {
|
||||
return u, errors.New("User not found!")
|
||||
}
|
||||
*/
|
||||
u.PrepareGive()
|
||||
|
||||
return u, nil
|
||||
|
||||
}
|
||||
|
||||
func (u *User) PrepareGive() {
|
||||
u.Password = ""
|
||||
}
|
||||
|
Reference in New Issue
Block a user