Merge pull request #284 from adamint/dev

3.8.0

Author: adamint

build.gradle.kts

@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackOutput.Target
 
 plugins {
-   // id("lt.petuska.npm.publish") version "1.1.2"
+    id("lt.petuska.npm.publish") version "1.1.2"
     kotlin("multiplatform") version "1.5.0"
     `maven-publish`
     signing
@@ -26,6 +26,7 @@ repositories {
 buildscript {
     repositories {
         google()
+        mavenCentral()
     }
     dependencies {
         classpath("com.android.tools.build:gradle:3.5.4")
@@ -119,10 +120,11 @@ kotlin {
         mavenPublication {
             setupPom(artifactId)
         }
+
     }
 
-    js(if (project.hasProperty("irOnly")) KotlinJsCompilerType.IR else KotlinJsCompilerType.BOTH) {
-        //binaries.library()
+    val irOnlyJs = project.hasProperty("irOnly")
+    js(if (irOnlyJs) KotlinJsCompilerType.IR else KotlinJsCompilerType.BOTH) {
 
         mavenPublication {
             setupPom(artifactId)
@@ -149,6 +151,8 @@ kotlin {
                 }
             }
         }
+
+        if (irOnlyJs) binaries.library()
     }
 
     // val hostOs = System.getProperty("os.name")
@@ -192,6 +196,7 @@ kotlin {
             setupPom(artifactId)
         }
     }
+
     // disabled due to lack of coroutine/serialization library support (yet)
     /*watchos {
      binaries {
@@ -312,7 +317,7 @@ kotlin {
                 dependsOn(commonMain)
 
                 dependencies {
-                    implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineMTVersion") {
+                    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineMTVersion") {
                         version {
                             strictly(coroutineMTVersion)
                         }
@@ -353,7 +358,7 @@ kotlin {
                 dependsOn(commonMain)
 
                 dependencies {
-                    implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineMTVersion") {
+                    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineMTVersion") {
                         version {
                             strictly(coroutineMTVersion)
                         }
@@ -382,13 +387,13 @@ kotlin {
                 dependsOn(nativeDarwinTest)
             }
 
-                /* val watchosMain by getting {
-                dependsOn(nativeDarwinMain)
-            }
+            /* val watchosMain by getting {
+            dependsOn(nativeDarwinMain)
+        }
 
-            val watchosTest by getting {
-                dependsOn(nativeDarwinTest)
-            }*/
+        val watchosTest by getting {
+            dependsOn(nativeDarwinTest)
+        }*/
 
             all {
                 languageSettings.useExperimentalAnnotation("kotlin.Experimental")
@@ -410,6 +415,16 @@ signing {
     }
 }
 
+npmPublishing {
+    repositories {
+        repository("npmjs") {
+            registry = uri("https://registry.npmjs.org")
+            (project.properties.get("npmauthtoken") as? String)?.let { authToken = it }
+            println("auth token: $authToken")
+        }
+    }
+}
+
 tasks {
     /*npmPublishing {
         readme = file("README.MD")

gradle.properties

@@ -2,4 +2,5 @@ systemProp.org.gradle.internal.publish.checksums.insecure=true
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xmx8000m
 kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.native.enableDependencyPropagation=false
+kotlin.native.enableDependencyPropagation=false
+kotlin.js.generate.externals=true

src/androidMain/kotlin/com/adamratzman/spotify/auth/pkce/AbstractSpotifyPkceLoginActivity.kt

@@ -86,10 +86,15 @@ public abstract class AbstractSpotifyPkceLoginActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.spotify_pkce_auth_layout)
 
-        authorizationIntent = Intent(Intent.ACTION_VIEW, getAuthorizationUrl())
         credentialStore = application.getDefaultCredentialStore(clientId, redirectUri)
 
-        startActivity(authorizationIntent)
+        // This activity is recreated on every launch, therefore we need to make sure not to
+        // launch the activity when a Spotify intent result has been received
+        if (intent?.isSpotifyPkceAuthIntent(redirectUri) == false) {
+            authorizationIntent = Intent(Intent.ACTION_VIEW, getAuthorizationUrl())
+            startActivity(authorizationIntent)
+            finish()
+        }
     }
 
     /**

src/commonMain/kotlin/com.adamratzman.spotify/SpotifyApi.kt

@@ -17,6 +17,7 @@ import com.adamratzman.spotify.endpoints.pub.ArtistApi
 import com.adamratzman.spotify.endpoints.pub.BrowseApi
 import com.adamratzman.spotify.endpoints.pub.EpisodeApi
 import com.adamratzman.spotify.endpoints.pub.FollowingApi
+import com.adamratzman.spotify.endpoints.pub.MarketsApi
 import com.adamratzman.spotify.endpoints.pub.PlaylistApi
 import com.adamratzman.spotify.endpoints.pub.SearchApi
 import com.adamratzman.spotify.endpoints.pub.ShowApi
@@ -56,6 +57,7 @@ import kotlinx.serialization.json.Json
  * @property tracks Provides access to Spotify [track endpoints](https://developer.spotify.com/documentation/web-api/reference/tracks/)
  * @property episodes Provides access to Spotify [episode endpoints](https://developer.spotify.com/documentation/web-api/reference/episodes/)
  * @property shows Provides access to Spotify [show endpoints](https://developer.spotify.com/documentation/web-api/reference/shows/)
+ * @property markets Provides access to Spotify [market endpoints](https://developer.spotify.com/documentation/web-api/reference/#category-markets)
  */
 public sealed class SpotifyApi<T : SpotifyApi<T, B>, B : ISpotifyApiBuilder<T, B>>(
     public val clientId: String?,
@@ -82,6 +84,7 @@ public sealed class SpotifyApi<T : SpotifyApi<T, B>, B : ISpotifyApiBuilder<T, B
     public abstract val following: FollowingApi
     public abstract val episodes: EpisodeApi
     public abstract val shows: ShowApi
+    public abstract val markets: MarketsApi
 
     /**
      * Base url for Spotify web api calls
@@ -397,6 +400,7 @@ public class SpotifyAppApi internal constructor(
     override val tracks: TrackApi = TrackApi(this)
     override val episodes: EpisodeApi = EpisodeApi(this)
     override val shows: ShowApi = ShowApi(this)
+    override val markets: MarketsApi = MarketsApi(this)
 
     /**
      * Provides access to **public** Spotify [playlist endpoints](https://developer.spotify.com/documentation/web-api/reference/playlists/)
@@ -491,6 +495,7 @@ public open class SpotifyClientApi(
     override val artists: ArtistApi = ArtistApi(this)
     override val tracks: TrackApi = TrackApi(this)
     override val search: SearchApi = SearchApi(this)
+    override val markets: MarketsApi = MarketsApi(this)
 
     override val episodes: ClientEpisodeApi = ClientEpisodeApi(this)
     override val shows: ClientShowApi = ClientShowApi(this)

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientLibraryApi.kt

@@ -7,10 +7,14 @@ import com.adamratzman.spotify.SpotifyRestAction
 import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.http.SpotifyEndpoint
 import com.adamratzman.spotify.models.AlbumUri
+import com.adamratzman.spotify.models.EpisodeUri
 import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.PlayableUri
 import com.adamratzman.spotify.models.SavedAlbum
+import com.adamratzman.spotify.models.SavedEpisode
+import com.adamratzman.spotify.models.SavedShow
 import com.adamratzman.spotify.models.SavedTrack
+import com.adamratzman.spotify.models.ShowUri
 import com.adamratzman.spotify.models.serialization.toList
 import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
 import com.adamratzman.spotify.utils.Market
@@ -118,6 +122,105 @@ public class ClientLibraryApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         market: Market? = null
     ): SpotifyRestAction<PagingObject<SavedAlbum>> = SpotifyRestAction { getSavedAlbums(limit, offset, market) }
 
+    /**
+     * Get a list of shows saved in the current Spotify user’s library.
+     * Optional parameters can be used to limit the number of shows returned.
+     *
+     * **Requires** the [SpotifyScope.USER_LIBRARY_READ] scope
+     *
+     * **[Api Reference](https://developer.spotify.com/documentation/web-api/reference/library/get-users-saved-albums/)**
+     *
+     * @param limit The number of objects to return. Default: 50 (or api limit). Minimum: 1. Maximum: 50.
+     * @param offset The index of the first item to return. Default: 0. Use with limit to get the next set of items
+     *
+     * @return Paging Object of [SavedShow] ordered by position in library
+     */
+    public suspend fun getSavedShows(
+        limit: Int? = api.spotifyApiOptions.defaultLimit,
+        offset: Int? = null
+    ): PagingObject<SavedShow> {
+        requireScopes(SpotifyScope.USER_LIBRARY_READ)
+
+        return get(
+            endpointBuilder("/me/shows").with("limit", limit).with("offset", offset).toString()
+        ).toNonNullablePagingObject(SavedShow.serializer(), api = api, json = json)
+    }
+
+    /**
+     * Get a list of shows saved in the current Spotify user’s library.
+     * Optional parameters can be used to limit the number of shows returned.
+     *
+     * **Requires** the [SpotifyScope.USER_LIBRARY_READ] scope
+     *
+     * **[Api Reference](https://developer.spotify.com/documentation/web-api/reference/library/get-users-saved-albums/)**
+     *
+     * @param limit The number of objects to return. Default: 50 (or api limit). Minimum: 1. Maximum: 50.
+     * @param offset The index of the first item to return. Default: 0. Use with limit to get the next set of items
+     *
+     * @return Paging Object of [SavedShow] ordered by position in library
+     */
+    public fun getSavedShowsRestAction(
+        limit: Int? = api.spotifyApiOptions.defaultLimit,
+        offset: Int? = null
+    ): SpotifyRestAction<PagingObject<SavedShow>> {
+        return SpotifyRestAction {
+            getSavedShows(limit, offset)
+        }
+    }
+
+    /**
+     * Get a list of the episodes saved in the current Spotify user’s library.
+     * This API endpoint is in beta and could change without warning.
+     *
+     * **Requires** the [SpotifyScope.USER_LIBRARY_READ] scope
+     *
+     * **[Api Reference](https://developer.spotify.com/documentation/web-api/reference/library/get-users-saved-albums/)**
+     *
+     * @param limit The number of objects to return. Default: 50 (or api limit). Minimum: 1. Maximum: 50.
+     * @param offset The index of the first item to return. Default: 0. Use with limit to get the next set of items
+     * @param market Provide this parameter if you want the list of returned items to be relevant to a particular country.
+     * If omitted, the returned items will be relevant to all countries.
+     *
+     * @return Paging Object of [SavedEpisode] ordered by position in library
+     */
+    public suspend fun getSavedEpisodes(
+        limit: Int? = api.spotifyApiOptions.defaultLimit,
+        offset: Int? = null,
+        market: Market? = null
+    ): PagingObject<SavedEpisode> {
+        requireScopes(SpotifyScope.USER_LIBRARY_READ)
+
+        return get(
+            endpointBuilder("/me/episodes").with("limit", limit).with("offset", offset).with("market", market)
+                .toString()
+        ).toNonNullablePagingObject(SavedEpisode.serializer(), api = api, json = json)
+    }
+
+    /**
+     * Get a list of the episodes saved in the current Spotify user’s library.
+     * This API endpoint is in beta and could change without warning.
+     *
+     * **Requires** the [SpotifyScope.USER_LIBRARY_READ] scope
+     *
+     * **[Api Reference](https://developer.spotify.com/documentation/web-api/reference/library/get-users-saved-albums/)**
+     *
+     * @param limit The number of objects to return. Default: 50 (or api limit). Minimum: 1. Maximum: 50.
+     * @param offset The index of the first item to return. Default: 0. Use with limit to get the next set of items
+     * @param market Provide this parameter if you want the list of returned items to be relevant to a particular country.
+     * If omitted, the returned items will be relevant to all countries.
+     *
+     * @return Paging Object of [SavedEpisode] ordered by position in library
+     */
+    public suspend fun getSavedEpisodesRestAction(
+        limit: Int? = api.spotifyApiOptions.defaultLimit,
+        offset: Int? = null,
+        market: Market? = null
+    ): SpotifyRestAction<PagingObject<SavedEpisode>> {
+        return SpotifyRestAction {
+            getSavedEpisodes(limit, offset, market)
+        }
+    }
+
     /**
      * Check if the [LibraryType] with id [id] is already saved in the current Spotify user’s ‘Your Music’ library.
      *
@@ -144,7 +247,8 @@ public class ClientLibraryApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
      *
      * @throws BadRequestException if [id] is not found
      */
-    public fun containsRestAction(type: LibraryType, id: String): SpotifyRestAction<Boolean> = SpotifyRestAction { contains(type, ids = arrayOf(id))[0] }
+    public fun containsRestAction(type: LibraryType, id: String): SpotifyRestAction<Boolean> =
+        SpotifyRestAction { contains(type, ids = arrayOf(id))[0] }
 
     /**
      * Check if one or more of [LibraryType] is already saved in the current Spotify user’s ‘Your Music’ library.
@@ -215,7 +319,8 @@ public class ClientLibraryApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
      *
      * @throws BadRequestException if the id is invalid
      */
-    public fun addRestAction(type: LibraryType, id: String): SpotifyRestAction<Unit> = SpotifyRestAction { add(type, id) }
+    public fun addRestAction(type: LibraryType, id: String): SpotifyRestAction<Unit> =
+        SpotifyRestAction { add(type, id) }
 
     /**
      * Save one or more of [LibraryType] to the current user’s ‘Your Music’ library.
@@ -253,7 +358,8 @@ public class ClientLibraryApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
      *
      * @throws BadRequestException if any of the provided ids is invalid
      */
-    public fun addRestAction(type: LibraryType, vararg ids: String): SpotifyRestAction<Unit> = SpotifyRestAction { add(type, *ids) }
+    public fun addRestAction(type: LibraryType, vararg ids: String): SpotifyRestAction<Unit> =
+        SpotifyRestAction { add(type, *ids) }
 
     /**
      * Remove one of [LibraryType] (track or album) from the current user’s ‘Your Music’ library.
@@ -285,7 +391,8 @@ public class ClientLibraryApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
      *
      * @throws BadRequestException if any of the provided ids is invalid
      */
-    public fun removeRestAction(type: LibraryType, id: String): SpotifyRestAction<Unit> = SpotifyRestAction { remove(type, ids = arrayOf(id)) }
+    public fun removeRestAction(type: LibraryType, id: String): SpotifyRestAction<Unit> =
+        SpotifyRestAction { remove(type, ids = arrayOf(id)) }
 
     /**
      * Remove one or more of the [LibraryType] (tracks or albums) from the current user’s ‘Your Music’ library.
@@ -344,7 +451,9 @@ public class ClientLibraryApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
  */
 public enum class LibraryType(private val value: String, internal val id: (String) -> String) {
     TRACK("tracks", { PlayableUri(it).id }),
-    ALBUM("albums", { AlbumUri(it).id });
+    ALBUM("albums", { AlbumUri(it).id }),
+    EPISODE("episodes", { EpisodeUri(it).id }),
+    SHOW("shows", { ShowUri(it).id });
 
     override fun toString(): String = value
 }