Merge pull request #297 from adamint/dev

fix js web playback sdk, add Player.activeElement, add from_token in market

Author: adamint

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/BrowseApi.kt

@@ -76,10 +76,8 @@ public class BrowseApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         offset: Int? = null,
         market: Market? = null
     ): PagingObject<SimpleAlbum> = get(
-        endpointBuilder("/browse/new-releases").with("limit", limit).with("offset", offset).with(
-            "country",
-            market?.name
-        ).toString()
+        endpointBuilder("/browse/new-releases").with("limit", limit)
+            .with("offset", offset).with("country", market?.name).toString()
     ).toNonNullablePagingObject(SimpleAlbum.serializer(), "albums", api = api, json = json)
 
     /**
@@ -281,11 +279,10 @@ public class BrowseApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         offset: Int? = null,
         market: Market? = null
     ): PagingObject<SimplePlaylist> = get(
-        endpointBuilder("/browse/categories/${categoryId.encodeUrl()}/playlists").with(
-            "limit",
-            limit
-        ).with("offset", offset)
-            .with("market", market?.name).toString()
+        endpointBuilder("/browse/categories/${categoryId.encodeUrl()}/playlists")
+            .with("limit", limit)
+            .with("offset", offset)
+            .with("country", market?.name).toString()
     ).toNonNullablePagingObject((SimplePlaylist.serializer()), "playlists", api = api, json = json)
 
     /**

src/commonMain/kotlin/com.adamratzman.spotify/models/ResultObjects.kt

@@ -129,7 +129,7 @@ public data class ErrorObject(val status: Int, val message: String, val reason:
 @Serializable
 public data class AuthenticationError(
     val error: String,
-    @SerialName("error_description") val description: String
+    @SerialName("error_description") val description: String? = null
 )
 
 /**

src/commonMain/kotlin/com.adamratzman.spotify/utils/Market.kt

@@ -1849,7 +1849,7 @@ public enum class Market(
     /**
      * A special Market for endpoints to return content available in the user's own market
      */
-    from_token("from_token", "ZZZ", 999, Assignment.NOT_USED);
+    FROM_TOKEN("from_token", "ZZZ", 999, Assignment.NOT_USED);
 
     /**
      * Code assignment state in [ISO 3166-1](http://en.wikipedia.org/wiki/ISO_3166-1).

src/jsMain/kotlin/com/adamratzman/spotify/webplayer/WebPlaybackSdk.kt

@@ -103,7 +103,7 @@ public external interface PlaybackTrackWindow {
  */
 public external interface PlayerInit {
     public var name: String
-    public fun getOAuthToken(cb: (token: String) -> Unit)
+    public var getOAuthToken: (cb: (token: String) -> Unit) -> Unit
     public var volume: Number?
         get() = definedExternally
         set(value) = definedExternally
@@ -132,6 +132,14 @@ public open external class Player(options: PlayerInit) {
      */
     public open fun getCurrentState(): Promise<PlaybackState?>
 
+    /**
+     * Some browsers prevent autoplay of media by ensuring that all playback is triggered by
+     * synchronous event-paths originating from user interaction such as a click.
+     * This event allows you to manually activate the element if action is deferred or done
+     * in a separate execution context than the user action.
+     */
+    public fun activateElement(): Promise<Any>
+
     /**
      * Get the local volume currently set in the Web Playback SDK.
      * @return Returns a Promise containing the local volume (as a Float between 0 and 1).