From 5be5a014f3d3543b7e9b576e87a444bf857ae8ec Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Mon, 14 Feb 2022 20:15:09 +0100
Subject: [PATCH] Adjust Sonos for updated Spotify media browsing (#66508)

---
 homeassistant/components/sonos/media_browser.py | 16 ++--------------
 homeassistant/components/sonos/media_player.py  |  1 +
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/homeassistant/components/sonos/media_browser.py b/homeassistant/components/sonos/media_browser.py
index 2d971469928..2272ceb183f 100644
--- a/homeassistant/components/sonos/media_browser.py
+++ b/homeassistant/components/sonos/media_browser.py
@@ -105,9 +105,6 @@ async def async_browse_media(
             hass, media_content_type, media_content_id, can_play_artist=False
         )
 
-    if media_content_type == "spotify":
-        return await spotify.async_browse_media(hass, None, None, can_play_artist=False)
-
     if media_content_type == "library":
         return await hass.async_add_executor_job(
             library_payload,
@@ -303,17 +300,8 @@ async def root_payload(
         )
 
     if "spotify" in hass.config.components:
-        children.append(
-            BrowseMedia(
-                title="Spotify",
-                media_class=MEDIA_CLASS_APP,
-                media_content_id="",
-                media_content_type="spotify",
-                thumbnail="https://brands.home-assistant.io/_/spotify/logo.png",
-                can_play=False,
-                can_expand=True,
-            )
-        )
+        result = await spotify.async_browse_media(hass, None, None)
+        children.extend(result.children)
 
     try:
         item = await media_source.async_browse_media(
diff --git a/homeassistant/components/sonos/media_player.py b/homeassistant/components/sonos/media_player.py
index e7ee76070a1..2763bd3fe42 100644
--- a/homeassistant/components/sonos/media_player.py
+++ b/homeassistant/components/sonos/media_player.py
@@ -522,6 +522,7 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
         """
         if spotify.is_spotify_media_type(media_type):
             media_type = spotify.resolve_spotify_media_type(media_type)
+            media_id = spotify.spotify_uri_from_media_browser_url(media_id)
 
         if media_source.is_media_source_id(media_id):
             media_type = MEDIA_TYPE_MUSIC