From e251d77316ad3db0fcc622c9a130becdf3001195 Mon Sep 17 00:00:00 2001
From: Peter Schorn <petervschorn@gmail.com>
Date: Fri, 22 Nov 2024 23:36:56 -0600
Subject: [PATCH] Fixed a bug where the Spotify ids were not being sent in the
 correct format in the following methods (see #66):     *
 `SpotifyAPI.saveAlbumsForCurrentUser`      *
 `SpotifyAPI.removeSavedAlbumsForCurrentUser`     *
 `SpotifyAPI.saveEpisodesForCurrentUser`     *
 `SpotifyAPI.removeSavedEpisodesForCurrentUser`     *
 `SpotifyAPI.saveShowsForCurrentUser`     *
 `SpotifyAPI.removeSavedShowsForCurrentUser`     *
 `SpotifyAPI.saveTracksForCurrentUser`     *
 `SpotifyAPI.removeSavedTracksForCurrentUser`

---
 .../xcschemes/SpotifyAPI-Package.xcscheme     |  2 +-
 .../xcschemes/SpotifyAPI.xcscheme             |  2 +-
 CHANGELOG.md                                  | 17 ++++++++++
 .../WebKitBrowserAuthorizer.swift             |  2 +-
 .../SpotifyAPITests.swift                     |  1 +
 .../API/SpotifyAPI+Library.swift              | 12 ++++---
 .../API Tests/SpotifyAPIAlbumsTests.swift     | 34 +++++++++++++++++++
 7 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SpotifyAPI-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SpotifyAPI-Package.xcscheme
index a5f005913..d7498b6cb 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/SpotifyAPI-Package.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/SpotifyAPI-Package.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SpotifyAPI.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SpotifyAPI.xcscheme
index 9a25cfe29..04e66bf2a 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/SpotifyAPI.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/SpotifyAPI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d9429584..26bb20718 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.0.4] - 11-22-2024
+
+* Fixed a bug where the Spotify ids were not being sent in the correct format in the following methods (see [#66](https://github.com/Peter-Schorn/SpotifyAPI/issues/66)):
+    * `SpotifyAPI.saveAlbumsForCurrentUser` 
+    * `SpotifyAPI.removeSavedAlbumsForCurrentUser` 
+    * `SpotifyAPI.saveEpisodesForCurrentUser`
+    * `SpotifyAPI.removeSavedEpisodesForCurrentUser`
+    * `SpotifyAPI.saveShowsForCurrentUser`
+    * `SpotifyAPI.removeSavedShowsForCurrentUser`
+    * `SpotifyAPI.saveTracksForCurrentUser`
+    * `SpotifyAPI.removeSavedTracksForCurrentUser`
+
+
+## [3.0.3] - 6-09-2024
+
+* Made all TrackLink properties `nil`. Will never fail to decode TrackLink again.
+
 ## [3.0.2] - 6-07-2024
 
 * Fixed a bug that caused `extendPagesConcurrently` to only return the initial page of results
diff --git a/Sources/SpotifyAPITestUtilities/Authorization/WebKitBrowserAuthorizer.swift b/Sources/SpotifyAPITestUtilities/Authorization/WebKitBrowserAuthorizer.swift
index ce3750c77..d40cc1c71 100644
--- a/Sources/SpotifyAPITestUtilities/Authorization/WebKitBrowserAuthorizer.swift
+++ b/Sources/SpotifyAPITestUtilities/Authorization/WebKitBrowserAuthorizer.swift
@@ -1,7 +1,7 @@
 #if canImport(WebKit)
 import Foundation
 import SpotifyWebAPI
-import WebKit
+@preconcurrency import WebKit
 
 /// Can open an authorization URL and click the accept or cancel dialog and
 /// then return the redirect URI with the query.
diff --git a/Sources/SpotifyAPITestUtilities/SpotifyAPI Utilities/SpotifyAPITests.swift b/Sources/SpotifyAPITestUtilities/SpotifyAPI Utilities/SpotifyAPITests.swift
index b6d734b60..93ec681f3 100644
--- a/Sources/SpotifyAPITestUtilities/SpotifyAPI Utilities/SpotifyAPITests.swift	
+++ b/Sources/SpotifyAPITestUtilities/SpotifyAPI Utilities/SpotifyAPITests.swift	
@@ -127,6 +127,7 @@ extension AuthorizationCodeFlowPKCEBackendManager: _AuthorizationCodeFlowPKCEMan
 
 }
 
+extension ClientCredentialsFlowBackendManager: @retroactive Equatable {}
 extension ClientCredentialsFlowBackendManager: _ClientCredentialsFlowManagerProtocol { }
 
 
diff --git a/Sources/SpotifyWebAPI/API/SpotifyAPI+Library.swift b/Sources/SpotifyWebAPI/API/SpotifyAPI+Library.swift
index d73b95278..7c5562a1f 100644
--- a/Sources/SpotifyWebAPI/API/SpotifyAPI+Library.swift
+++ b/Sources/SpotifyWebAPI/API/SpotifyAPI+Library.swift
@@ -41,7 +41,7 @@ private extension SpotifyAPI where
                     queryItems: [:],
                     httpMethod: "PUT",
                     makeHeaders: Headers.bearerAuthorizationAndContentTypeJSON(_:),
-                    body: ids,
+                    body: ["ids": ids],
                     requiredScopes: [.userLibraryModify]
                 )
 
@@ -105,7 +105,7 @@ private extension SpotifyAPI where
                     ],
                     httpMethod: "DELETE",
                     makeHeaders: Headers.bearerAuthorizationAndContentTypeJSON(_:),
-                    body: ids,
+                    body: ["ids": ids],
                     requiredScopes: [.userLibraryModify]
                 )
 
@@ -667,7 +667,10 @@ public extension SpotifyAPI where
     ) -> AnyPublisher<Void, Error> {
 
         return self.saveItemsForCurrentUser(
-            uris: uris, types: [.show], path: "/me/shows"
+            uris: uris, 
+            types: [.show],
+            path: "/me/shows",
+            idsInBody: false
         )
 
     }
@@ -816,7 +819,8 @@ public extension SpotifyAPI where
             uris: uris,
             types: [.show],
             path: "/me/shows",
-            market: market
+            market: market,
+            idsInBody: false
         )
 
     }
diff --git a/Tests/SpotifyAPIMainTests/API Tests/SpotifyAPIAlbumsTests.swift b/Tests/SpotifyAPIMainTests/API Tests/SpotifyAPIAlbumsTests.swift
index df393c504..ee14e72ee 100644
--- a/Tests/SpotifyAPIMainTests/API Tests/SpotifyAPIAlbumsTests.swift	
+++ b/Tests/SpotifyAPIMainTests/API Tests/SpotifyAPIAlbumsTests.swift	
@@ -724,6 +724,40 @@ extension SpotifyAPIAlbumsTests {
 
     }
     
+    func trackLink() {
+
+        func receiveTrackLink(_ album: Album) {
+            encodeDecode(album)
+
+            XCTAssertEqual(album.name, "")
+        }
+
+        let hrefString = """
+            https://api.spotify.com/v1/albums/2zffBP6FVUDZ3dsKodfQi6
+            """
+        
+        let href = URL(string: hrefString)!
+
+        let expectation = XCTestExpectation(
+            description: "testTrackLink"
+        )
+
+        Self.spotify.getFromHref(href, responseType: Album.self)
+            .assertNoFailure()
+            .receiveOnMain()
+            .sink(
+                receiveCompletion: { _ in expectation.fulfill() },
+                receiveValue: receiveTrackLink(_:)
+            )
+            .store(in: &Self.cancellables)
+
+        self.wait(
+            for: [expectation],
+            timeout: 60
+        )
+
+    }
+
     func receiveAlbumTracksPage1(_ page: PagingObject<Track>) {
         print("begin receiveAlbumTracksPage1")