diff --git a/server/subsonic/api.go b/server/subsonic/api.go index 94d00fa3e..d969d6600 100644 --- a/server/subsonic/api.go +++ b/server/subsonic/api.go @@ -68,13 +68,12 @@ func (api *Router) routes() http.Handler { H(r, "getIndexes", c.GetIndexes) H(r, "getArtists", c.GetArtists) H(r, "getGenres", c.GetGenres) - reqParams := r.With(requiredParams("id")) - H(reqParams, "getMusicDirectory", c.GetMusicDirectory) - H(reqParams, "getArtist", c.GetArtist) - H(reqParams, "getAlbum", c.GetAlbum) - H(reqParams, "getSong", c.GetSong) - H(reqParams, "getArtistInfo", c.GetArtistInfo) - H(reqParams, "getArtistInfo2", c.GetArtistInfo2) + H(r, "getMusicDirectory", c.GetMusicDirectory) + H(r, "getArtist", c.GetArtist) + H(r, "getAlbum", c.GetAlbum) + H(r, "getSong", c.GetSong) + H(r, "getArtistInfo", c.GetArtistInfo) + H(r, "getArtistInfo2", c.GetArtistInfo2) }) r.Group(func(r chi.Router) { c := initAlbumListController(api) diff --git a/server/subsonic/middlewares.go b/server/subsonic/middlewares.go index 5459fffb3..32b612cb6 100644 --- a/server/subsonic/middlewares.go +++ b/server/subsonic/middlewares.go @@ -89,18 +89,3 @@ func authenticate(users engine.Users) func(next http.Handler) http.Handler { }) } } - -func requiredParams(params ...string) func(next http.Handler) http.Handler { - return func(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - for _, p := range params { - _, err := RequiredParamString(r, p, fmt.Sprintf("%s parameter is required", p)) - if err != nil { - SendError(w, r, err) - return - } - } - next.ServeHTTP(w, r) - }) - } -}