refactor(server/api): migrate auth/me handlers to writeErr(err) (T3a)

internal/api/me_token.go

@@ -3,6 +3,7 @@ package api
 import (
 	"net/http"
 
+	"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/audit"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/auth"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
@@ -16,14 +17,14 @@ type apiTokenResp struct {
 func (h *handlers) handleGetMyAPIToken(w http.ResponseWriter, r *http.Request) {
 	user, ok := auth.UserFromContext(r.Context())
 	if !ok {
-		writeErr(w, http.StatusUnauthorized, "auth_required", "")
+		writeErr(w, apierror.Unauthorized("auth_required", ""))
 		return
 	}
 	q := dbq.New(h.pool)
 	current, err := q.GetUserByID(r.Context(), user.ID)
 	if err != nil {
 		h.logger.Error("get api token: lookup failed", "err", err)
-		writeErr(w, http.StatusInternalServerError, "server_error", "")
+		writeErr(w, apierror.Internal(err))
 		return
 	}
 	writeJSON(w, http.StatusOK, apiTokenResp{APIToken: current.ApiToken})
@@ -33,13 +34,13 @@ func (h *handlers) handleGetMyAPIToken(w http.ResponseWriter, r *http.Request) {
 func (h *handlers) handleRegenerateMyAPIToken(w http.ResponseWriter, r *http.Request) {
 	user, ok := auth.UserFromContext(r.Context())
 	if !ok {
-		writeErr(w, http.StatusUnauthorized, "auth_required", "")
+		writeErr(w, apierror.Unauthorized("auth_required", ""))
 		return
 	}
 	newToken, err := auth.MintSessionToken()
 	if err != nil {
 		h.logger.Error("regenerate api token: mint failed", "err", err)
-		writeErr(w, http.StatusInternalServerError, "server_error", "")
+		writeErr(w, apierror.Internal(err))
 		return
 	}
 	q := dbq.New(h.pool)
@@ -49,7 +50,7 @@ func (h *handlers) handleRegenerateMyAPIToken(w http.ResponseWriter, r *http.Req
 	})
 	if err != nil {
 		h.logger.Error("regenerate api token: update failed", "err", err)
-		writeErr(w, http.StatusInternalServerError, "server_error", "")
+		writeErr(w, apierror.Internal(err))
 		return
 	}