migrated out more modules and refactored db system

internal/handler/login.go

@@ -2,6 +2,7 @@ package handler
 
 import (
 	"context"
+	"database/sql"
 	"net/http"
 	"time"
 
@@ -10,27 +11,26 @@ import (
 	"projectreshoot/internal/view/page"
 	"projectreshoot/pkg/config"
 	"projectreshoot/pkg/cookies"
-	"projectreshoot/pkg/db"
 
+	"git.haelnorr.com/h/golib/hlog"
+	"git.haelnorr.com/h/golib/jwt"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Validates the username matches a user in the database and the password
 // is correct. Returns the corresponding user
 func validateLogin(
-	ctx context.Context,
-	tx db.SafeTX,
+	tx *sql.Tx,
 	r *http.Request,
 ) (*models.User, error) {
 	formUsername := r.FormValue("username")
 	formPassword := r.FormValue("password")
-	user, err := models.GetUserFromUsername(ctx, tx, formUsername)
+	user, err := models.GetUserFromUsername(tx, formUsername)
 	if err != nil {
 		return nil, errors.Wrap(err, "db.GetUserFromUsername")
 	}
 
-	err = user.CheckPassword(formPassword)
+	err = user.CheckPassword(tx, formPassword)
 	if err != nil {
 		return nil, errors.New("Username or password incorrect")
 	}
@@ -52,8 +52,9 @@ func checkRememberMe(r *http.Request) bool {
 // template for user feedback
 func LoginRequest(
 	config *config.Config,
-	logger *zerolog.Logger,
-	conn *db.SafeConn,
+	logger *hlog.Logger,
+	conn *sql.DB,
+	tokenGen *jwt.TokenGenerator,
 ) http.Handler {
 	return http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
@@ -61,14 +62,14 @@ func LoginRequest(
 			defer cancel()
 
 			// Start the transaction
-			tx, err := conn.Begin(ctx)
+			tx, err := conn.BeginTx(ctx, nil)
 			if err != nil {
 				logger.Warn().Err(err).Msg("Failed to set token cookies")
 				w.WriteHeader(http.StatusServiceUnavailable)
 				return
 			}
 			r.ParseForm()
-			user, err := validateLogin(ctx, tx, r)
+			user, err := validateLogin(tx, r)
 			if err != nil {
 				tx.Rollback()
 				if err.Error() != "Username or password incorrect" {
@@ -81,7 +82,7 @@ func LoginRequest(
 			}
 
 			rememberMe := checkRememberMe(r)
-			err = cookies.SetTokenCookies(w, r, config, user, true, rememberMe)
+			err = cookies.SetTokenCookies(w, r, config, tokenGen, user, true, rememberMe)
 			if err != nil {
 				tx.Rollback()
 				w.WriteHeader(http.StatusInternalServerError)