don't override auto refresh for appapi

Author: adamint

build.gradle.kts

@@ -15,7 +15,7 @@ plugins {
 }
 
 group = "com.adamratzman"
-version = "3.0.02"
+version = "3.0.03"
 
 java {
     withSourcesJar()

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

@@ -18,21 +18,17 @@ import kotlinx.serialization.json.Json
 
 // Kotlin DSL builders
 
-@Deprecated("Builder methods are now found in SpotifyApi", ReplaceWith("SpotifyApi.spotifyAppApi"))
 fun spotifyAppApi(clientId: String, clientSecret: String, block: SpotifyAppApiBuilder.() -> Unit = {}) =
-        SpotifyApi.spotifyAppApi(clientId, clientSecret, block)
+        spotifyAppApi(clientId, clientSecret, block)
 
-@Deprecated("Builder methods are now found in SpotifyApi", ReplaceWith("SpotifyApi.spotifyAppApi"))
 fun spotifyAppApi(block: SpotifyAppApiBuilder.() -> Unit) =
-        SpotifyApi.spotifyAppApi(block)
+        spotifyAppApi(block)
 
-@Deprecated("Builder methods are now found in SpotifyApi", ReplaceWith("SpotifyApi.spotifyClientApi"))
 fun spotifyAppApi(clientId: String, clientSecret: String, redirectUri: String, block: SpotifyClientApiBuilder.() -> Unit = {}) =
-        SpotifyApi.spotifyClientApi(clientId, clientSecret, redirectUri, block)
+        spotifyClientApi(clientId, clientSecret, redirectUri, block)
 
-@Deprecated("Builder methods are now found in SpotifyApi", ReplaceWith("SpotifyApi.spotifyClientApi"))
 fun spotifyAppApi(block: SpotifyClientApiBuilder.() -> Unit) =
-        SpotifyApi.spotifyClientApi(block)
+        spotifyClientApi(block)
 
 /**
  *  Spotify API builder
@@ -447,7 +443,7 @@ class SpotifyAppApiBuilder(
                     authorization.token!!,
                     options.useCache,
                     options.cacheLimit,
-                    false,
+                    options.automaticRefresh,
                     options.retryWhenRateLimited,
                     options.enableLogger,
                     options.testTokenValidity,
@@ -466,7 +462,7 @@ class SpotifyAppApiBuilder(
                         ),
                         options.useCache,
                         options.cacheLimit,
-                        false,
+                        options.automaticRefresh,
                         options.retryWhenRateLimited,
                         options.enableLogger,
                         options.testTokenValidity,
@@ -483,7 +479,7 @@ class SpotifyAppApiBuilder(
                         Token("", "", 0, authorization.refreshTokenString!!),
                         options.useCache,
                         options.cacheLimit,
-                        false,
+                        options.automaticRefresh,
                         options.retryWhenRateLimited,
                         options.enableLogger,
                         options.testTokenValidity,
@@ -502,7 +498,7 @@ class SpotifyAppApiBuilder(
                         token,
                         options.useCache,
                         options.cacheLimit,
-                        false,
+                        options.automaticRefresh,
                         options.retryWhenRateLimited,
                         options.enableLogger,
                         options.testTokenValidity,

src/commonMain/kotlin/com.adamratzman.spotify/http/Endpoints.kt

@@ -2,7 +2,6 @@
 package com.adamratzman.spotify.http
 
 import com.adamratzman.spotify.SpotifyApi
-import com.adamratzman.spotify.SpotifyClientApi
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyException.TimeoutException

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

@@ -24,4 +24,4 @@ internal fun <T : ResultEnum> Array<T>.match(identifier: String) =
 
 internal expect fun formatDate(format: String, date: Long): String
 
-expect fun <T> runBlocking(coroutineCode: suspend () -> T): T
+internal expect fun <T> runBlocking(coroutineCode: suspend () -> T): T

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

@@ -8,6 +8,7 @@ import com.adamratzman.spotify.api
 import com.adamratzman.spotify.block
 import com.adamratzman.spotify.getEnvironmentVariable
 import kotlin.test.assertFailsWith
+import kotlin.test.assertTrue
 import kotlinx.coroutines.GlobalScope
 import org.spekframework.spek2.Spek
 import org.spekframework.spek2.style.specification.describe
@@ -65,6 +66,22 @@ class UtilityTests : Spek({
                     }
                 }.build()
             }
+
+            it("Automatic refresh") {
+                val api = spotifyAppApi {
+                    credentials {
+                        clientId = getEnvironmentVariable("SPOTIFY_CLIENT_ID")
+                        clientSecret = getEnvironmentVariable("SPOTIFY_CLIENT_SECRET")
+                    }
+                }.build()
+
+                api.token = api.token.copy(expiresIn = -1)
+                val currentToken = api.token
+
+                api.browse.getAvailableGenreSeeds().complete()
+
+                assertTrue(api.token.accessToken != currentToken.accessToken)
+            }
         }
     }
 })

src/jsMain/kotlin/com/adamratzman/spotify/utils/Concurrency.kt

@@ -7,7 +7,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.promise
 
-actual inline fun <T> runBlocking(crossinline coroutineCode: suspend () -> T): dynamic {
+internal actual inline fun <T> runBlocking(crossinline coroutineCode: suspend () -> T): dynamic {
     return GlobalScope.promise { coroutineCode() }
 }
 

src/jvmMain/kotlin/com/adamratzman/spotify/utils/Concurrency.kt

@@ -8,7 +8,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking as kRunBlocking
 
-actual inline fun <T> runBlocking(crossinline coroutineCode: suspend () -> T): T = kRunBlocking {
+internal actual inline fun <T> runBlocking(crossinline coroutineCode: suspend () -> T): T = kRunBlocking {
     coroutineCode()
 }