Skip to content

Preserve api_key and app_name query params after redirect #690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raymondjacobson merged 1 commit into from
Mar 5, 2026
Merged

Preserve api_key and app_name query params after redirect #690

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions api/v1_resolve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,26 @@ import (
"github.com/gofiber/fiber/v2"
)

// Params to preserve when redirecting (e.g. app_name, api_key for rate limiting/attribution)
var resolvePreservedParams = map[string]bool{
"app_name": true,
"api_key": true,
}

// redirectWithPreservedParams redirects to path with app_name, api_key, etc. preserved from the request.
func (app *ApiServer) redirectWithPreservedParams(c *fiber.Ctx, path string, status int) error {
q := make(url.Values)
for k := range resolvePreservedParams {
if v := c.Query(k); v != "" {
q.Set(k, v)
}
}
if len(q) > 0 {
path = path + "?" + q.Encode()
}
return c.Redirect(path, status)
}

var (
trackURLRegex = regexp.MustCompile(`^/?(?P<handle>[^/]+)/(?P<slug>[^/]+)$`)
playlistURLRegex = regexp.MustCompile(`/?(?P<handle>[^/]+)/(?P<playlistType>playlist|album)/(?P<slug>[^/]+)$`)
Expand Down Expand Up @@ -51,9 +71,9 @@ func (app *ApiServer) v1Resolve(c *fiber.Ctx) error {
}

if isFull {
return c.Redirect("/v1/full/tracks/"+trackId, fiber.StatusFound)
return app.redirectWithPreservedParams(c, "/v1/full/tracks/"+trackId, fiber.StatusFound)
}
return c.Redirect("/v1/tracks/"+trackId, fiber.StatusFound)
return app.redirectWithPreservedParams(c, "/v1/tracks/"+trackId, fiber.StatusFound)
}

// Try to match playlist URL
Expand All @@ -76,9 +96,9 @@ func (app *ApiServer) v1Resolve(c *fiber.Ctx) error {
}

if isFull {
return c.Redirect("/v1/full/playlists/"+playlistId, fiber.StatusFound)
return app.redirectWithPreservedParams(c, "/v1/full/playlists/"+playlistId, fiber.StatusFound)
}
return c.Redirect("/v1/playlists/"+playlistId, fiber.StatusFound)
return app.redirectWithPreservedParams(c, "/v1/playlists/"+playlistId, fiber.StatusFound)
}

// Try to match user URL
Expand All @@ -97,9 +117,9 @@ func (app *ApiServer) v1Resolve(c *fiber.Ctx) error {
}

if isFull {
return c.Redirect("/v1/full/users/"+userId, fiber.StatusFound)
return app.redirectWithPreservedParams(c, "/v1/full/users/"+userId, fiber.StatusFound)
}
return c.Redirect("/v1/users/"+userId, fiber.StatusFound)
return app.redirectWithPreservedParams(c, "/v1/users/"+userId, fiber.StatusFound)
}

return fiber.NewError(fiber.StatusNotFound, "URL not found")
Expand Down