updated stuff

internal/db/user.go

@@ -2,65 +2,29 @@ package db
 
 import (
 	"context"
+	"time"
 
+	"git.haelnorr.com/h/golib/hwsauth"
+	"github.com/bwmarrin/discordgo"
 	"github.com/pkg/errors"
 	"github.com/uptrace/bun"
-	"golang.org/x/crypto/bcrypt"
 )
 
+var CurrentUser hwsauth.ContextLoader[*User]
+
 type User struct {
 	bun.BaseModel `bun:"table:users,alias:u"`
 
-	ID           int    `bun:"id,pk,autoincrement"`    // Integer ID (index primary key)
-	Username     string `bun:"username,unique"`        // Username (unique)
-	PasswordHash string `bun:"password_hash,nullzero"` // Bcrypt hashed password (not exported in JSON)
-	CreatedAt    int64  `bun:"created_at"`             // Epoch timestamp when the user was added to the database
-	Bio          string `bun:"bio"`                    // Short byline set by the user
+	ID        int    `bun:"id,pk,autoincrement"` // Integer ID (index primary key)
+	Username  string `bun:"username,unique"`     // Username (unique)
+	CreatedAt int64  `bun:"created_at"`          // Epoch timestamp when the user was added to the database
+	DiscordID string `bun:"discord_id,unique"`
 }
 
 func (user *User) GetID() int {
 	return user.ID
 }
 
-// Uses bcrypt to set the users password_hash from the given password
-func (user *User) SetPassword(ctx context.Context, tx bun.Tx, password string) error {
-	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
-	if err != nil {
-		return errors.Wrap(err, "bcrypt.GenerateFromPassword")
-	}
-	newPassword := string(hashedPassword)
-
-	_, err = tx.NewUpdate().
-		Model(user).
-		Set("password_hash = ?", newPassword).
-		Where("id = ?", user.ID).
-		Exec(ctx)
-	if err != nil {
-		return errors.Wrap(err, "tx.Update")
-	}
-	return nil
-}
-
-// Uses bcrypt to check if the given password matches the users password_hash
-func (user *User) CheckPassword(ctx context.Context, tx bun.Tx, password string) error {
-	var hashedPassword string
-	err := tx.NewSelect().
-		Table("users").
-		Column("password_hash").
-		Where("id = ?", user.ID).
-		Limit(1).
-		Scan(ctx, &hashedPassword)
-	if err != nil {
-		return errors.Wrap(err, "tx.Select")
-	}
-
-	err = bcrypt.CompareHashAndPassword([]byte(hashedPassword), []byte(password))
-	if err != nil {
-		return errors.Wrap(err, "Username or password incorrect")
-	}
-	return nil
-}
-
 // Change the user's username
 func (user *User) ChangeUsername(ctx context.Context, tx bun.Tx, newUsername string) error {
 	_, err := tx.NewUpdate().
@@ -75,35 +39,18 @@ func (user *User) ChangeUsername(ctx context.Context, tx bun.Tx, newUsername str
 	return nil
 }
 
-// Change the user's bio
-func (user *User) ChangeBio(ctx context.Context, tx bun.Tx, newBio string) error {
-	_, err := tx.NewUpdate().
-		Model(user).
-		Set("bio = ?", newBio).
-		Where("id = ?", user.ID).
-		Exec(ctx)
-	if err != nil {
-		return errors.Wrap(err, "tx.Update")
-	}
-	user.Bio = newBio
-	return nil
-}
-
 // CreateUser creates a new user with the given username and password
-func CreateUser(ctx context.Context, tx bun.Tx, username, password string) (*User, error) {
-	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
-	if err != nil {
-		return nil, errors.Wrap(err, "bcrypt.GenerateFromPassword")
+func CreateUser(ctx context.Context, tx bun.Tx, username string, discorduser *discordgo.User) (*User, error) {
+	if discorduser == nil {
+		return nil, errors.New("user cannot be nil")
 	}
-
 	user := &User{
-		Username:     username,
-		PasswordHash: string(hashedPassword),
-		CreatedAt:    0, // You may want to set this to time.Now().Unix()
-		Bio:          "",
+		Username:  username,
+		CreatedAt: time.Now().Unix(),
+		DiscordID: discorduser.ID,
 	}
 
-	_, err = tx.NewInsert().
+	_, err := tx.NewInsert().
 		Model(user).
 		Exec(ctx)
 	if err != nil {
@@ -149,6 +96,24 @@ func GetUserByUsername(ctx context.Context, tx bun.Tx, username string) (*User,
 	return user, nil
 }
 
+// GetUserByDiscordID queries the database for a user matching the given discord id
+// Returns nil, nil if no user is found
+func GetUserByDiscordID(ctx context.Context, tx bun.Tx, discordID string) (*User, error) {
+	user := new(User)
+	err := tx.NewSelect().
+		Model(user).
+		Where("discord_id = ?", discordID).
+		Limit(1).
+		Scan(ctx)
+	if err != nil {
+		if err.Error() == "sql: no rows in result set" {
+			return nil, nil
+		}
+		return nil, errors.Wrap(err, "tx.Select")
+	}
+	return user, nil
+}
+
 // IsUsernameUnique checks if the given username is unique (not already taken)
 // Returns true if the username is available, false if it's taken
 func IsUsernameUnique(ctx context.Context, tx bun.Tx, username string) (bool, error) {