migrated out more modules and refactored db system

internal/handler/logout.go

@@ -2,26 +2,25 @@ package handler
 
 import (
 	"context"
+	"database/sql"
 	"net/http"
 	"strings"
 	"time"
 
-	"projectreshoot/pkg/config"
 	"projectreshoot/pkg/cookies"
-	"projectreshoot/pkg/db"
-	"projectreshoot/pkg/jwt"
+
+	"git.haelnorr.com/h/golib/hlog"
+	"git.haelnorr.com/h/golib/jwt"
 
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 func revokeAccess(
-	config *config.Config,
-	ctx context.Context,
-	tx *db.SafeWTX,
+	tokenGen *jwt.TokenGenerator,
+	tx *sql.Tx,
 	atStr string,
 ) error {
-	aT, err := jwt.ParseAccessToken(config, ctx, tx, atStr)
+	aT, err := tokenGen.ValidateAccess(tx, atStr)
 	if err != nil {
 		if strings.Contains(err.Error(), "Token is expired") ||
 			strings.Contains(err.Error(), "Token has been revoked") {
@@ -29,7 +28,7 @@ func revokeAccess(
 		}
 		return errors.Wrap(err, "jwt.ParseAccessToken")
 	}
-	err = jwt.RevokeToken(ctx, tx, aT)
+	err = aT.Revoke(tx)
 	if err != nil {
 		return errors.Wrap(err, "jwt.RevokeToken")
 	}
@@ -37,12 +36,11 @@ func revokeAccess(
 }
 
 func revokeRefresh(
-	config *config.Config,
-	ctx context.Context,
-	tx *db.SafeWTX,
+	tokenGen *jwt.TokenGenerator,
+	tx *sql.Tx,
 	rtStr string,
 ) error {
-	rT, err := jwt.ParseRefreshToken(config, ctx, tx, rtStr)
+	rT, err := tokenGen.ValidateRefresh(tx, rtStr)
 	if err != nil {
 		if strings.Contains(err.Error(), "Token is expired") ||
 			strings.Contains(err.Error(), "Token has been revoked") {
@@ -50,7 +48,7 @@ func revokeRefresh(
 		}
 		return errors.Wrap(err, "jwt.ParseRefreshToken")
 	}
-	err = jwt.RevokeToken(ctx, tx, rT)
+	err = rT.Revoke(tx)
 	if err != nil {
 		return errors.Wrap(err, "jwt.RevokeToken")
 	}
@@ -59,20 +57,19 @@ func revokeRefresh(
 
 // Retrieve and revoke the user's tokens
 func revokeTokens(
-	config *config.Config,
-	ctx context.Context,
-	tx *db.SafeWTX,
+	tokenGen *jwt.TokenGenerator,
+	tx *sql.Tx,
 	r *http.Request,
 ) error {
 	// get the tokens from the cookies
 	atStr, rtStr := cookies.GetTokenStrings(r)
 	// revoke the refresh token first as the access token expires quicker
 	// only matters if there is an error revoking the tokens
-	err := revokeRefresh(config, ctx, tx, rtStr)
+	err := revokeRefresh(tokenGen, tx, rtStr)
 	if err != nil {
 		return errors.Wrap(err, "revokeRefresh")
 	}
-	err = revokeAccess(config, ctx, tx, atStr)
+	err = revokeAccess(tokenGen, tx, atStr)
 	if err != nil {
 		return errors.Wrap(err, "revokeAccess")
 	}
@@ -81,25 +78,25 @@ func revokeTokens(
 
 // Handle a logout request
 func Logout(
-	config *config.Config,
-	logger *zerolog.Logger,
-	conn *db.SafeConn,
+	conn *sql.DB,
+	tokenGen *jwt.TokenGenerator,
+	logger *hlog.Logger,
 ) http.Handler {
 	return http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
 			ctx, cancel := context.WithTimeout(r.Context(), 15*time.Second)
 			defer cancel()
 
-			// Start the transaction
-			tx, err := conn.Begin(ctx)
+			tx, err := conn.BeginTx(ctx, nil)
 			if err != nil {
-				logger.Warn().Err(err).Msg("Error occured on user logout")
-				w.WriteHeader(http.StatusServiceUnavailable)
+				logger.Error().Err(err).Msg("Failed to start database transaction")
+				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
-			err = revokeTokens(config, ctx, tx, r)
+			defer tx.Rollback()
+
+			err = revokeTokens(tokenGen, tx, r)
 			if err != nil {
-				tx.Rollback()
 				logger.Error().Err(err).Msg("Error occured on user logout")
 				w.WriteHeader(http.StatusInternalServerError)
 				return