Updated all code to use SafeConn and SafeTX

handlers/account.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"database/sql"
+	"context"
 	"net/http"
 
 	"projectreshoot/contexts"
@@ -43,32 +43,39 @@ func HandleAccountSubpage() http.Handler {
 // Handles a request to change the users username
 func HandleChangeUsername(
 	logger *zerolog.Logger,
-	conn *sql.DB,
+	conn *db.SafeConn,
 ) http.Handler {
 	return http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			r.ParseForm()
-			newUsername := r.FormValue("username")
-
-			unique, err := db.CheckUsernameUnique(conn, newUsername)
-			if err != nil {
-				logger.Error().Err(err).Msg("Error updating username")
-				w.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-			if !unique {
-				account.ChangeUsername("Username is taken", newUsername).
-					Render(r.Context(), w)
-				return
-			}
-			user := contexts.GetUser(r.Context())
-			err = user.ChangeUsername(conn, newUsername)
-			if err != nil {
-				logger.Error().Err(err).Msg("Error updating username")
-				w.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-			w.Header().Set("HX-Refresh", "true")
+			WithTransaction(w, r, logger, conn,
+				func(ctx context.Context, tx *db.SafeTX, w http.ResponseWriter, r *http.Request) {
+					r.ParseForm()
+					newUsername := r.FormValue("username")
+					unique, err := db.CheckUsernameUnique(ctx, tx, newUsername)
+					if err != nil {
+						tx.Rollback()
+						logger.Error().Err(err).Msg("Error updating username")
+						w.WriteHeader(http.StatusInternalServerError)
+						return
+					}
+					if !unique {
+						tx.Rollback()
+						account.ChangeUsername("Username is taken", newUsername).
+							Render(r.Context(), w)
+						return
+					}
+					user := contexts.GetUser(r.Context())
+					err = user.ChangeUsername(ctx, tx, newUsername)
+					if err != nil {
+						tx.Rollback()
+						logger.Error().Err(err).Msg("Error updating username")
+						w.WriteHeader(http.StatusInternalServerError)
+						return
+					}
+					tx.Commit()
+					w.Header().Set("HX-Refresh", "true")
+				},
+			)
 		},
 	)
 }
@@ -76,30 +83,41 @@ func HandleChangeUsername(
 // Handles a request to change the users bio
 func HandleChangeBio(
 	logger *zerolog.Logger,
-	conn *sql.DB,
+	conn *db.SafeConn,
 ) http.Handler {
 	return http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			r.ParseForm()
-			newBio := r.FormValue("bio")
-			leng := len([]rune(newBio))
-			if leng > 128 {
-				account.ChangeBio("Bio limited to 128 characters", newBio).
-					Render(r.Context(), w)
-				return
-			}
-			user := contexts.GetUser(r.Context())
-			err := user.ChangeBio(conn, newBio)
-			if err != nil {
-				logger.Error().Err(err).Msg("Error updating bio")
-				w.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-			w.Header().Set("HX-Refresh", "true")
+			WithTransaction(w, r, logger, conn,
+				func(ctx context.Context, tx *db.SafeTX, w http.ResponseWriter, r *http.Request) {
+					r.ParseForm()
+					newBio := r.FormValue("bio")
+					leng := len([]rune(newBio))
+					if leng > 128 {
+						tx.Rollback()
+						account.ChangeBio("Bio limited to 128 characters", newBio).
+							Render(r.Context(), w)
+						return
+					}
+					user := contexts.GetUser(r.Context())
+					err := user.ChangeBio(ctx, tx, newBio)
+					if err != nil {
+						tx.Rollback()
+						logger.Error().Err(err).Msg("Error updating bio")
+						w.WriteHeader(http.StatusInternalServerError)
+						return
+					}
+					tx.Commit()
+					w.Header().Set("HX-Refresh", "true")
+				},
+			)
 		},
 	)
 }
-func validateChangePassword(conn *sql.DB, r *http.Request) (string, error) {
+func validateChangePassword(
+	ctx context.Context,
+	tx *db.SafeTX,
+	r *http.Request,
+) (string, error) {
 	r.ParseForm()
 	formPassword := r.FormValue("password")
 	formConfirmPassword := r.FormValue("confirm-password")
@@ -115,23 +133,30 @@ func validateChangePassword(conn *sql.DB, r *http.Request) (string, error) {
 // Handles a request to change the users password
 func HandleChangePassword(
 	logger *zerolog.Logger,
-	conn *sql.DB,
+	conn *db.SafeConn,
 ) http.Handler {
 	return http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			newPass, err := validateChangePassword(conn, r)
-			if err != nil {
-				account.ChangePassword(err.Error()).Render(r.Context(), w)
-				return
-			}
-			user := contexts.GetUser(r.Context())
-			err = user.SetPassword(conn, newPass)
-			if err != nil {
-				logger.Error().Err(err).Msg("Error updating password")
-				w.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-			w.Header().Set("HX-Refresh", "true")
+			WithTransaction(w, r, logger, conn,
+				func(ctx context.Context, tx *db.SafeTX, w http.ResponseWriter, r *http.Request) {
+					newPass, err := validateChangePassword(ctx, tx, r)
+					if err != nil {
+						tx.Rollback()
+						account.ChangePassword(err.Error()).Render(r.Context(), w)
+						return
+					}
+					user := contexts.GetUser(r.Context())
+					err = user.SetPassword(ctx, tx, newPass)
+					if err != nil {
+						tx.Rollback()
+						logger.Error().Err(err).Msg("Error updating password")
+						w.WriteHeader(http.StatusInternalServerError)
+						return
+					}
+					tx.Commit()
+					w.Header().Set("HX-Refresh", "true")
+				},
+			)
 		},
 	)
 }

handlers/login.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"database/sql"
+	"context"
 	"net/http"
 
 	"projectreshoot/config"
@@ -16,10 +16,14 @@ import (
 
 // Validates the username matches a user in the database and the password
 // is correct. Returns the corresponding user
-func validateLogin(conn *sql.DB, r *http.Request) (*db.User, error) {
+func validateLogin(
+	ctx context.Context,
+	tx *db.SafeTX,
+	r *http.Request,
+) (*db.User, error) {
 	formUsername := r.FormValue("username")
 	formPassword := r.FormValue("password")
-	user, err := db.GetUserFromUsername(conn, formUsername)
+	user, err := db.GetUserFromUsername(ctx, tx, formUsername)
 	if err != nil {
 		return nil, errors.Wrap(err, "db.GetUserFromUsername")
 	}
@@ -47,31 +51,38 @@ func checkRememberMe(r *http.Request) bool {
 func HandleLoginRequest(
 	config *config.Config,
 	logger *zerolog.Logger,
-	conn *sql.DB,
+	conn *db.SafeConn,
 ) http.Handler {
 	return http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			r.ParseForm()
-			user, err := validateLogin(conn, r)
-			if err != nil {
-				if err.Error() != "Username or password incorrect" {
-					logger.Warn().Caller().Err(err).Msg("Login request failed")
-					w.WriteHeader(http.StatusInternalServerError)
-				} else {
-					form.LoginForm(err.Error()).Render(r.Context(), w)
-				}
-				return
-			}
+			WithTransaction(w, r, logger, conn,
+				func(ctx context.Context, tx *db.SafeTX, w http.ResponseWriter, r *http.Request) {
+					r.ParseForm()
+					user, err := validateLogin(ctx, tx, r)
+					if err != nil {
+						tx.Rollback()
+						if err.Error() != "Username or password incorrect" {
+							logger.Warn().Caller().Err(err).Msg("Login request failed")
+							w.WriteHeader(http.StatusInternalServerError)
+						} else {
+							form.LoginForm(err.Error()).Render(r.Context(), w)
+						}
+						return
+					}
 
-			rememberMe := checkRememberMe(r)
-			err = cookies.SetTokenCookies(w, r, config, user, true, rememberMe)
-			if err != nil {
-				w.WriteHeader(http.StatusInternalServerError)
-				logger.Warn().Caller().Err(err).Msg("Failed to set token cookies")
-			}
+					rememberMe := checkRememberMe(r)
+					err = cookies.SetTokenCookies(w, r, config, user, true, rememberMe)
+					if err != nil {
+						tx.Rollback()
+						w.WriteHeader(http.StatusInternalServerError)
+						logger.Warn().Caller().Err(err).Msg("Failed to set token cookies")
+						return
+					}
 
-			pageFrom := cookies.CheckPageFrom(w, r)
-			w.Header().Set("HX-Redirect", pageFrom)
+					tx.Commit()
+					pageFrom := cookies.CheckPageFrom(w, r)
+					w.Header().Set("HX-Redirect", pageFrom)
+				})
 		},
 	)
 }

handlers/register.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"database/sql"
+	"context"
 	"net/http"
 
 	"projectreshoot/config"
@@ -14,11 +14,15 @@ import (
 	"github.com/rs/zerolog"
 )
 
-func validateRegistration(conn *sql.DB, r *http.Request) (*db.User, error) {
+func validateRegistration(
+	ctx context.Context,
+	tx *db.SafeTX,
+	r *http.Request,
+) (*db.User, error) {
 	formUsername := r.FormValue("username")
 	formPassword := r.FormValue("password")
 	formConfirmPassword := r.FormValue("confirm-password")
-	unique, err := db.CheckUsernameUnique(conn, formUsername)
+	unique, err := db.CheckUsernameUnique(ctx, tx, formUsername)
 	if err != nil {
 		return nil, errors.Wrap(err, "db.CheckUsernameUnique")
 	}
@@ -31,7 +35,7 @@ func validateRegistration(conn *sql.DB, r *http.Request) (*db.User, error) {
 	if len(formPassword) > 72 {
 		return nil, errors.New("Password exceeds maximum length of 72 bytes")
 	}
-	user, err := db.CreateNewUser(conn, formUsername, formPassword)
+	user, err := db.CreateNewUser(ctx, tx, formUsername, formPassword)
 	if err != nil {
 		return nil, errors.Wrap(err, "db.CreateNewUser")
 	}
@@ -42,33 +46,40 @@ func validateRegistration(conn *sql.DB, r *http.Request) (*db.User, error) {
 func HandleRegisterRequest(
 	config *config.Config,
 	logger *zerolog.Logger,
-	conn *sql.DB,
+	conn *db.SafeConn,
 ) http.Handler {
 	return http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			r.ParseForm()
-			user, err := validateRegistration(conn, r)
-			if err != nil {
-				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)
-				} else {
-					form.RegisterForm(err.Error()).Render(r.Context(), w)
-				}
-				return
-			}
+			WithTransaction(w, r, logger, conn,
+				func(ctx context.Context, tx *db.SafeTX, w http.ResponseWriter, r *http.Request) {
+					r.ParseForm()
+					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)
+						} else {
+							form.RegisterForm(err.Error()).Render(r.Context(), w)
+						}
+						return
+					}
 
-			rememberMe := checkRememberMe(r)
-			err = cookies.SetTokenCookies(w, r, config, user, true, rememberMe)
-			if err != nil {
-				w.WriteHeader(http.StatusInternalServerError)
-				logger.Warn().Caller().Err(err).Msg("Failed to set token cookies")
-			}
-
-			pageFrom := cookies.CheckPageFrom(w, r)
-			w.Header().Set("HX-Redirect", pageFrom)
+					rememberMe := checkRememberMe(r)
+					err = cookies.SetTokenCookies(w, r, config, user, true, rememberMe)
+					if err != nil {
+						tx.Rollback()
+						w.WriteHeader(http.StatusInternalServerError)
+						logger.Warn().Caller().Err(err).Msg("Failed to set token cookies")
+						return
+					}
+					tx.Commit()
+					pageFrom := cookies.CheckPageFrom(w, r)
+					w.Header().Set("HX-Redirect", pageFrom)
+				},
+			)
 		},
 	)
 }