h/projectreshoot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated to use bun and updated hws modules.

Browse Source
This commit is contained in:
Haelnorr
2026-01-11 23:39:10 +11:00
parent 6e03c98ae8
commit 1eedbc5220
33 changed files with 984 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
internal/handler/account.go
View File

@@ -2,19 +2,20 @@ package handler
import (
"context"
"database/sql"
"net/http"
"time"
"git.haelnorr.com/h/golib/hws"
"git.haelnorr.com/h/golib/hwsauth"
"projectreshoot/internal/models"
"projectreshoot/internal/view/component/account"
"projectreshoot/internal/view/page"
"git.haelnorr.com/h/golib/hws"
"git.haelnorr.com/h/golib/hwsauth"
"git.haelnorr.com/h/golib/cookies"
"github.com/pkg/errors"
"github.com/uptrace/bun"
)
// Renders the account page on the 'General' subpage
@@ -46,8 +47,8 @@ func AccountSubpage() http.Handler {
// Handles a request to change the users username
func ChangeUsername(
server *hws.Server,
auth *hwsauth.Authenticator[*models.User],
conn *sql.DB,
auth *hwsauth.Authenticator[*models.UserBun, bun.Tx],
db *bun.DB,
) http.Handler {
return http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) {
@@ -55,7 +56,7 @@ func ChangeUsername(
defer cancel()
// Start the transaction
tx, err := conn.BeginTx(ctx, nil)
tx, err := db.BeginTx(ctx, nil)
if err != nil {
err := server.ThrowError(w, r, hws.HWSError{
StatusCode: http.StatusServiceUnavailable,
@@ -69,7 +70,7 @@ func ChangeUsername(
}
r.ParseForm()
newUsername := r.FormValue("username")
unique, err := models.CheckUsernameUnique(tx, newUsername)
unique, err := models.IsUsernameUnique(ctx, tx, newUsername)
if err != nil {
tx.Rollback()
err := server.ThrowError(w, r, hws.HWSError{
@@ -89,7 +90,7 @@ func ChangeUsername(
return
}
user := auth.CurrentModel(r.Context())
err = user.ChangeUsername(tx, newUsername)
err = user.ChangeUsername(ctx, tx, newUsername)
if err != nil {
tx.Rollback()
err := server.ThrowError(w, r, hws.HWSError{
@@ -111,8 +112,8 @@ func ChangeUsername(
// Handles a request to change the users bio
func ChangeBio(
server *hws.Server,
auth *hwsauth.Authenticator[*models.User],
conn *sql.DB,
auth *hwsauth.Authenticator[*models.UserBun, bun.Tx],
db *bun.DB,
) http.Handler {
return http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) {
@@ -120,7 +121,7 @@ func ChangeBio(
defer cancel()
// Start the transaction
tx, err := conn.BeginTx(ctx, nil)
tx, err := db.BeginTx(ctx, nil)
if err != nil {
err := server.ThrowError(w, r, hws.HWSError{
StatusCode: http.StatusServiceUnavailable,
@@ -142,7 +143,7 @@ func ChangeBio(
return
}
user := auth.CurrentModel(r.Context())
err = user.ChangeBio(tx, newBio)
err = user.ChangeBio(ctx, tx, newBio)
if err != nil {
tx.Rollback()
err := server.ThrowError(w, r, hws.HWSError{
@@ -178,8 +179,8 @@ func validateChangePassword(
// Handles a request to change the users password
func ChangePassword(
server *hws.Server,
auth *hwsauth.Authenticator[*models.User],
conn *sql.DB,
auth *hwsauth.Authenticator[*models.UserBun, bun.Tx],
db *bun.DB,
) http.Handler {
return http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) {
@@ -187,7 +188,7 @@ func ChangePassword(
defer cancel()
// Start the transaction
tx, err := conn.BeginTx(ctx, nil)
tx, err := db.BeginTx(ctx, nil)
if err != nil {
err := server.ThrowError(w, r, hws.HWSError{
StatusCode: http.StatusServiceUnavailable,
@@ -206,7 +207,7 @@ func ChangePassword(
return
}
user := auth.CurrentModel(r.Context())
err = user.SetPassword(tx, newPass)
err = user.SetPassword(ctx, tx, newPass)
if err != nil {
tx.Rollback()
err := server.ThrowError(w, r, hws.HWSError{

28
internal/handler/login.go
View File

@@ -2,35 +2,41 @@ package handler
import (
"context"
"database/sql"
"net/http"
"strings"
"time"
"git.haelnorr.com/h/golib/hws"
"git.haelnorr.com/h/golib/hwsauth"
"projectreshoot/internal/models"
"projectreshoot/internal/view/component/form"
"projectreshoot/internal/view/page"
"git.haelnorr.com/h/golib/hws"
"git.haelnorr.com/h/golib/hwsauth"
"git.haelnorr.com/h/golib/cookies"
"github.com/pkg/errors"
"github.com/uptrace/bun"
)
// Validates the username matches a user in the database and the password
// is correct. Returns the corresponding user
func validateLogin(
tx *sql.Tx,
ctx context.Context,
tx bun.Tx,
r *http.Request,
) (*models.User, error) {
) (*models.UserBun, error) {
formUsername := r.FormValue("username")
formPassword := r.FormValue("password")
user, err := models.GetUserFromUsername(tx, formUsername)
user, err := models.GetUserByUsername(ctx, tx, formUsername)
if err != nil {
return nil, errors.Wrap(err, "db.GetUserFromUsername")
}
err = user.CheckPassword(tx, formPassword)
if user == nil {
return nil, errors.New("Username or password incorrect")
}
err = user.CheckPassword(ctx, tx, formPassword)
if err != nil {
if !strings.Contains(err.Error(), "Username or password incorrect") {
return nil, errors.Wrap(err, "user.CheckPassword")
@@ -55,8 +61,8 @@ func checkRememberMe(r *http.Request) bool {
// template for user feedback
func LoginRequest(
server *hws.Server,
auth *hwsauth.Authenticator[*models.User],
conn *sql.DB,
auth *hwsauth.Authenticator[*models.UserBun, bun.Tx],
db *bun.DB,
) http.Handler {
return http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) {
@@ -64,7 +70,7 @@ func LoginRequest(
defer cancel()
// Start the transaction
tx, err := conn.BeginTx(ctx, nil)
tx, err := db.BeginTx(ctx, nil)
if err != nil {
err := server.ThrowError(w, r, hws.HWSError{
StatusCode: http.StatusServiceUnavailable,
@@ -77,7 +83,7 @@ func LoginRequest(
return
}
r.ParseForm()
user, err := validateLogin(tx, r)
user, err := validateLogin(ctx, tx, r)
if err != nil {
tx.Rollback()
if err.Error() != "Username or password incorrect" {

13
internal/handler/logout.go
View File

@@ -2,26 +2,27 @@ package handler
import (
"context"
"database/sql"
"git.haelnorr.com/h/golib/hws"
"git.haelnorr.com/h/golib/hwsauth"
"net/http"
"projectreshoot/internal/models"
"time"
"git.haelnorr.com/h/golib/hws"
"git.haelnorr.com/h/golib/hwsauth"
"github.com/uptrace/bun"
)
// Handle a logout request
func Logout(
server *hws.Server,
auth *hwsauth.Authenticator[*models.User],
conn *sql.DB,
auth *hwsauth.Authenticator[*models.UserBun, bun.Tx],
db *bun.DB,
) http.Handler {
return http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) {
ctx, cancel := context.WithTimeout(r.Context(), 15*time.Second)
defer cancel()
tx, err := conn.BeginTx(ctx, nil)
tx, err := db.BeginTx(ctx, nil)
if err != nil {
err := server.ThrowError(w, r, hws.HWSError{
StatusCode: http.StatusInternalServerError,

8
internal/handler/movie.go
View File

@@ -12,7 +12,7 @@ import (
func Movie(
server *hws.Server,
config *config.Config,
cfg *config.TMDBConfig,
) http.Handler {
return http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) {
@@ -31,7 +31,7 @@ func Movie(
}
return
}
movie, err := tmdb.GetMovie(int32(movie_id), config.TMDBToken)
movie, err := tmdb.GetMovie(int32(movie_id), cfg.Token)
if err != nil {
err := server.ThrowError(w, r, hws.HWSError{
StatusCode: http.StatusInternalServerError,
@@ -43,7 +43,7 @@ func Movie(
}
return
}
credits, err := tmdb.GetCredits(int32(movie_id), config.TMDBToken)
credits, err := tmdb.GetCredits(int32(movie_id), cfg.Token)
if err != nil {
err := server.ThrowError(w, r, hws.HWSError{
StatusCode: http.StatusInternalServerError,
@@ -55,7 +55,7 @@ func Movie(
}
return
}
page.Movie(movie, credits, &config.TMDBConfig.Image).Render(r.Context(), w)
page.Movie(movie, credits, &cfg.Config.Image).Render(r.Context(), w)
},
)
}

6
internal/handler/movie_search.go
View File

@@ -11,7 +11,7 @@ import (
)
func SearchMovies(
config *config.Config,
cfg *config.TMDBConfig,
logger *hlog.Logger,
) http.Handler {
return http.HandlerFunc(
@@ -22,12 +22,12 @@ func SearchMovies(
w.WriteHeader(http.StatusOK)
return
}
movies, err := tmdb.SearchMovies(config.TMDBToken, query, false, 1)
movies, err := tmdb.SearchMovies(cfg.Token, query, false, 1)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
return
}
search.MovieResults(movies, &config.TMDBConfig.Image).Render(r.Context(), w)
search.MovieResults(movies, &cfg.Config.Image).Render(r.Context(), w)
},
)
}

22
internal/handler/reauthenticatate.go
View File

@@ -2,28 +2,30 @@ package handler
import (
"context"
"database/sql"
"net/http"
"time"
"git.haelnorr.com/h/golib/hws"
"git.haelnorr.com/h/golib/hwsauth"
"projectreshoot/internal/models"
"projectreshoot/internal/view/component/form"
"git.haelnorr.com/h/golib/hws"
"git.haelnorr.com/h/golib/hwsauth"
"github.com/pkg/errors"
"github.com/uptrace/bun"
)
// Validate the provided password
func validatePassword(
auth *hwsauth.Authenticator[*models.User],
tx *sql.Tx,
ctx context.Context,
auth *hwsauth.Authenticator[*models.UserBun, bun.Tx],
tx bun.Tx,
r *http.Request,
) error {
r.ParseForm()
password := r.FormValue("password")
user := auth.CurrentModel(r.Context())
err := user.CheckPassword(tx, password)
err := user.CheckPassword(ctx, tx, password)
if err != nil {
return errors.Wrap(err, "user.CheckPassword")
}
@@ -33,8 +35,8 @@ func validatePassword(
// Handle request to reauthenticate (i.e. make token fresh again)
func Reauthenticate(
server *hws.Server,
auth *hwsauth.Authenticator[*models.User],
conn *sql.DB,
auth *hwsauth.Authenticator[*models.UserBun, bun.Tx],
db *bun.DB,
) http.Handler {
return http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) {
@@ -42,7 +44,7 @@ func Reauthenticate(
defer cancel()
// Start the transaction
tx, err := conn.BeginTx(ctx, nil)
tx, err := db.BeginTx(ctx, nil)
if err != nil {
err := server.ThrowError(w, r, hws.HWSError{
StatusCode: http.StatusInternalServerError,
@@ -55,7 +57,7 @@ func Reauthenticate(
return
}
defer tx.Rollback()
err = validatePassword(auth, tx, r)
err = validatePassword(ctx, auth, tx, r)
if err != nil {
w.WriteHeader(445)
form.ConfirmPassword("Incorrect password").Render(r.Context(), w)

59
internal/handler/register.go
View File

@@ -2,30 +2,30 @@ package handler
import (
"context"
"database/sql"
"net/http"
"time"
"projectreshoot/internal/config"
"projectreshoot/internal/models"
"projectreshoot/internal/view/component/form"
"projectreshoot/internal/view/page"
"git.haelnorr.com/h/golib/cookies"
"git.haelnorr.com/h/golib/hlog"
"git.haelnorr.com/h/golib/jwt"
"git.haelnorr.com/h/golib/hws"
"git.haelnorr.com/h/golib/hwsauth"
"github.com/pkg/errors"
"github.com/uptrace/bun"
)
func validateRegistration(
tx *sql.Tx,
ctx context.Context,
tx bun.Tx,
r *http.Request,
) (*models.User, error) {
) (*models.UserBun, error) {
formUsername := r.FormValue("username")
formPassword := r.FormValue("password")
formConfirmPassword := r.FormValue("confirm-password")
unique, err := models.CheckUsernameUnique(tx, formUsername)
unique, err := models.IsUsernameUnique(ctx, tx, formUsername)
if err != nil {
return nil, errors.Wrap(err, "models.CheckUsernameUnique")
}
@@ -38,7 +38,7 @@ func validateRegistration(
if len(formPassword) > 72 {
return nil, errors.New("Password exceeds maximum length of 72 bytes")
}
user, err := models.CreateNewUser(tx, formUsername, formPassword)
user, err := models.CreateUser(ctx, tx, formUsername, formPassword)
if err != nil {
return nil, errors.Wrap(err, "models.CreateNewUser")
}
@@ -47,10 +47,9 @@ func validateRegistration(
}
func RegisterRequest(
config *config.Config,
logger *hlog.Logger,
conn *sql.DB,
tokenGen *jwt.TokenGenerator,
server *hws.Server,
auth *hwsauth.Authenticator[*models.UserBun, bun.Tx],
db *bun.DB,
) http.Handler {
return http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) {
@@ -58,21 +57,33 @@ func RegisterRequest(
defer cancel()
// Start the transaction
tx, err := conn.BeginTx(ctx, nil)
tx, err := db.BeginTx(ctx, nil)
if err != nil {
logger.Warn().Err(err).Msg("Failed to set token cookies")
w.WriteHeader(http.StatusServiceUnavailable)
err := server.ThrowError(w, r, hws.HWSError{
StatusCode: http.StatusServiceUnavailable,
Message: "Failed to start transaction",
Error: err,
})
if err != nil {
server.ThrowFatal(w, err)
}
return
}
r.ParseForm()
user, err := validateRegistration(tx, r)
user, err := validateRegistration(ctx, tx, r)
if err != nil {
tx.Rollback()
if err.Error() != "Username is taken" &&
err.Error() != "Passwords do not match" &&
err.Error() != "Password exceeds maximum length of 72 bytes" {
logger.Warn().Caller().Err(err).Msg("Registration request failed")
w.WriteHeader(http.StatusInternalServerError)
err := server.ThrowError(w, r, hws.HWSError{
StatusCode: http.StatusInternalServerError,
Message: "Registration failed",
Error: err,
})
if err != nil {
server.ThrowFatal(w, err)
}
} else {
form.RegisterForm(err.Error()).Render(r.Context(), w)
}
@@ -80,11 +91,17 @@ func RegisterRequest(
}
rememberMe := checkRememberMe(r)
err = jwt.SetTokenCookies(w, r, tokenGen, user.ID(), true, rememberMe, config.SSL)
err = auth.Login(w, r, user, rememberMe)
if err != nil {
tx.Rollback()
w.WriteHeader(http.StatusInternalServerError)
logger.Warn().Caller().Err(err).Msg("Failed to set token cookies")
err := server.ThrowError(w, r, hws.HWSError{
StatusCode: http.StatusInternalServerError,
Message: "Login failed",
Error: err,
})
if err != nil {
server.ThrowFatal(w, err)
}
return
}
tx.Commit()