Fix refresh token check

nekomangaorg · Oct 28, 2024 · 78babb7 · 78babb7
1 parent 3e0f16d
commit 78babb7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/network/MangaDexTokenAuthenticator.kt b/app/src/main/java/eu/kanade/tachiyomi/network/MangaDexTokenAuthenticator.kt
@@ -33,18 +33,21 @@ class MangaDexTokenAuthenticator(private val loginHelper: MangaDexLoginHelper) :
                 if (validated) {
                     TimberKt.i { "$tag Token is valid, other thread must have refreshed it" }
                 }
-                if (!validated) {
-                    TimberKt.i { "$tag Token is invalid trying to refresh" }
-                    validated = loginHelper.refreshSessionToken()
-                }
-
-                if (!validated) {
-                    TimberKt.i { "$tag Unable to refresh token user will need to relogin" }
+                if (loginHelper.refreshToken().isNotBlank()) {
+                    if (!validated) {
+                        TimberKt.i { "$tag Token is invalid trying to refresh" }
+                        validated = loginHelper.refreshSessionToken()
+                    }
+
+                    if (!validated) {
+                        TimberKt.i { "$tag Unable to refresh token user will need to relogin" }
+                        loginHelper.invalidate()
+                    }
+                } else {
+                    validated = false
                     loginHelper.invalidate()
                 }
 
-                loginHelper.sessionToken()
-
                 return@runBlocking when (validated) {
                     true -> "Bearer ${loginHelper.sessionToken()}"
                     false -> ""

diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/MangaDexLoginHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/MangaDexLoginHelper.kt
@@ -190,4 +190,8 @@ class MangaDexLoginHelper {
     fun sessionToken(): String {
         return preferences.sessionToken().get()
     }
+
+    fun refreshToken(): String {
+        return preferences.refreshToken().get()
+    }
 }