allow instantiation by refresh token

Author: adamint

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

@@ -364,7 +364,7 @@ class SpotifyAppApiBuilder(
         require((clientId != null && clientSecret != null) || authorization.token != null || authorization.tokenString != null) { "You didn't specify a client id or client secret in the credentials block!" }
         return when {
             authorization.token != null -> SpotifyAppApi(
-                clientId ,
+                clientId,
                 clientSecret,
                 authorization.token!!,
                 options.useCache,
@@ -392,6 +392,20 @@ class SpotifyAppApiBuilder(
                     options.json
                 )
             }
+            authorization.refreshTokenString != null -> {
+                SpotifyAppApi(
+                    clientId,
+                    clientSecret,
+                    Token("", "", 0, authorization.refreshTokenString!!),
+                    options.useCache,
+                    options.cacheLimit,
+                    false,
+                    options.retryWhenRateLimited,
+                    options.enableLogger,
+                    options.testTokenValidity,
+                    options.json
+                )
+            }
             else -> try {
                 require(clientId != null && clientSecret != null) { "Illegal credentials provided" }
                 val token = getCredentialedToken(clientId, clientSecret, null, options.json)
@@ -448,15 +462,17 @@ data class SpotifyCredentials(val clientId: String?, val clientSecret: String?,
 class SpotifyUserAuthorizationBuilder(
     var authorizationCode: String? = null,
     var tokenString: String? = null,
-    var token: Token? = null
+    var token: Token? = null,
+    var refreshTokenString: String? = null
 ) {
-    fun build() = SpotifyUserAuthorization(authorizationCode, tokenString, token)
+    fun build() = SpotifyUserAuthorization(authorizationCode, tokenString, token, refreshTokenString)
 }
 
 data class SpotifyUserAuthorization(
     var authorizationCode: String?,
     var tokenString: String?,
-    var token: Token?
+    var token: Token?,
+    var refreshTokenString: String?
 )
 
 /**

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

@@ -27,10 +27,10 @@ import com.adamratzman.spotify.models.TokenValidityResponse
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.asList
 import com.adamratzman.spotify.utils.runBlocking
-import kotlinx.coroutines.Dispatchers
-import kotlinx.serialization.json.Json
 import kotlin.coroutines.CoroutineContext
 import kotlin.jvm.JvmOverloads
+import kotlinx.coroutines.Dispatchers
+import kotlinx.serialization.json.Json
 
 internal const val base = "https://api.spotify.com/v1"
 

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

@@ -6,6 +6,7 @@ import com.adamratzman.spotify.http.SpotifyEndpoint
 import com.adamratzman.spotify.models.serialization.toCursorBasedPagingObject
 import com.adamratzman.spotify.models.serialization.toPagingObject
 import com.adamratzman.spotify.utils.runBlocking
+import kotlin.reflect.KClass
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
@@ -17,7 +18,6 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlin.reflect.KClass
 
 /*
     Types used in PagingObjects and CursorBasedPagingObjects:
@@ -73,7 +73,7 @@ class PagingObject<T : Any>(
         return (if (type == PagingTraversalType.FORWARDS) next else previous)?.let { endpoint!!.get(it) }?.let { json ->
             when (itemClazz) {
                 SimpleTrack::class -> json.toPagingObject(SimpleTrack.serializer(), null, endpointFinal, endpointFinal.api.json)
-                SpotifyCategory::class -> json.toPagingObject(SpotifyCategory.serializer(), null, endpointFinal , endpointFinal.api.json)
+                SpotifyCategory::class -> json.toPagingObject(SpotifyCategory.serializer(), null, endpointFinal, endpointFinal.api.json)
                 SimpleAlbum::class -> json.toPagingObject(SimpleAlbum.serializer(), null, endpointFinal, endpointFinal.api.json)
                 SimplePlaylist::class -> json.toPagingObject(SimplePlaylist.serializer(), null, endpointFinal, endpointFinal.api.json)
                 SavedTrack::class -> json.toPagingObject(SavedTrack.serializer(), null, endpointFinal, endpointFinal.api.json)

src/commonTest/kotlin/com.adamratzman/spotify/Common.kt

@@ -11,7 +11,6 @@ val api = when {
         }.build()
     }
     else -> {
-        println(getEnvironmentVariable("spotifyRedirectUri")?.isBlank())
         spotifyClientApi {
             credentials {
                 clientId = getEnvironmentVariable("clientId")

src/commonTest/kotlin/com.adamratzman/spotify/public/PublicTracksAPITest.kt

@@ -4,12 +4,12 @@ package com.adamratzman.spotify.public
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.api
 import com.adamratzman.spotify.utils.Market
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
 
 class PublicTracksAPITest : Spek({
     describe("Track API (Public View) test") {

src/commonTest/kotlin/com.adamratzman/spotify/utilities/UtilityTests.kt

@@ -60,7 +60,6 @@ class UtilityTests : Spek({
                         clientSecret = getEnvironmentVariable("clientSecret")
                     }
                 }.build()
-                TODO()
             }
         }
     }