Merge branch 'dev' into kotlinx.serialization

Author: adamint

src/main/kotlin/com/adamratzman/spotify/main/SpotifyAPI.kt

@@ -249,8 +249,10 @@ class SpotifyApiBuilder {
 }
 
 abstract class SpotifyAPI internal constructor(
-    val clientId: String, val clientSecret: String,
-    var token: Token, var useCache: Boolean
+    val clientId: String,
+    val clientSecret: String,
+    var token: Token,
+    var useCache: Boolean
 ) {
     internal var expireTime = System.currentTimeMillis() + token.expires_in * 1000
     internal val executor = Executors.newScheduledThreadPool(2)
@@ -386,10 +388,13 @@ class SpotifyClientAPI internal constructor(
                 contentType = "application/x-www-form-urlencoded"
             ).execute(HttpHeader("Authorization", "Basic ${"$clientId:$clientSecret".byteEncode()}")).body
                 .toObjectNullable<Token>(null)
-        if (tempToken == null) {
+        if (tempToken?.access_token == null) {
             logger.logWarning("Spotify token refresh failed")
         } else {
-            this.token = tempToken
+            this.token = tempToken.copy(
+                refresh_token = tempToken.refresh_token ?: this.token.refresh_token,
+                scope = tempToken.scope ?: this.token.scope
+            )
             logger.logInfo("Successfully refreshed the Spotify token")
         }
     }