Replace isInfinite util method with ApiToken extension

Infomaniak · Nov 12, 2024 · f438b8f · f438b8f
1 parent 36e75b8
commit f438b8f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/src/main/java/com/infomaniak/lib/core/auth/TokenAuthenticator.kt b/src/main/java/com/infomaniak/lib/core/auth/TokenAuthenticator.kt
@@ -18,7 +18,7 @@
 package com.infomaniak.lib.core.auth
 
 import com.infomaniak.lib.core.api.ApiController
-import com.infomaniak.lib.core.utils.TokenUtils
+import com.infomaniak.lib.core.utils.ApiTokenExt.isInfinite
 import com.infomaniak.lib.login.ApiToken
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
@@ -44,13 +44,12 @@ class TokenAuthenticator(
 
                 val isAlreadyRefreshed = apiToken.accessToken != authorization?.replaceFirst("Bearer ", "")
                 val hasUserChanged = userId != tokenInterceptorListener.getCurrentUserId()
-                val refreshToken = apiToken.refreshToken
 
                 return@runBlocking when {
-                    hasUserChanged || TokenUtils.isInfinite(refreshToken) -> null
+                    hasUserChanged || apiToken.isInfinite -> null
                     isAlreadyRefreshed -> changeAccessToken(request, apiToken)
                     else -> {
-                        val newToken = ApiController.refreshToken(refreshToken, tokenInterceptorListener)
+                        val newToken = ApiController.refreshToken(apiToken.refreshToken!!, tokenInterceptorListener)
                         changeAccessToken(request, newToken)
                     }
                 }

diff --git a/src/main/java/com/infomaniak/lib/core/networking/AccessTokenUsageInterceptor.kt b/src/main/java/com/infomaniak/lib/core/networking/AccessTokenUsageInterceptor.kt
@@ -18,7 +18,7 @@
 package com.infomaniak.lib.core.networking
 
 import com.infomaniak.lib.core.auth.TokenInterceptorListener
-import com.infomaniak.lib.core.utils.TokenUtils
+import com.infomaniak.lib.core.utils.ApiTokenExt.isInfinite
 import io.sentry.Sentry
 import io.sentry.SentryLevel
 import kotlinx.coroutines.Dispatchers
@@ -43,7 +43,7 @@ class AccessTokenUsageInterceptor(
             val apiToken = tokenInterceptorListener.getApiToken() ?: return@runBlocking
 
             // Only log api calls if we're not using refresh tokens
-            if (!TokenUtils.isInfinite(apiToken.refreshToken)) return@runBlocking
+            if (!apiToken.isInfinite) return@runBlocking
 
             val currentApiCall = ApiCallRecord(
                 accessToken = request.header("Authorization")?.replaceFirst("Bearer ", "") ?: return@runBlocking,

diff --git a/...m/infomaniak/lib/core/utils/TokenUtils.kt → .../infomaniak/lib/core/utils/ApiTokenExt.kt b/...m/infomaniak/lib/core/utils/TokenUtils.kt → .../infomaniak/lib/core/utils/ApiTokenExt.kt
@@ -17,15 +17,8 @@
  */
 package com.infomaniak.lib.core.utils
 
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.contract
+import com.infomaniak.lib.login.ApiToken
 
-object TokenUtils {
-    @OptIn(ExperimentalContracts::class)
-    fun isInfinite(refreshToken: String?): Boolean {
-        contract {
-            returns(false) implies (refreshToken != null)
-        }
-        return refreshToken == null
-    }
+object ApiTokenExt {
+    val ApiToken.isInfinite get() = refreshToken == null
 }