fix: use correct request body for alias requests

pull/23/head
Gabe Farrell 6 months ago
parent 7b0cff0a07
commit c2669b8d99

@ -53,6 +53,7 @@ function getStats(period: string): Promise<Stats> {
} }
function search(q: string): Promise<SearchResponse> { function search(q: string): Promise<SearchResponse> {
q = encodeURIComponent(q)
return fetch(`/apis/web/v1/search?q=${q}`).then(r => r.json() as Promise<SearchResponse>) return fetch(`/apis/web/v1/search?q=${q}`).then(r => r.json() as Promise<SearchResponse>)
} }
@ -131,8 +132,12 @@ function deleteApiKey(id: number): Promise<Response> {
}) })
} }
function updateApiKeyLabel(id: number, label: string): Promise<Response> { function updateApiKeyLabel(id: number, label: string): Promise<Response> {
return fetch(`/apis/web/v1/user/apikeys?id=${id}&label=${label}`, { const form = new URLSearchParams
method: "PATCH" form.append('id', String(id))
form.append('label', label)
return fetch(`/apis/web/v1/user/apikeys`, {
method: "PATCH",
body: form,
}) })
} }
@ -154,18 +159,30 @@ function getAliases(type: string, id: number): Promise<Alias[]> {
return fetch(`/apis/web/v1/aliases?${type}_id=${id}`).then(r => r.json() as Promise<Alias[]>) return fetch(`/apis/web/v1/aliases?${type}_id=${id}`).then(r => r.json() as Promise<Alias[]>)
} }
function createAlias(type: string, id: number, alias: string): Promise<Response> { function createAlias(type: string, id: number, alias: string): Promise<Response> {
return fetch(`/apis/web/v1/aliases?${type}_id=${id}&alias=${alias}`, { const form = new URLSearchParams
method: 'POST' form.append(`${type}_id`, String(id))
form.append('alias', alias)
return fetch(`/apis/web/v1/aliases`, {
method: 'POST',
body: form,
}) })
} }
function deleteAlias(type: string, id: number, alias: string): Promise<Response> { function deleteAlias(type: string, id: number, alias: string): Promise<Response> {
return fetch(`/apis/web/v1/aliases?${type}_id=${id}&alias=${alias}`, { const form = new URLSearchParams
method: "DELETE" form.append(`${type}_id`, String(id))
form.append('alias', alias)
return fetch(`/apis/web/v1/aliases/delete`, {
method: "POST",
body: form,
}) })
} }
function setPrimaryAlias(type: string, id: number, alias: string): Promise<Response> { function setPrimaryAlias(type: string, id: number, alias: string): Promise<Response> {
return fetch(`/apis/web/v1/aliases/primary?${type}_id=${id}&alias=${alias}`, { const form = new URLSearchParams
method: "POST" form.append(`${type}_id`, String(id))
form.append('alias', alias)
return fetch(`/apis/web/v1/aliases/primary`, {
method: "POST",
body: form,
}) })
} }
function getAlbum(id: number): Promise<Album> { function getAlbum(id: number): Promise<Album> {

@ -88,11 +88,18 @@ func DeleteAliasHandler(store db.DB) http.HandlerFunc {
l.Debug().Msg("DeleteAliasHandler: Got request") l.Debug().Msg("DeleteAliasHandler: Got request")
err := r.ParseForm()
if err != nil {
l.Debug().Msg("DeleteAliasHandler: Failed to parse form")
utils.WriteError(w, "form is invalid", http.StatusBadRequest)
return
}
// Parse query parameters // Parse query parameters
artistIDStr := r.URL.Query().Get("artist_id") artistIDStr := r.FormValue("artist_id")
albumIDStr := r.URL.Query().Get("album_id") albumIDStr := r.FormValue("album_id")
trackIDStr := r.URL.Query().Get("track_id") trackIDStr := r.FormValue("track_id")
alias := r.URL.Query().Get("alias") alias := r.FormValue("alias")
if alias == "" || (artistIDStr == "" && albumIDStr == "" && trackIDStr == "") { if alias == "" || (artistIDStr == "" && albumIDStr == "" && trackIDStr == "") {
l.Debug().Msg("DeleteAliasHandler: Request is missing required parameters") l.Debug().Msg("DeleteAliasHandler: Request is missing required parameters")
@ -105,7 +112,6 @@ func DeleteAliasHandler(store db.DB) http.HandlerFunc {
return return
} }
var err error
if artistIDStr != "" { if artistIDStr != "" {
var artistID int var artistID int
artistID, err = strconv.Atoi(artistIDStr) artistID, err = strconv.Atoi(artistIDStr)
@ -176,9 +182,9 @@ func CreateAliasHandler(store db.DB) http.HandlerFunc {
return return
} }
artistIDStr := r.URL.Query().Get("artist_id") artistIDStr := r.FormValue("artist_id")
albumIDStr := r.URL.Query().Get("album_id") albumIDStr := r.FormValue("album_id")
trackIDStr := r.URL.Query().Get("track_id") trackIDStr := r.FormValue("track_id")
if artistIDStr == "" && albumIDStr == "" && trackIDStr == "" { if artistIDStr == "" && albumIDStr == "" && trackIDStr == "" {
l.Debug().Msg("CreateAliasHandler: Missing ID parameter") l.Debug().Msg("CreateAliasHandler: Missing ID parameter")
@ -245,11 +251,20 @@ func SetPrimaryAliasHandler(store db.DB) http.HandlerFunc {
l.Debug().Msg("SetPrimaryAliasHandler: Got request") l.Debug().Msg("SetPrimaryAliasHandler: Got request")
err := r.ParseForm()
if err != nil {
l.Debug().Msg("SetPrimaryAliasHandler: Failed to parse form")
utils.WriteError(w, "form is invalid", http.StatusBadRequest)
return
}
// Parse query parameters // Parse query parameters
artistIDStr := r.URL.Query().Get("artist_id") artistIDStr := r.FormValue("artist_id")
albumIDStr := r.URL.Query().Get("album_id") albumIDStr := r.FormValue("album_id")
trackIDStr := r.URL.Query().Get("track_id") trackIDStr := r.FormValue("track_id")
alias := r.URL.Query().Get("alias") alias := r.FormValue("alias")
l.Debug().Msgf("Alias: %s", alias)
if alias == "" { if alias == "" {
l.Debug().Msg("SetPrimaryAliasHandler: Missing alias parameter") l.Debug().Msg("SetPrimaryAliasHandler: Missing alias parameter")
@ -268,7 +283,6 @@ func SetPrimaryAliasHandler(store db.DB) http.HandlerFunc {
} }
var id int var id int
var err error
if artistIDStr != "" { if artistIDStr != "" {
id, err = strconv.Atoi(artistIDStr) id, err = strconv.Atoi(artistIDStr)
if err != nil { if err != nil {

@ -139,7 +139,14 @@ func UpdateApiKeyLabelHandler(store db.DB) http.HandlerFunc {
return return
} }
idStr := r.URL.Query().Get("id") err := r.ParseForm()
if err != nil {
l.Debug().Msg("UpdateApiKeyLabelHandler: Failed to parse form")
utils.WriteError(w, "form is invalid", http.StatusBadRequest)
return
}
idStr := r.FormValue("id")
if idStr == "" { if idStr == "" {
l.Debug().Msg("UpdateApiKeyLabelHandler: Missing id parameter") l.Debug().Msg("UpdateApiKeyLabelHandler: Missing id parameter")
utils.WriteError(w, "id is required", http.StatusBadRequest) utils.WriteError(w, "id is required", http.StatusBadRequest)

@ -81,7 +81,7 @@ func bindRoutes(
r.Delete("/track", handlers.DeleteTrackHandler(db)) r.Delete("/track", handlers.DeleteTrackHandler(db))
r.Delete("/listen", handlers.DeleteListenHandler(db)) r.Delete("/listen", handlers.DeleteListenHandler(db))
r.Post("/aliases", handlers.CreateAliasHandler(db)) r.Post("/aliases", handlers.CreateAliasHandler(db))
r.Delete("/aliases", handlers.DeleteAliasHandler(db)) r.Post("/aliases/delete", handlers.DeleteAliasHandler(db))
r.Post("/aliases/primary", handlers.SetPrimaryAliasHandler(db)) r.Post("/aliases/primary", handlers.SetPrimaryAliasHandler(db))
r.Get("/user/apikeys", handlers.GetApiKeysHandler(db)) r.Get("/user/apikeys", handlers.GetApiKeysHandler(db))
r.Post("/user/apikeys", handlers.GenerateApiKeyHandler(db)) r.Post("/user/apikeys", handlers.GenerateApiKeyHandler(db))

Loading…
Cancel
Save