refactor(server/api): migrate me/* + events preludes (A2 5/N)
This commit is contained in:
@@ -9,7 +9,6 @@ import (
|
|||||||
"github.com/jackc/pgx/v5"
|
"github.com/jackc/pgx/v5"
|
||||||
|
|
||||||
"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
|
"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/db/dbq"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -33,9 +32,8 @@ type okResponse struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (h *handlers) handleEvents(w http.ResponseWriter, r *http.Request) {
|
func (h *handlers) handleEvents(w http.ResponseWriter, r *http.Request) {
|
||||||
user, ok := auth.UserFromContext(r.Context())
|
user, ok := requireUser(w, r)
|
||||||
if !ok {
|
if !ok {
|
||||||
writeErr(w, apierror.ErrUnauthorized)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
var req eventRequest
|
var req eventRequest
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
|
"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/db/dbq"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -15,9 +14,8 @@ import (
|
|||||||
// offset/limit; has_more = (len(rows) == limit) is a cheap heuristic
|
// offset/limit; has_more = (len(rows) == limit) is a cheap heuristic
|
||||||
// that errs on the "true" side at the exact-end boundary.
|
// that errs on the "true" side at the exact-end boundary.
|
||||||
func (h *handlers) handleGetMyHistory(w http.ResponseWriter, r *http.Request) {
|
func (h *handlers) handleGetMyHistory(w http.ResponseWriter, r *http.Request) {
|
||||||
user, ok := auth.UserFromContext(r.Context())
|
user, ok := requireUser(w, r)
|
||||||
if !ok {
|
if !ok {
|
||||||
writeErr(w, apierror.ErrUnauthorized)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import (
|
|||||||
|
|
||||||
"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
|
"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
|
||||||
"git.fabledsword.com/bvandeusen/minstrel/internal/audit"
|
"git.fabledsword.com/bvandeusen/minstrel/internal/audit"
|
||||||
"git.fabledsword.com/bvandeusen/minstrel/internal/auth"
|
|
||||||
"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
|
"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -21,9 +20,8 @@ type changePasswordReq struct {
|
|||||||
// the caller proves they know their current password before they can
|
// the caller proves they know their current password before they can
|
||||||
// set a new one. Distinct from the admin-driven reset path.
|
// set a new one. Distinct from the admin-driven reset path.
|
||||||
func (h *handlers) handleChangePassword(w http.ResponseWriter, r *http.Request) {
|
func (h *handlers) handleChangePassword(w http.ResponseWriter, r *http.Request) {
|
||||||
user, ok := auth.UserFromContext(r.Context())
|
user, ok := requireUser(w, r)
|
||||||
if !ok {
|
if !ok {
|
||||||
writeErr(w, apierror.Unauthorized("auth_required", ""))
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
var req changePasswordReq
|
var req changePasswordReq
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import (
|
|||||||
"github.com/jackc/pgx/v5/pgconn"
|
"github.com/jackc/pgx/v5/pgconn"
|
||||||
|
|
||||||
"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
|
"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/db/dbq"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -39,9 +38,8 @@ type meProfileResp struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (h *handlers) handleUpdateMyProfile(w http.ResponseWriter, r *http.Request) {
|
func (h *handlers) handleUpdateMyProfile(w http.ResponseWriter, r *http.Request) {
|
||||||
user, ok := auth.UserFromContext(r.Context())
|
user, ok := requireUser(w, r)
|
||||||
if !ok {
|
if !ok {
|
||||||
writeErr(w, apierror.Unauthorized("auth_required", ""))
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
var req updateProfileReq
|
var req updateProfileReq
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import (
|
|||||||
"github.com/jackc/pgx/v5"
|
"github.com/jackc/pgx/v5"
|
||||||
|
|
||||||
"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
|
"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/db/dbq"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -24,9 +23,8 @@ type systemPlaylistsStatusResp struct {
|
|||||||
// Returns the caller's system_playlist_runs row, or zero-values when no row
|
// Returns the caller's system_playlist_runs row, or zero-values when no row
|
||||||
// exists yet (i.e. the user has never had a build attempted).
|
// exists yet (i.e. the user has never had a build attempted).
|
||||||
func (h *handlers) handleGetSystemPlaylistsStatus(w http.ResponseWriter, r *http.Request) {
|
func (h *handlers) handleGetSystemPlaylistsStatus(w http.ResponseWriter, r *http.Request) {
|
||||||
caller, ok := auth.UserFromContext(r.Context())
|
caller, ok := requireUser(w, r)
|
||||||
if !ok {
|
if !ok {
|
||||||
writeErr(w, apierror.Unauthorized("unauthenticated", "no session"))
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user