Fix first time login error 'failed to fetch user details' (#3633)

First time request to /userinfo failed to pick up on saved access token
opensrp · Nov 25, 2024 · 61412d8 · 61412d8
1 parent 234c571
commit 61412d8
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/.../src/main/java/org/smartregister/fhircore/engine/data/remote/shared/TokenAuthenticator.kt b/.../src/main/java/org/smartregister/fhircore/engine/data/remote/shared/TokenAuthenticator.kt
@@ -40,9 +40,8 @@ import java.util.Base64
 import javax.inject.Inject
 import javax.inject.Singleton
 import javax.net.ssl.SSLHandshakeException
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import org.smartregister.fhircore.engine.configuration.app.ConfigService
 import org.smartregister.fhircore.engine.data.remote.auth.OAuthService
 import org.smartregister.fhircore.engine.data.remote.model.response.OAuthResponse
@@ -201,27 +200,27 @@ constructor(
     }
   }
 
-  private fun saveToken(
+  private suspend fun saveToken(
     username: String,
     password: CharArray,
     oAuthResponse: OAuthResponse,
   ) {
-    accountManager.run {
-      val account =
-        accounts.find { it.name == username && it.type == authConfiguration.accountType }
-      if (account != null) {
-        setPassword(account, oAuthResponse.refreshToken)
-        setAuthToken(account, AUTH_TOKEN_TYPE, oAuthResponse.accessToken)
-      } else {
-        val newAccount = Account(username, authConfiguration.accountType)
-        addAccountExplicitly(newAccount, oAuthResponse.refreshToken, null)
-        setAuthToken(newAccount, AUTH_TOKEN_TYPE, oAuthResponse.accessToken)
+    withContext(dispatcherProvider.io()) {
+      with(accountManager) {
+        val account =
+          accounts.find { it.name == username && it.type == authConfiguration.accountType }
+        if (account != null) {
+          setPassword(account, oAuthResponse.refreshToken)
+          setAuthToken(account, AUTH_TOKEN_TYPE, oAuthResponse.accessToken)
+        } else {
+          val newAccount = Account(username, authConfiguration.accountType)
+          addAccountExplicitly(newAccount, oAuthResponse.refreshToken, null)
+          setAuthToken(newAccount, AUTH_TOKEN_TYPE, oAuthResponse.accessToken)
+        }
       }
 
       // Save credentials
-      CoroutineScope(dispatcherProvider.io()).launch {
-        secureSharedPreference.saveCredentials(username, password)
-      }
+      secureSharedPreference.saveCredentials(username, password)
     }
   }