bvandeusen/minstrel
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 38 Wiki Activity

refactor(server/api): writeErr accepts error; migrate admin handlers (1/3)

Browse Source 
Rewrite writeErr(w, err) to wrap *apierror.Error via apierror.From,
preserving the existing {"error": {"code", "message"}} wire envelope.
Add writeErrWithLog helper for 500-class errors that need an operator
log line. Migrate all 13 admin_*.go handler files (~76 call sites) to
the new signature; T3 will sweep the remaining api package.

The old 4-arg writeErr is removed, so non-admin call sites in
internal/api will not compile until T3 lands. This is by design — T2
and T3 are paired.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Bryan Van Deusen
2026-05-07 19:48:25 -04:00
parent c919650606
commit 1cc7eb6cad
12 changed files with 229 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/admin_smtp.go
+13 -15
View File
@@ -7,6 +7,7 @@ import (
"net/http"
"time"
"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/mailer"
@@ -38,8 +39,7 @@ func (h *handlers) handleGetSMTPConfig(w http.ResponseWriter, r *http.Request) {
q := dbq.New(h.pool)
cfg, err := q.GetSMTPConfig(r.Context())
if err != nil {
h.logger.Error("admin smtp: get failed", "err", err)
writeErr(w, http.StatusInternalServerError, "server_error", "")
writeErrWithLog(w, h.logger, "admin smtp: get failed", apierror.Internal(err))
return
}
masked := ""
@@ -61,21 +61,20 @@ func (h *handlers) handleGetSMTPConfig(w http.ResponseWriter, r *http.Request) {
func (h *handlers) handleUpdateSMTPConfig(w http.ResponseWriter, r *http.Request) {
var req updateSMTPConfigReq
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
writeErr(w, http.StatusBadRequest, "invalid_body", "")
writeErr(w, apierror.BadRequest("invalid_body", ""))
return
}
if req.Enabled {
if req.Host == "" || req.FromAddress == "" {
writeErr(w, http.StatusBadRequest, "missing_fields",
"host and from_address are required when enabled")
writeErr(w, apierror.BadRequest("missing_fields",
"host and from_address are required when enabled"))
return
}
}
q := dbq.New(h.pool)
current, err := q.GetSMTPConfig(r.Context())
if err != nil {
h.logger.Error("admin smtp: get failed", "err", err)
writeErr(w, http.StatusInternalServerError, "server_error", "")
writeErrWithLog(w, h.logger, "admin smtp: get failed", apierror.Internal(err))
return
}
// Preserve existing password when the request sends "" (so the
@@ -94,8 +93,7 @@ func (h *handlers) handleUpdateSMTPConfig(w http.ResponseWriter, r *http.Request
FromName: req.FromName,
UseTls: req.UseTLS,
}); err != nil {
h.logger.Error("admin smtp: update failed", "err", err)
writeErr(w, http.StatusInternalServerError, "server_error", "")
writeErrWithLog(w, h.logger, "admin smtp: update failed", apierror.Internal(err))
return
}
w.WriteHeader(http.StatusNoContent)
@@ -104,12 +102,12 @@ func (h *handlers) handleUpdateSMTPConfig(w http.ResponseWriter, r *http.Request
func (h *handlers) handleTestSMTPConfig(w http.ResponseWriter, r *http.Request) {
caller, ok := auth.UserFromContext(r.Context())
if !ok {
writeErr(w, http.StatusUnauthorized, "auth_required", "")
writeErr(w, apierror.Unauthorized("auth_required", ""))
return
}
if caller.Email == nil || *caller.Email == "" {
writeErr(w, http.StatusBadRequest, "no_email_on_file",
"set your email in /settings before testing SMTP")
writeErr(w, apierror.BadRequest("no_email_on_file",
"set your email in /settings before testing SMTP"))
return
}
@@ -123,12 +121,12 @@ func (h *handlers) handleTestSMTPConfig(w http.ResponseWriter, r *http.Request)
htmlBody := "<p>This is a test message from your Minstrel server.</p><p>If you got this, your SMTP config is working.</p><p>— Minstrel</p>"
if err := sender.Send(ctx, *caller.Email, "Minstrel SMTP test", textBody, htmlBody); err != nil {
if errors.Is(err, mailer.ErrNotConfigured) {
writeErr(w, http.StatusBadRequest, "not_configured",
"SMTP is not enabled or required fields are empty")
writeErr(w, apierror.BadRequest("not_configured",
"SMTP is not enabled or required fields are empty"))
return
}
h.logger.Error("admin smtp: test send failed", "err", err)
writeErr(w, http.StatusInternalServerError, "send_failed", err.Error())
writeErr(w, &apierror.Error{Status: http.StatusInternalServerError, Code: "send_failed", Message: err.Error()})
return
}
w.WriteHeader(http.StatusNoContent)