mirror of
https://github.com/navidrome/navidrome.git
synced 2026-10-26 02:07:18 +01:00
* fix(jellyfin): match Jellyfin's item payloads so strict clients can sync Manet (iOS/macOS) aborted its whole library sync on the first item that was missing a key its decoder requires, leaving the library empty (#6147). Every gap was a field real Jellyfin always sends: - dates now use .NET's round-trip layout with 7 fractional digits, which Manet requires and plain RFC3339 failed - playlists carry SortName/DateCreated, and every item carries MediaType, ImageTags, ChannelId and, when Fields asks, Genres/GenreItems/Tags - albums carry Artists and LocationType; songs always carry HasLyrics - the library view is a full CollectionFolder (ChildCount, DateCreated, SortName, Path, LocationType, UserData), read from the library rows rather than the user projection, which has no counts - IncludeItemTypes matches case-insensitively and returns nothing for Jellyfin kinds Navidrome has none of, instead of falling back to every album Verified against a real Jellyfin 10.10.7 server and a live Manet client. * refactor(jellyfin): fold the repeated empty-list defaults into one helper The three mappers each initialised Genres/GenreItems/Tags the same way, and the e2e suite grew three near-identical specs walking every item type. Both now go through a single helper and one table. * refactor(jellyfin): fill the always-present item fields at the serialization edge The defaults real Jellyfin puts on every item were spread across three mappers, so item types nobody had tested yet (playlists, genres, the library view) still shipped payloads a strict client rejects. stampItem now takes the request's Fields and fills them for every item, which is provably the only path to JSON. Also drops the hand-copied BaseItemKind list: only an absent IncludeItemTypes defaults to albums now, so any type Navidrome does not serve returns nothing, as it would from Jellyfin. The synthetic playlists folder matches case-insensitively like the rest, /Items/{libraryId} reads the full library row instead of the count-less user projection, and PremiereDate and LastPlayedDate go through jellyfinDate rather than spelling the layout out again.
156 lines
5.9 KiB
Go
156 lines
5.9 KiB
Go
package jellyfin
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"time"
|
|
|
|
"github.com/navidrome/navidrome/conf"
|
|
"github.com/navidrome/navidrome/conf/configtest"
|
|
"github.com/navidrome/navidrome/model"
|
|
"github.com/navidrome/navidrome/model/request"
|
|
"github.com/navidrome/navidrome/server/jellyfin/dto"
|
|
"github.com/navidrome/navidrome/tests"
|
|
. "github.com/onsi/ginkgo/v2"
|
|
. "github.com/onsi/gomega"
|
|
)
|
|
|
|
var _ = Describe("Users", func() {
|
|
var api *Router
|
|
// The repo holds the full rows; the user carries the id/name-only copy its projection returns.
|
|
authedWithLibraries := func(r *http.Request, libs model.Libraries) *http.Request {
|
|
api.ds.Library(context.Background()).(*tests.MockLibraryRepo).SetData(libs)
|
|
stripped := make(model.Libraries, len(libs))
|
|
for i, lib := range libs {
|
|
stripped[i] = model.Library{ID: lib.ID, Name: lib.Name}
|
|
}
|
|
ctx := request.WithUser(context.Background(), model.User{ID: testID("u1"), UserName: "alice", Libraries: stripped})
|
|
return r.WithContext(ctx)
|
|
}
|
|
BeforeEach(func() { api = &Router{ds: &tests.MockDataStore{}} })
|
|
|
|
Describe("getUserViews", func() {
|
|
It("returns one view per accessible library", func() {
|
|
libs := model.Libraries{{ID: 1, Name: "Music"}, {ID: 2, Name: "Podcasts"}}
|
|
w := httptest.NewRecorder()
|
|
api.getUserViews(w, authedWithLibraries(httptest.NewRequest("GET", "/UserViews", nil), libs))
|
|
Expect(w.Code).To(Equal(http.StatusOK))
|
|
var res dto.QueryResult
|
|
Expect(json.Unmarshal(w.Body.Bytes(), &res)).To(Succeed())
|
|
Expect(res.Items).To(HaveLen(2))
|
|
Expect(res.TotalRecordCount).To(Equal(2))
|
|
|
|
Expect(res.Items[0].Id).To(Equal(dto.EncodeLibraryID(1)))
|
|
Expect(res.Items[0].Name).To(Equal("Music"))
|
|
Expect(res.Items[0].Type).To(Equal("CollectionFolder"))
|
|
Expect(res.Items[0].CollectionType).To(Equal("music"))
|
|
Expect(res.Items[0].IsFolder).To(BeTrue())
|
|
|
|
Expect(res.Items[1].Id).To(Equal(dto.EncodeLibraryID(2)))
|
|
Expect(res.Items[1].Name).To(Equal("Podcasts"))
|
|
})
|
|
|
|
// Manet keeps no library, and so syncs no artists/albums/tracks, when these are missing.
|
|
It("describes the library like Jellyfin's CollectionFolder", func() {
|
|
created := time.Date(2026, 7, 1, 12, 0, 0, 0, time.UTC)
|
|
libs := model.Libraries{{ID: 1, Name: "Music", Path: "/music", TotalAlbums: 42, CreatedAt: created}}
|
|
w := httptest.NewRecorder()
|
|
api.getUserViews(w, authedWithLibraries(httptest.NewRequest("GET", "/UserViews", nil), libs))
|
|
var res dto.QueryResult
|
|
Expect(json.Unmarshal(w.Body.Bytes(), &res)).To(Succeed())
|
|
|
|
item := res.Items[0]
|
|
Expect(*item.ChildCount).To(Equal(42))
|
|
Expect(item.DateCreated).To(Equal("2026-07-01T12:00:00.0000000Z"))
|
|
Expect(item.SortName).To(Equal("Music"))
|
|
Expect(item.Path).To(Equal("/music"))
|
|
Expect(item.LocationType).To(Equal("FileSystem"))
|
|
Expect(item.UserData).ToNot(BeNil())
|
|
Expect(item.UserData.ItemId).To(Equal(dto.EncodeLibraryID(1)))
|
|
})
|
|
|
|
It("returns a single view for a user with one library", func() {
|
|
libs := model.Libraries{{ID: 1, Name: "Music"}}
|
|
w := httptest.NewRecorder()
|
|
api.getUserViews(w, authedWithLibraries(httptest.NewRequest("GET", "/UserViews", nil), libs))
|
|
Expect(w.Code).To(Equal(http.StatusOK))
|
|
var res dto.QueryResult
|
|
Expect(json.Unmarshal(w.Body.Bytes(), &res)).To(Succeed())
|
|
Expect(res.Items).To(HaveLen(1))
|
|
Expect(res.Items[0].Id).To(Equal(dto.EncodeLibraryID(1)))
|
|
})
|
|
|
|
It("returns no views for a user with no library access", func() {
|
|
w := httptest.NewRecorder()
|
|
api.getUserViews(w, authedWithLibraries(httptest.NewRequest("GET", "/UserViews", nil), nil))
|
|
Expect(w.Code).To(Equal(http.StatusOK))
|
|
var res dto.QueryResult
|
|
Expect(json.Unmarshal(w.Body.Bytes(), &res)).To(Succeed())
|
|
Expect(res.Items).To(HaveLen(0))
|
|
Expect(res.TotalRecordCount).To(Equal(0))
|
|
})
|
|
})
|
|
|
|
It("returns the current user", func() {
|
|
w := httptest.NewRecorder()
|
|
api.getCurrentUser(w, authedWithLibraries(httptest.NewRequest("GET", "/Users/Me", nil), nil))
|
|
var u dto.UserDto
|
|
Expect(json.Unmarshal(w.Body.Bytes(), &u)).To(Succeed())
|
|
Expect(u.Name).To(Equal("alice"))
|
|
Expect(u.Policy).ToNot(BeNil())
|
|
Expect(u.Policy.IsAdministrator).To(BeFalse())
|
|
Expect(u.Configuration).ToNot(BeNil())
|
|
})
|
|
|
|
Describe("getPublicUsers", func() {
|
|
var ur *tests.MockedUserRepo
|
|
publicUsers := func() []dto.UserDto {
|
|
w := httptest.NewRecorder()
|
|
api.getPublicUsers(w, httptest.NewRequest("GET", "/Users/Public", nil))
|
|
Expect(w.Code).To(Equal(http.StatusOK))
|
|
var users []dto.UserDto
|
|
Expect(json.Unmarshal(w.Body.Bytes(), &users)).To(Succeed())
|
|
return users
|
|
}
|
|
|
|
BeforeEach(func() {
|
|
DeferCleanup(configtest.SetupConfig())
|
|
ur = api.ds.User(context.Background()).(*tests.MockedUserRepo)
|
|
Expect(ur.Put(&model.User{ID: testID("u1"), UserName: "alice"})).To(Succeed())
|
|
Expect(ur.Put(&model.User{ID: testID("u2"), UserName: "bob"})).To(Succeed())
|
|
})
|
|
|
|
It("returns an empty list when the config is unset", func() {
|
|
conf.Server.Jellyfin.ExposedPublicUsers = ""
|
|
Expect(publicUsers()).To(BeEmpty())
|
|
})
|
|
|
|
It("lists the configured users in order, without leaking policy", func() {
|
|
conf.Server.Jellyfin.ExposedPublicUsers = "bob, alice"
|
|
users := publicUsers()
|
|
Expect(users).To(HaveLen(2))
|
|
Expect(users[0].Name).To(Equal("bob"))
|
|
Expect(users[0].Id).To(Equal(dto.EncodeID(testID("u2"))))
|
|
Expect(users[1].Name).To(Equal("alice"))
|
|
// The public list must not expose Policy/Configuration to unauthenticated callers.
|
|
Expect(users[0].Policy).To(BeNil())
|
|
Expect(users[0].Configuration).To(BeNil())
|
|
})
|
|
|
|
It("skips a configured username that does not exist", func() {
|
|
conf.Server.Jellyfin.ExposedPublicUsers = "alice,ghost"
|
|
users := publicUsers()
|
|
Expect(users).To(HaveLen(1))
|
|
Expect(users[0].Name).To(Equal("alice"))
|
|
})
|
|
|
|
It("matches usernames case-insensitively and de-duplicates", func() {
|
|
conf.Server.Jellyfin.ExposedPublicUsers = "ALICE, alice"
|
|
users := publicUsers()
|
|
Expect(users).To(HaveLen(1))
|
|
Expect(users[0].Name).To(Equal("alice"))
|
|
})
|
|
})
|
|
})
|