ADD: card component and login behavior

This commit is contained in:
hwinkel
2025-12-16 23:14:40 +01:00
parent 435ad8e6e6
commit f4eb2efb33
16 changed files with 361 additions and 87 deletions

View File

@@ -2,6 +2,7 @@ package user
import (
"database/sql"
"studia/internal/logger"
"time"
"golang.org/x/crypto/bcrypt"
@@ -10,7 +11,7 @@ import (
type User struct {
ID string `json:"id"`
Email string `json:"email"`
Name string `json:"name"`
Username string `json:"username"`
PasswordHash string `json:"-"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
@@ -28,26 +29,33 @@ type User struct {
// }
func GetUserByEmail(db *sql.DB, email string) (*User, error) {
row := db.QueryRow("SELECT id, email, password_hash, role FROM users WHERE email=$1", email)
row := db.QueryRow("SELECT id, email, username FROM users WHERE email=$1", email)
var user User
err := row.Scan(&user.ID, &user.Email, &user.PasswordHash, &user.Role)
err := row.Scan(&user.ID, &user.Email, &user.Username)
if err != nil {
return nil, err
}
return &user, nil
}
func CheckPasswordHash(db *sql.DB, email string, password string) bool {
func CheckPasswordHash(db *sql.DB, email string, password string) error {
row := db.QueryRow("SELECT password_hash FROM users WHERE email=$1", email)
var hash string
var hash []byte
if err := row.Scan(&hash); err != nil {
return false
return err
}
UserPasswordHash, error := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
if error != nil {
return false
UserPasswordHash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
if err != nil {
return err
}
return bcrypt.CompareHashAndPassword([]byte(hash), []byte(UserPasswordHash)) == nil
logger.Log.Info().Msgf("UserPasswordHash: %s", UserPasswordHash)
logger.Log.Info().Msgf("hash: %s", hash)
logger.Log.Info().Msgf("password: %s", []byte(password))
logger.Log.Info().Msgf("email: %s", []byte(email))
err = bcrypt.CompareHashAndPassword(hash, []byte(password))
return err
}
func CreateUser(db *sql.DB, email string, name string, password string, role []string) error {
@@ -56,7 +64,7 @@ func CreateUser(db *sql.DB, email string, name string, password string, role []s
return err
}
_, err = db.Exec("INSERT INTO users (email, name, password_hash, role, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6)",
email, name, string(passwordHash), role, time.Now(), time.Now())
_, err = db.Exec("INSERT INTO users (email, username, password_hash) VALUES ($1, $2, $3)",
email, name, string(passwordHash))
return err
}