🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
remove built-in Spotify integration (#5197)
Deluan Quintão69e7d163fc00
diff --git a/adapters/spotify/client.go b/adapters/spotify/client.godeleted file mode 100644index 975175930..000000000--- a/adapters/spotify/client.go+++ /dev/null@@ -1,116 +0,0 @@-package spotify--import (- "context"- "encoding/base64"- "encoding/json"- "errors"- "fmt"- "io"- "net/http"- "net/url"- "strconv"- "strings"-- "github.com/navidrome/navidrome/log"-)--const apiBaseUrl = "https://api.spotify.com/v1/"--var (- ErrNotFound = errors.New("spotify: not found")-)--type httpDoer interface {- Do(req *http.Request) (*http.Response, error)-}--func newClient(id, secret string, hc httpDoer) *client {- return &client{id, secret, hc}-}--type client struct {- id string- secret string- hc httpDoer-}--func (c *client) searchArtists(ctx context.Context, name string, limit int) ([]Artist, error) {- token, err := c.authorize(ctx)- if err != nil {- return nil, err- }-- params := url.Values{}- params.Add("type", "artist")- params.Add("q", name)- params.Add("offset", "0")- params.Add("limit", strconv.Itoa(limit))- req, _ := http.NewRequestWithContext(ctx, "GET", apiBaseUrl+"search", nil)- req.URL.RawQuery = params.Encode()- req.Header.Add("Authorization", "Bearer "+token)-- var results SearchResults- err = c.makeRequest(req, &results)- if err != nil {- return nil, err- }-- if len(results.Artists.Items) == 0 {- return nil, ErrNotFound- }- return results.Artists.Items, err-}--func (c *client) authorize(ctx context.Context) (string, error) {- payload := url.Values{}- payload.Add("grant_type", "client_credentials")-- encodePayload := payload.Encode()- req, _ := http.NewRequestWithContext(ctx, "POST", "https://accounts.spotify.com/api/token", strings.NewReader(encodePayload))- req.Header.Add("Content-Type", "application/x-www-form-urlencoded")- req.Header.Add("Content-Length", strconv.Itoa(len(encodePayload)))- auth := c.id + ":" + c.secret- req.Header.Add("Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(auth)))-- response := map[string]any{}- err := c.makeRequest(req, &response)- if err != nil {- return "", err- }-- if v, ok := response["access_token"]; ok {- return v.(string), nil- }- log.Error(ctx, "Invalid spotify response", "resp", response)- return "", errors.New("invalid response")-}--func (c *client) makeRequest(req *http.Request, response any) error {- log.Trace(req.Context(), fmt.Sprintf("Sending Spotify %s request", req.Method), "url", req.URL)- resp, err := c.hc.Do(req)- if err != nil {- return err- }-- defer resp.Body.Close()- data, err := io.ReadAll(resp.Body)- if err != nil {- return err- }-- if resp.StatusCode != 200 {- return c.parseError(data)- }-- return json.Unmarshal(data, response)-}--func (c *client) parseError(data []byte) error {- var e Error- err := json.Unmarshal(data, &e)- if err != nil {- return err- }- return fmt.Errorf("spotify error(%s): %s", e.Code, e.Message)-}diff --git a/adapters/spotify/client_test.go b/adapters/spotify/client_test.godeleted file mode 100644index 2782d2122..000000000--- a/adapters/spotify/client_test.go+++ /dev/null@@ -1,131 +0,0 @@-package spotify--import (- "bytes"- "context"- "io"- "net/http"- "os"-- . "github.com/onsi/ginkgo/v2"- . "github.com/onsi/gomega"-)--var _ = Describe("client", func() {- var httpClient *fakeHttpClient- var client *client-- BeforeEach(func() {- httpClient = &fakeHttpClient{}- client = newClient("SPOTIFY_ID", "SPOTIFY_SECRET", httpClient)- })-- Describe("ArtistImages", func() {- It("returns artist images from a successful request", func() {- f, _ := os.Open("tests/fixtures/spotify.search.artist.json")- httpClient.mock("https://api.spotify.com/v1/search", http.Response{Body: f, StatusCode: 200})- httpClient.mock("https://accounts.spotify.com/api/token", http.Response{- StatusCode: 200,- Body: io.NopCloser(bytes.NewBufferString(`{"access_token": "NEW_ACCESS_TOKEN","token_type": "Bearer","expires_in": 3600}`)),- })-- artists, err := client.searchArtists(context.TODO(), "U2", 10)- Expect(err).To(BeNil())- Expect(artists).To(HaveLen(20))- Expect(artists[0].Popularity).To(Equal(82))-- images := artists[0].Images- Expect(images).To(HaveLen(3))- Expect(images[0].Width).To(Equal(640))- Expect(images[1].Width).To(Equal(320))- Expect(images[2].Width).To(Equal(160))- })-- It("fails if artist was not found", func() {- httpClient.mock("https://api.spotify.com/v1/search", http.Response{- StatusCode: 200,- Body: io.NopCloser(bytes.NewBufferString(`{- "artists" : {- "href" : "https://api.spotify.com/v1/search?query=dasdasdas%2Cdna&type=artist&offset=0&limit=20",- "items" : [ ], "limit" : 20, "next" : null, "offset" : 0, "previous" : null, "total" : 0- }}`)),- })- httpClient.mock("https://accounts.spotify.com/api/token", http.Response{- StatusCode: 200,- Body: io.NopCloser(bytes.NewBufferString(`{"access_token": "NEW_ACCESS_TOKEN","token_type": "Bearer","expires_in": 3600}`)),- })-- _, err := client.searchArtists(context.TODO(), "U2", 10)- Expect(err).To(MatchError(ErrNotFound))- })-- It("fails if not able to authorize", func() {- f, _ := os.Open("tests/fixtures/spotify.search.artist.json")- httpClient.mock("https://api.spotify.com/v1/search", http.Response{Body: f, StatusCode: 200})- httpClient.mock("https://accounts.spotify.com/api/token", http.Response{- StatusCode: 400,- Body: io.NopCloser(bytes.NewBufferString(`{"error":"invalid_client","error_description":"Invalid client"}`)),- })-- _, err := client.searchArtists(context.TODO(), "U2", 10)- Expect(err).To(MatchError("spotify error(invalid_client): Invalid client"))- })- })-- Describe("authorize", func() {- It("returns an access_token on successful authorization", func() {- httpClient.mock("https://accounts.spotify.com/api/token", http.Response{- StatusCode: 200,- Body: io.NopCloser(bytes.NewBufferString(`{"access_token": "NEW_ACCESS_TOKEN","token_type": "Bearer","expires_in": 3600}`)),- })-- token, err := client.authorize(context.TODO())- Expect(err).To(BeNil())- Expect(token).To(Equal("NEW_ACCESS_TOKEN"))- auth := httpClient.lastRequest.Header.Get("Authorization")- Expect(auth).To(Equal("Basic U1BPVElGWV9JRDpTUE9USUZZX1NFQ1JFVA=="))- })-- It("fails on unsuccessful authorization", func() {- httpClient.mock("https://accounts.spotify.com/api/token", http.Response{- StatusCode: 400,- Body: io.NopCloser(bytes.NewBufferString(`{"error":"invalid_client","error_description":"Invalid client"}`)),- })-- _, err := client.authorize(context.TODO())- Expect(err).To(MatchError("spotify error(invalid_client): Invalid client"))- })-- It("fails on invalid JSON response", func() {- httpClient.mock("https://accounts.spotify.com/api/token", http.Response{- StatusCode: 200,- Body: io.NopCloser(bytes.NewBufferString(`{NOT_VALID}`)),- })-- _, err := client.authorize(context.TODO())- Expect(err).To(MatchError("invalid character 'N' looking for beginning of object key string"))- })- })-})--type fakeHttpClient struct {- responses map[string]*http.Response- lastRequest *http.Request-}--func (c *fakeHttpClient) mock(url string, response http.Response) {- if c.responses == nil {- c.responses = make(map[string]*http.Response)- }- c.responses[url] = &response-}--func (c *fakeHttpClient) Do(req *http.Request) (*http.Response, error) {- c.lastRequest = req- u := req.URL- u.RawQuery = ""- if resp, ok := c.responses[u.String()]; ok {- return resp, nil- }- panic("URL not mocked: " + u.String())-}diff --git a/adapters/spotify/responses.go b/adapters/spotify/responses.godeleted file mode 100644index 21166bf74..000000000--- a/adapters/spotify/responses.go+++ /dev/null@@ -1,30 +0,0 @@-package spotify--type SearchResults struct {- Artists ArtistsResult `json:"artists"`-}--type ArtistsResult struct {- HRef string `json:"href"`- Items []Artist `json:"items"`-}--type Artist struct {- Genres []string `json:"genres"`- HRef string `json:"href"`- ID string `json:"id"`- Popularity int `json:"popularity"`- Images []Image `json:"images"`- Name string `json:"name"`-}--type Image struct {- URL string `json:"url"`- Width int `json:"width"`- Height int `json:"height"`-}--type Error struct {- Code string `json:"error"`- Message string `json:"error_description"`-}diff --git a/adapters/spotify/responses_test.go b/adapters/spotify/responses_test.godeleted file mode 100644index 704119816..000000000--- a/adapters/spotify/responses_test.go+++ /dev/null@@ -1,48 +0,0 @@-package spotify--import (- "encoding/json"- "os"-- . "github.com/onsi/ginkgo/v2"- . "github.com/onsi/gomega"-)--var _ = Describe("Responses", func() {- Describe("Search type=artist", func() {- It("parses the artist search result correctly ", func() {- var resp SearchResults- body, _ := os.ReadFile("tests/fixtures/spotify.search.artist.json")- err := json.Unmarshal(body, &resp)- Expect(err).To(BeNil())-- Expect(resp.Artists.Items).To(HaveLen(20))- u2 := resp.Artists.Items[0]- Expect(u2.Name).To(Equal("U2"))- Expect(u2.Genres).To(ContainElements("irish rock", "permanent wave", "rock"))- Expect(u2.ID).To(Equal("51Blml2LZPmy7TTiAg47vQ"))- Expect(u2.HRef).To(Equal("https://api.spotify.com/v1/artists/51Blml2LZPmy7TTiAg47vQ"))- Expect(u2.Images[0].URL).To(Equal("https://i.scdn.co/image/e22d5c0c8139b8439440a69854ed66efae91112d"))- Expect(u2.Images[0].Width).To(Equal(640))- Expect(u2.Images[0].Height).To(Equal(640))- Expect(u2.Images[1].URL).To(Equal("https://i.scdn.co/image/40d6c5c14355cfc127b70da221233315497ec91d"))- Expect(u2.Images[1].Width).To(Equal(320))- Expect(u2.Images[1].Height).To(Equal(320))- Expect(u2.Images[2].URL).To(Equal("https://i.scdn.co/image/7293d6752ae8a64e34adee5086858e408185b534"))- Expect(u2.Images[2].Width).To(Equal(160))- Expect(u2.Images[2].Height).To(Equal(160))- })- })-- Describe("Error", func() {- It("parses the error response correctly", func() {- var errorResp Error- body := []byte(`{"error":"invalid_client","error_description":"Invalid client"}`)- err := json.Unmarshal(body, &errorResp)- Expect(err).To(BeNil())-- Expect(errorResp.Code).To(Equal("invalid_client"))- Expect(errorResp.Message).To(Equal("Invalid client"))- })- })-})diff --git a/adapters/spotify/spotify.go b/adapters/spotify/spotify.godeleted file mode 100644index 633c32984..000000000--- a/adapters/spotify/spotify.go+++ /dev/null@@ -1,96 +0,0 @@-package spotify--import (- "context"- "errors"- "fmt"- "net/http"- "sort"- "strings"-- "github.com/navidrome/navidrome/conf"- "github.com/navidrome/navidrome/consts"- "github.com/navidrome/navidrome/core/agents"- "github.com/navidrome/navidrome/log"- "github.com/navidrome/navidrome/model"- "github.com/navidrome/navidrome/utils/cache"- "github.com/xrash/smetrics"-)--const spotifyAgentName = "spotify"--type spotifyAgent struct {- ds model.DataStore- id string- secret string- client *client-}--func spotifyConstructor(ds model.DataStore) agents.Interface {- if conf.Server.Spotify.ID == "" || conf.Server.Spotify.Secret == "" {- return nil- }- l := &spotifyAgent{- ds: ds,- id: conf.Server.Spotify.ID,- secret: conf.Server.Spotify.Secret,- }- hc := &http.Client{- Timeout: consts.DefaultHttpClientTimeOut,- }- chc := cache.NewHTTPClient(hc, consts.DefaultHttpClientTimeOut)- l.client = newClient(l.id, l.secret, chc)- return l-}--func (s *spotifyAgent) AgentName() string {- return spotifyAgentName-}--func (s *spotifyAgent) GetArtistImages(ctx context.Context, id, name, mbid string) ([]agents.ExternalImage, error) {- a, err := s.searchArtist(ctx, name)- if err != nil {- if errors.Is(err, model.ErrNotFound) {- log.Warn(ctx, "Artist not found in Spotify", "artist", name)- } else {- log.Error(ctx, "Error calling Spotify", "artist", name, err)- }- return nil, err- }-- var res []agents.ExternalImage- for _, img := range a.Images {- res = append(res, agents.ExternalImage{- URL: img.URL,- Size: img.Width,- })- }- return res, nil-}--func (s *spotifyAgent) searchArtist(ctx context.Context, name string) (*Artist, error) {- artists, err := s.client.searchArtists(ctx, name, 40)- if err != nil || len(artists) == 0 {- return nil, model.ErrNotFound- }- name = strings.ToLower(name)-- // Sort results, prioritizing artists with images, with similar names and with high popularity, in this order- sort.Slice(artists, func(i, j int) bool {- ai := fmt.Sprintf("%-5t-%03d-%04d", len(artists[i].Images) == 0, smetrics.WagnerFischer(name, strings.ToLower(artists[i].Name), 1, 1, 2), 1000-artists[i].Popularity)- aj := fmt.Sprintf("%-5t-%03d-%04d", len(artists[j].Images) == 0, smetrics.WagnerFischer(name, strings.ToLower(artists[j].Name), 1, 1, 2), 1000-artists[j].Popularity)- return ai < aj- })-- // If the first one has the same name, that's the one- if strings.ToLower(artists[0].Name) != name {- return nil, model.ErrNotFound- }- return &artists[0], err-}--func init() {- conf.AddHook(func() {- agents.Register(spotifyAgentName, spotifyConstructor)- })-}diff --git a/adapters/spotify/spotify_suite_test.go b/adapters/spotify/spotify_suite_test.godeleted file mode 100644index 275b05e73..000000000--- a/adapters/spotify/spotify_suite_test.go+++ /dev/null@@ -1,17 +0,0 @@-package spotify--import (- "testing"-- "github.com/navidrome/navidrome/log"- "github.com/navidrome/navidrome/tests"- . "github.com/onsi/ginkgo/v2"- . "github.com/onsi/gomega"-)--func TestSpotify(t *testing.T) {- tests.Init(t, false)- log.SetLevel(log.LevelFatal)- RegisterFailHandler(Fail)- RunSpecs(t, "Spotify Test Suite")-}diff --git a/cmd/root.go b/cmd/root.goindex ff9a574ee..5fdb591ff 100644--- a/cmd/root.go+++ b/cmd/root.go@@ -27,7 +27,6 @@ import (_ "github.com/navidrome/navidrome/adapters/gotaglib"_ "github.com/navidrome/navidrome/adapters/lastfm"_ "github.com/navidrome/navidrome/adapters/listenbrainz"- _ "github.com/navidrome/navidrome/adapters/spotify"_ "github.com/navidrome/navidrome/adapters/taglib")diff --git a/cmd/wire_gen.go b/cmd/wire_gen.goindex d045c12ec..c2f6edaf8 100644--- a/cmd/wire_gen.go+++ b/cmd/wire_gen.go@@ -39,7 +39,6 @@ import (_ "github.com/navidrome/navidrome/adapters/gotaglib"_ "github.com/navidrome/navidrome/adapters/lastfm"_ "github.com/navidrome/navidrome/adapters/listenbrainz"- _ "github.com/navidrome/navidrome/adapters/spotify"_ "github.com/navidrome/navidrome/adapters/taglib")diff --git a/conf/configuration.go b/conf/configuration.goindex dc5fd1b59..986ab7a5a 100644--- a/conf/configuration.go+++ b/conf/configuration.go@@ -105,7 +105,6 @@ type configOptions struct {Inspect inspectOptions `json:",omitzero"`Subsonic subsonicOptions `json:",omitzero"`LastFM lastfmOptions `json:",omitzero"`- Spotify spotifyOptions `json:",omitzero"`Deezer deezerOptions `json:",omitzero"`ListenBrainz listenBrainzOptions `json:",omitzero"`EnableScrobbleHistory bool@@ -187,11 +186,6 @@ type lastfmOptions struct {Languages []string // Computed from Language, split by comma}-type spotifyOptions struct {- ID string- Secret string //nolint:gosec-}-type deezerOptions struct {Enabled boolLanguage string@@ -411,6 +405,7 @@ func Load(noConfigDump bool) {// Parse Deezer.Language into Languages slice (comma-separated, with fallback to DefaultInfoLanguage)Server.Deezer.Languages = parseLanguages(Server.Deezer.Language)+ // Deprecated optionslogDeprecatedOptions("Scanner.GenreSeparators", "")logDeprecatedOptions("Scanner.GroupAlbumReleases", "")logDeprecatedOptions("DevEnableBufferedScrobble", "") // Deprecated: Buffered scrobbling is now always enabled and this option is ignored@@ -420,6 +415,9 @@ func Load(noConfigDump bool) {logDeprecatedOptions("HTTPSecurityHeaders.CustomFrameOptionsValue", "HTTPHeaders.FrameOptions")logDeprecatedOptions("CoverJpegQuality", "CoverArtQuality")+ // Removed options+ logRemovedOptions("Spotify.ID", "Spotify.Secret")+// Call init hooksfor _, hook := range hooks {hook()@@ -444,6 +442,23 @@ func logDeprecatedOptions(oldName, newName string) {}}+// logRemovedOptions checks if the option is set, and if yes, outputs a warning message saying the option is+// not available anymore+func logRemovedOptions(options ...string) {+ for _, option := range options {+ envVar := "ND_" + strings.ToUpper(strings.ReplaceAll(option, ".", "_"))+ logWarning := func(option string) {+ log.Warn(fmt.Sprintf("Option '%s' is not available anymore and will be ignored. Please remove it from your config", option))+ }+ if viper.InConfig(option) {+ logWarning(option)+ }+ if os.Getenv(envVar) != "" {+ logWarning(envVar)+ }+ }+}+// mapDeprecatedOption is used to provide backwards compatibility for deprecated options. It should be called after// the config has been read by viper, but before unmarshalling it into the Config struct.func mapDeprecatedOption(legacyName, newName string) {@@ -482,7 +497,6 @@ func disableExternalServices() {Server.EnableInsightsCollector = falseServer.EnableM3UExternalAlbumArt = falseServer.LastFM.Enabled = false- Server.Spotify.ID = ""Server.Deezer.Enabled = falseServer.ListenBrainz.Enabled = falseServer.Agents = ""@@ -712,14 +726,12 @@ func setViperDefaults() {viper.SetDefault("subsonic.enableaveragerating", true)viper.SetDefault("subsonic.legacyclients", "DSub")viper.SetDefault("subsonic.minimalclients", "SubMusic")- viper.SetDefault("agents", "deezer,lastfm,spotify")+ viper.SetDefault("agents", "deezer,lastfm,listenbrainz")viper.SetDefault("lastfm.enabled", true)viper.SetDefault("lastfm.language", consts.DefaultInfoLanguage)viper.SetDefault("lastfm.apikey", "")viper.SetDefault("lastfm.secret", "")viper.SetDefault("lastfm.scrobblefirstartistonly", false)- viper.SetDefault("spotify.id", "")- viper.SetDefault("spotify.secret", "")viper.SetDefault("deezer.enabled", true)viper.SetDefault("deezer.language", consts.DefaultInfoLanguage)viper.SetDefault("listenbrainz.enabled", true)diff --git a/core/agents/README.md b/core/agents/README.mdindex 1a3a8e96e..cce62889c 100644--- a/core/agents/README.md+++ b/core/agents/README.md@@ -7,6 +7,6 @@ A new agent must comply with these simple implementation rules:2) Implement one or more of the `*Retriever()` interfaces. That's where the agent's logic resides.3) Register itself (in its `init()` function).-For an agent to be used it needs to be listed in the `Agents` config option (default is `"lastfm,spotify"`). The order dictates the priority of the agents+For an agent to be used it needs to be listed in the `Agents` config option (default is `"deezer,lastfm"`). The order dictates the priority of the agentsFor a simple Agent example, look at the [local_agent](local_agent.go) agent source code.diff --git a/core/artwork/reader_artist.go b/core/artwork/reader_artist.goindex 9905039be..990942d87 100644--- a/core/artwork/reader_artist.go+++ b/core/artwork/reader_artist.go@@ -79,7 +79,7 @@ func newArtistArtworkReader(ctx context.Context, artwork *artwork, artID model.A}func (a *artistReader) Key() string {- hash := md5.Sum([]byte(conf.Server.Agents + conf.Server.Spotify.ID))+ hash := md5.Sum([]byte(conf.Server.Agents))return fmt.Sprintf("%s.%t.%x",a.cacheKey.Key(),diff --git a/core/external/provider_topsongs_test.go b/core/external/provider_topsongs_test.goindex 0e513aa37..b73c8ab3e 100644--- a/core/external/provider_topsongs_test.go+++ b/core/external/provider_topsongs_test.go@@ -6,7 +6,6 @@ import (_ "github.com/navidrome/navidrome/adapters/lastfm"_ "github.com/navidrome/navidrome/adapters/listenbrainz"- _ "github.com/navidrome/navidrome/adapters/spotify""github.com/navidrome/navidrome/conf""github.com/navidrome/navidrome/conf/configtest""github.com/navidrome/navidrome/core/agents"diff --git a/core/metrics/insights.go b/core/metrics/insights.goindex f059d739a..5f3f491ea 100644--- a/core/metrics/insights.go+++ b/core/metrics/insights.go@@ -199,7 +199,6 @@ var staticData = sync.OnceValue(func() insights.Data {data.Config.EnableSharing = conf.Server.EnableSharingdata.Config.EnableStarRating = conf.Server.EnableStarRatingdata.Config.EnableLastFM = conf.Server.LastFM.Enabled && conf.Server.LastFM.ApiKey != "" && conf.Server.LastFM.Secret != ""- data.Config.EnableSpotify = conf.Server.Spotify.ID != "" && conf.Server.Spotify.Secret != ""data.Config.EnableListenBrainz = conf.Server.ListenBrainz.Enableddata.Config.EnableDeezer = conf.Server.Deezer.Enableddata.Config.EnableMediaFileCoverArt = conf.Server.EnableMediaFileCoverArtdiff --git a/core/metrics/insights/data.go b/core/metrics/insights/data.goindex 5580d895d..27186e020 100644--- a/core/metrics/insights/data.go+++ b/core/metrics/insights/data.go@@ -61,7 +61,6 @@ type Data struct {EnableListenBrainz bool `json:"enableListenBrainz,omitempty"`EnableDeezer bool `json:"enableDeezer,omitempty"`EnableMediaFileCoverArt bool `json:"enableMediaFileCoverArt,omitempty"`- EnableSpotify bool `json:"enableSpotify,omitempty"`EnableJukebox bool `json:"enableJukebox,omitempty"`EnablePrometheus bool `json:"enablePrometheus,omitempty"`EnableCoverAnimation bool `json:"enableCoverAnimation,omitempty"`diff --git a/log/log.go b/log/log.goindex 7d294792b..ef38484c8 100644--- a/log/log.go+++ b/log/log.go@@ -27,7 +27,6 @@ var redacted = &Hook{// Keys from the config"(ApiKey:\")[\\w]*","(Secret:\")[\\w]*",- "(Spotify.*ID:\")[\\w]*","(PasswordEncryptionKey:[\\s]*\")[^\"]*","(UserHeader:[\\s]*\")[^\"]*","(TrustedSources:[\\s]*\")[^\"]*",diff --git a/plugins/examples/wikimedia/README.md b/plugins/examples/wikimedia/README.mdindex e4833cff6..181055c69 100644--- a/plugins/examples/wikimedia/README.md+++ b/plugins/examples/wikimedia/README.md@@ -63,7 +63,7 @@ Folder = "/path/to/navidrome/plugins"Add the plugin to your agents list:```toml-Agents = "lastfm,spotify,wikimedia"+Agents = "lastfm,wikimedia"```## Testing with Extism CLIdiff --git a/plugins/manifest-schema.json b/plugins/manifest-schema.jsonindex 8daf88ccf..c15a3bf3d 100644--- a/plugins/manifest-schema.json+++ b/plugins/manifest-schema.json@@ -149,7 +149,7 @@},"requiredHosts": {"type": "array",- "description": "List of required host patterns for HTTP requests (e.g., 'api.example.com', '*.spotify.com')",+ "description": "List of required host patterns for HTTP requests (e.g., 'api.example.com', '*.musicbrainz.org')","items": {"type": "string"}@@ -189,7 +189,7 @@},"requiredHosts": {"type": "array",- "description": "List of required host patterns for WebSocket connections (e.g., 'api.example.com', '*.spotify.com')",+ "description": "List of required host patterns for WebSocket connections (e.g., 'api.example.com', '*.musicbrainz.org')","items": {"type": "string"}diff --git a/plugins/manifest_gen.go b/plugins/manifest_gen.goindex a565ed3d1..efe93e05f 100644--- a/plugins/manifest_gen.go+++ b/plugins/manifest_gen.go@@ -57,7 +57,7 @@ type HTTPPermission struct {Reason *string `json:"reason,omitempty" yaml:"reason,omitempty" mapstructure:"reason,omitempty"`// List of required host patterns for HTTP requests (e.g., 'api.example.com',- // '*.spotify.com')+ // '*.musicbrainz.org')RequiredHosts []string `json:"requiredHosts,omitempty" yaml:"requiredHosts,omitempty" mapstructure:"requiredHosts,omitempty"`}@@ -251,6 +251,6 @@ type WebSocketPermission struct {Reason *string `json:"reason,omitempty" yaml:"reason,omitempty" mapstructure:"reason,omitempty"`// List of required host patterns for WebSocket connections (e.g.,- // 'api.example.com', '*.spotify.com')+ // 'api.example.com', '*.musicbrainz.org')RequiredHosts []string `json:"requiredHosts,omitempty" yaml:"requiredHosts,omitempty" mapstructure:"requiredHosts,omitempty"`}diff --git a/plugins/manifest_test.go b/plugins/manifest_test.goindex de15324ab..c45a480eb 100644--- a/plugins/manifest_test.go+++ b/plugins/manifest_test.go@@ -19,7 +19,7 @@ var _ = Describe("Manifest", func() {"permissions": {"http": {"reason": "Fetch metadata",- "requiredHosts": ["api.example.com", "*.spotify.com"]+ "requiredHosts": ["api.example.com", "*.musicbrainz.org"]}}}`)@@ -34,7 +34,7 @@ var _ = Describe("Manifest", func() {Expect(*m.Website).To(Equal("https://example.com"))Expect(m.Permissions.Http).ToNot(BeNil())Expect(*m.Permissions.Http.Reason).To(Equal("Fetch metadata"))- Expect(m.Permissions.Http.RequiredHosts).To(ContainElements("api.example.com", "*.spotify.com"))+ Expect(m.Permissions.Http.RequiredHosts).To(ContainElements("api.example.com", "*.musicbrainz.org"))})It("parses a minimal manifest", func() {diff --git a/server/initial_setup.go b/server/initial_setup.goindex ebfdad47a..d50f25958 100644--- a/server/initial_setup.go+++ b/server/initial_setup.go@@ -91,11 +91,5 @@ func checkExternalCredentials() {} else {log.Debug("ListenBrainz integration is ENABLED", "ListenBrainz.BaseURL", conf.Server.ListenBrainz.BaseURL)}-- if conf.Server.Spotify.ID == "" || conf.Server.Spotify.Secret == "" {- log.Info("Spotify integration is not enabled: missing ID/Secret")- } else {- log.Debug("Spotify integration is ENABLED")- }}}diff --git a/server/nativeapi/config.go b/server/nativeapi/config.goindex 086e8d3c1..02626a4ee 100644--- a/server/nativeapi/config.go+++ b/server/nativeapi/config.go@@ -16,13 +16,11 @@ import (// using partial masking (first and last character visible, middle replaced with *).// For values with 7+ characters: "secretvalue123" becomes "s***********3"// For values with <7 characters: "short" becomes "****"-// Add field paths using dot notation (e.g., "LastFM.ApiKey", "Spotify.Secret")+// Add field paths using dot notation (e.g., "LastFM.ApiKey")var sensitiveFieldsPartialMask = []string{"LastFM.ApiKey","LastFM.Secret","Prometheus.MetricsPath",- "Spotify.ID",- "Spotify.Secret","DevAutoLoginUsername",}diff --git a/server/nativeapi/config_test.go b/server/nativeapi/config_test.goindex 546dd4f12..d7368cabf 100644--- a/server/nativeapi/config_test.go+++ b/server/nativeapi/config_test.go@@ -78,7 +78,6 @@ var _ = Describe("Config API", func() {It("redacts sensitive fields", func() {conf.Server.LastFM.ApiKey = "secretapikey123"- conf.Server.Spotify.Secret = "spotifysecret456"conf.Server.PasswordEncryptionKey = "encryptionkey789"conf.Server.DevAutoCreateAdminPassword = "adminpassword123"conf.Server.Prometheus.Password = "prometheuspass"@@ -97,11 +96,6 @@ var _ = Describe("Config API", func() {Expect(ok).To(BeTrue())Expect(lastfm["ApiKey"]).To(Equal("s*************3"))- // Check Spotify.Secret (partially masked)- spotify, ok := resp.Config["Spotify"].(map[string]any)- Expect(ok).To(BeTrue())- Expect(spotify["Secret"]).To(Equal("s**************6"))-// Check PasswordEncryptionKey (fully masked)Expect(resp.Config["PasswordEncryptionKey"]).To(Equal("****"))@@ -172,7 +166,6 @@ var _ = Describe("Config API", func() {var _ = Describe("redactValue function", func() {It("partially masks long sensitive values", func() {Expect(redactValue("LastFM.ApiKey", "ba46f0e84a")).To(Equal("b********a"))- Expect(redactValue("Spotify.Secret", "verylongsecret123")).To(Equal("v***************3"))})It("fully masks long sensitive values that should be completely hidden", func() {@@ -183,7 +176,6 @@ var _ = Describe("redactValue function", func() {It("fully masks short sensitive values", func() {Expect(redactValue("LastFM.Secret", "short")).To(Equal("****"))- Expect(redactValue("Spotify.ID", "abc")).To(Equal("****"))Expect(redactValue("PasswordEncryptionKey", "12345")).To(Equal("****"))Expect(redactValue("DevAutoCreateAdminPassword", "short")).To(Equal("****"))Expect(redactValue("Prometheus.Password", "short")).To(Equal("****"))