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

internal/api/me_password.go

@@ -6,6 +6,7 @@ import (
 
 	"golang.org/x/crypto/bcrypt"
 
+	"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"
@@ -22,16 +23,16 @@ type changePasswordReq struct {
 func (h *handlers) handleChangePassword(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
 	}
 	var req changePasswordReq
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		writeErr(w, http.StatusBadRequest, "invalid_body", "")
+		writeErr(w, apierror.BadRequest("invalid_body", ""))
 		return
 	}
 	if len(req.NewPassword) < minPasswordLength {
-		writeErr(w, http.StatusBadRequest, "password_too_short", "password must be at least 8 chars")
+		writeErr(w, apierror.BadRequest("password_too_short", "password must be at least 8 chars"))
 		return
 	}
 
@@ -39,18 +40,18 @@ func (h *handlers) handleChangePassword(w http.ResponseWriter, r *http.Request)
 	current, err := q.GetUserByID(r.Context(), user.ID)
 	if err != nil {
 		h.logger.Error("change password: lookup failed", "err", err)
-		writeErr(w, http.StatusInternalServerError, "server_error", "")
+		writeErr(w, apierror.Internal(err))
 		return
 	}
 	if err := bcrypt.CompareHashAndPassword([]byte(current.PasswordHash), []byte(req.CurrentPassword)); err != nil {
-		writeErr(w, http.StatusUnauthorized, "wrong_password", "")
+		writeErr(w, apierror.Unauthorized("wrong_password", ""))
 		return
 	}
 
 	hash, err := bcrypt.GenerateFromPassword([]byte(req.NewPassword), bcrypt.DefaultCost)
 	if err != nil {
 		h.logger.Error("change password: hash failed", "err", err)
-		writeErr(w, http.StatusInternalServerError, "server_error", "")
+		writeErr(w, apierror.Internal(err))
 		return
 	}
 	if err := q.ChangeUserPassword(r.Context(), dbq.ChangeUserPasswordParams{
@@ -58,7 +59,7 @@ func (h *handlers) handleChangePassword(w http.ResponseWriter, r *http.Request)
 		PasswordHash: string(hash),
 	}); err != nil {
 		h.logger.Error("change password: update failed", "err", err)
-		writeErr(w, http.StatusInternalServerError, "server_error", "")
+		writeErr(w, apierror.Internal(err))
 		return
 	}