Merge pull request #433 from code-payments/fix/prevent-sodium-from-blocking-account-fetching

fix(session): prevent sodium initialization from blocking token resolution

Author: bmc08gt

api/src/main/java/com/getcode/manager/SessionManager.kt

@@ -7,6 +7,7 @@ import com.getcode.network.client.registerInstallation
 import com.getcode.network.client.updatePreferences
 import com.getcode.solana.organizer.Organizer
 import com.getcode.utils.installationId
+import com.getcode.utils.trace
 import com.google.firebase.Firebase
 import com.google.firebase.installations.installations
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -52,7 +53,7 @@ class SessionManager @Inject constructor(
     }
 
     fun clear() {
-        Timber.d("Clearing session state")
+        trace("Clearing session state")
         update {
             SessionState(entropyB64 = null, keyPair = null, isAuthenticated = false)
         }

app/src/main/java/com/getcode/manager/AuthManager.kt

@@ -25,6 +25,7 @@ import com.getcode.network.repository.getPublicKeyBase58
 import com.getcode.network.repository.isMock
 import com.getcode.util.AccountUtils
 import com.getcode.utils.ErrorUtils
+import com.getcode.utils.TraceType
 import com.getcode.utils.installationId
 import com.getcode.utils.trace
 import com.getcode.utils.token
@@ -62,13 +63,20 @@ class AuthManager @Inject constructor(
 ) : CoroutineScope by CoroutineScope(Dispatchers.IO) {
     private var softLoginDisabled: Boolean = false
 
+    companion object {
+        private const val TAG = "AuthManager"
+        internal fun taggedTrace(message: String, type: TraceType = TraceType.Log) {
+            trace(message = message, type = type, tag = TAG)
+        }
+    }
+
     @SuppressLint("CheckResult")
     fun init(onInitialized: () -> Unit = { }) {
         launch {
-            LibsodiumInitializer.initialize()
             val token = AccountUtils.getToken(context)
             softLogin(token.orEmpty())
                 .subscribeOn(Schedulers.computation())
+                .doOnComplete { LibsodiumInitializer.initializeWithCallback(onInitialized) }
                 .subscribe(onInitialized, ErrorUtils::handleError)
         }
     }
@@ -83,9 +91,10 @@ class AuthManager @Inject constructor(
         isSoftLogin: Boolean = false,
         rollbackOnError: Boolean = false
     ): Completable {
-        trace("Login: isSoftLogin: $isSoftLogin, rollbackOnError: $rollbackOnError")
+        taggedTrace("Login: isSoftLogin: $isSoftLogin, rollbackOnError: $rollbackOnError")
 
         if (entropyB64.isEmpty()) {
+            taggedTrace("provided entropy was empty", type = TraceType.Error)
             sessionManager.clear()
             return Completable.complete()
         }
@@ -163,14 +172,14 @@ class AuthManager @Inject constructor(
             .ignoreElement()
     }
 
-    fun deleteAndLogout(activity: Activity, onComplete: () -> Unit = {}) {
+    fun deleteAndLogout(context: Context, onComplete: () -> Unit = {}) {
         //todo: add account deletion
-        logout(activity, onComplete)
+        logout(context, onComplete)
     }
 
-    fun logout(activity: Activity, onComplete: () -> Unit = {}) {
+    fun logout(context: Context, onComplete: () -> Unit = {}) {
         launch {
-            AccountUtils.removeAccounts(activity)
+            AccountUtils.removeAccounts(context)
                 .doOnSuccess { res: Boolean ->
                     if (res) {
                         clearToken()
@@ -181,8 +190,8 @@ class AuthManager @Inject constructor(
         }
     }
 
-    suspend fun logout(activity: Activity): Result<Unit> {
-        return AccountUtils.removeAccounts(activity).toFlowable()
+    suspend fun logout(context: Context): Result<Unit> {
+        return AccountUtils.removeAccounts(context).toFlowable()
             .to {
                 runCatching { it.firstOrError().blockingGet() }
             }.onSuccess {
@@ -194,7 +203,7 @@ class AuthManager @Inject constructor(
     private fun fetchData(entropyB64: String):
             Single<Pair<PhoneRepository.GetAssociatedPhoneNumberResponse, IdentityRepository.GetUserResponse>> {
 
-        trace("fetching account data")
+        taggedTrace("fetching account data")
 
         var owner = SessionManager.authState.value.keyPair
         if (owner == null || SessionManager.authState.value.entropyB64 != entropyB64) {
@@ -226,7 +235,7 @@ class AuthManager @Inject constructor(
                     .toSingleDefault(Pair(phone!!, user!!))
             }
             .doOnSuccess {
-                trace("account data fetched successfully")
+                taggedTrace("account data fetched successfully")
                 launch { savePrefs(phone!!, user!!) }
                 launch { exchange.fetchRatesIfNeeded() }
                 launch { historyController.fetchChats() }
@@ -240,7 +249,7 @@ class AuthManager @Inject constructor(
 
     private fun loginAnalytics(entropyB64: String) {
         val owner = mnemonicManager.getKeyPair(entropyB64)
-        trace("analytics login event")
+        taggedTrace("analytics login event")
         analytics.login(
             ownerPublicKey = owner.getPublicKeyBase58(),
             autoCompleteCount = 0,

app/src/main/java/com/getcode/util/AccountUtils.kt

@@ -33,7 +33,7 @@ object AccountUtils {
         am.setAuthToken(a, acctType, token)
     }
 
-    suspend fun removeAccounts(context: Activity): @NonNull Single<Boolean> {
+    suspend fun removeAccounts(context: Context): @NonNull Single<Boolean> {
         return getAccount(context)
             .map {
                 if (it.second == null) return@map false
@@ -42,7 +42,7 @@ object AccountUtils {
             }
     }
 
-    private suspend fun getAccount(context: Activity): @NonNull Single<Pair<String?, Account?>> {
+    private suspend fun getAccount(context: Context): @NonNull Single<Pair<String?, Account?>> {
         val subject = SingleSubject.create<Pair<String?, Account?>>()
         return subject.doOnSubscribe {
             CoroutineScope(Dispatchers.IO).launch {
@@ -61,7 +61,9 @@ object AccountUtils {
         }
     }
 
-    private suspend fun getAccountNoActivity(context: Context) : Pair<String?, Account?>? = suspendCancellableCoroutine {cont ->
+    private suspend fun getAccountNoActivity(
+        context: Context
+    ) : Pair<String?, Account?>? = suspendCancellableCoroutine { cont ->
         trace("getAuthToken", type = TraceType.Silent)
         val am: AccountManager = AccountManager.get(context)
         val accountthing = am.accounts.getOrNull(0)