starred/audiobookshelf-app
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf-app.git synced 2026-09-09 19:31:51 +02:00
Code Issues 454 Packages Projects Releases 10 Wiki Activity

Only clear refresh token and logout when refresh request explicitly rejects, prevents transient request errors from causing a logout

Browse Source
This commit is contained in:
advplyr
2026-09-06 17:16:36 -05:00
parent 6560038495
commit e06ce4a868
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/java/com/audiobookshelf/app/server/ApiHandler.kt
+6 -6
View File
@@ -207,14 +207,12 @@ class ApiHandler(var ctx:Context) {
.build() .build()
} catch (e: Exception) { } catch (e: Exception) {
AbsLogger.error(tag, "Could not create refresh request for ${config.name}: ${e.message}") AbsLogger.error(tag, "Could not create refresh request for ${config.name}: ${e.message}")
handleDownloadRefreshFailure(serverConnectionConfigId)
onResult(null) onResult(null)
return return
} }
(httpClient ?: defaultClient).newCall(request).enqueue(object : Callback { (httpClient ?: defaultClient).newCall(request).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) { override fun onFailure(call: Call, e: IOException) {
AbsLogger.error(tag, "Token refresh failed for ${config.name}: ${e.message}") AbsLogger.error(tag, "Token refresh failed for ${config.name}: ${e.message}")
handleDownloadRefreshFailure(serverConnectionConfigId)
onResult(null) onResult(null)
} }
@@ -222,7 +220,7 @@ class ApiHandler(var ctx:Context) {
response.use { response.use {
if (!it.isSuccessful) { if (!it.isSuccessful) {
AbsLogger.error(tag, "Token refresh returned ${it.code} for ${config.name}") AbsLogger.error(tag, "Token refresh returned ${it.code} for ${config.name}")
handleDownloadRefreshFailure(serverConnectionConfigId) if (it.code == 401 || it.code == 403) handleDownloadRefreshFailure(serverConnectionConfigId)
onResult(null) onResult(null)
return return
} }
@@ -231,7 +229,6 @@ class ApiHandler(var ctx:Context) {
val accessToken = user?.optString("accessToken").orEmpty() val accessToken = user?.optString("accessToken").orEmpty()
if (accessToken.isEmpty()) { if (accessToken.isEmpty()) {
AbsLogger.error(tag, "Refresh response had no access token for ${config.name}") AbsLogger.error(tag, "Refresh response had no access token for ${config.name}")
handleDownloadRefreshFailure(serverConnectionConfigId)
onResult(null) onResult(null)
return return
} }
@@ -239,7 +236,6 @@ class ApiHandler(var ctx:Context) {
onResult(accessToken) onResult(accessToken)
} catch (e: Exception) { } catch (e: Exception) {
AbsLogger.error(tag, "Could not parse refresh response for ${config.name}: ${e.message}") AbsLogger.error(tag, "Could not parse refresh response for ${config.name}: ${e.message}")
handleDownloadRefreshFailure(serverConnectionConfigId)
onResult(null) onResult(null)
} }
} }
@@ -247,7 +243,11 @@ class ApiHandler(var ctx:Context) {
}) })
} }
/** Clears only the server whose refresh token failed; queued downloads can target a non-active server. */ /**
* Clears only the server whose refresh token failed; queued downloads can target a non-active server.
*
* Only call this when the server explicitly rejected the refresh token. Transient failures should not log the user out
*/
private fun handleDownloadRefreshFailure(serverConnectionConfigId: String) { private fun handleDownloadRefreshFailure(serverConnectionConfigId: String) {
secureStorage.removeRefreshToken(serverConnectionConfigId) secureStorage.removeRefreshToken(serverConnectionConfigId)
if (DeviceManager.serverConnectionConfigId != serverConnectionConfigId) return if (DeviceManager.serverConnectionConfigId != serverConnectionConfigId) return