refactor(server/api): migrate requests/quarantine/me_token/listenbrainz/admin_invites preludes (A2 3/N)

internal/api/requests.go

@@ -2,15 +2,12 @@ package api
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"net/http"
 
-	"github.com/go-chi/chi/v5"
 	"github.com/jackc/pgx/v5/pgtype"
 
 	"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/auth"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/lidarrrequests"
 )
@@ -123,15 +120,13 @@ type createRequestBody struct {
 
 // handleCreateRequest implements POST /api/requests.
 func (h *handlers) handleCreateRequest(w http.ResponseWriter, r *http.Request) {
-	user, ok := auth.UserFromContext(r.Context())
+	user, ok := requireUser(w, r)
 	if !ok {
-		writeErr(w, apierror.ErrUnauthorized)
 		return
 	}
 
 	var body createRequestBody
-	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
-		writeErr(w, apierror.BadRequest("bad_request", "invalid JSON body"))
+	if !decodeBody(w, r, &body) {
 		return
 	}
 
@@ -185,9 +180,8 @@ func (h *handlers) handleCreateRequest(w http.ResponseWriter, r *http.Request) {
 
 // handleListRequests implements GET /api/requests — returns caller's own requests.
 func (h *handlers) handleListRequests(w http.ResponseWriter, r *http.Request) {
-	user, ok := auth.UserFromContext(r.Context())
+	user, ok := requireUser(w, r)
 	if !ok {
-		writeErr(w, apierror.ErrUnauthorized)
 		return
 	}
 
@@ -211,9 +205,8 @@ func (h *handlers) handleListRequests(w http.ResponseWriter, r *http.Request) {
 // handleGetRequest implements GET /api/requests/:id.
 // The caller must own the request, or be an admin.
 func (h *handlers) handleGetRequest(w http.ResponseWriter, r *http.Request) {
-	user, ok := auth.UserFromContext(r.Context())
+	user, ok := requireUser(w, r)
 	if !ok {
-		writeErr(w, apierror.ErrUnauthorized)
 		return
 	}
 
@@ -237,15 +230,13 @@ func (h *handlers) handleGetRequest(w http.ResponseWriter, r *http.Request) {
 // handleCancelRequest implements DELETE /api/requests/:id.
 // Cancels the caller's own pending request.
 func (h *handlers) handleCancelRequest(w http.ResponseWriter, r *http.Request) {
-	user, ok := auth.UserFromContext(r.Context())
+	user, ok := requireUser(w, r)
 	if !ok {
-		writeErr(w, apierror.ErrUnauthorized)
 		return
 	}
 
-	id, ok := parseUUID(chi.URLParam(r, "id"))
+	id, ok := requireURLUUID(w, r, "id")
 	if !ok {
-		writeErr(w, apierror.BadRequest("bad_request", "invalid request id"))
 		return
 	}