fix: handle auth state consistency when requiresIapForRegistration is false

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/App.kt

@@ -169,7 +169,7 @@ internal fun App(
                                     userManager.authState
                                 ) {
                                     if (codeNavigator.lastItem is MainRoot) return@LaunchedEffect
-                                    if (userManager.authState !is AuthState.LoggedIn) {
+                                    if (userManager.authState !is AuthState.LoggedInWithUser) {
                                         // reset login request here
                                         // if we are not currently logged in, then the deeplink
                                         // is most likely being processed in [MainRoot] during launch

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/navigation/MainRoot.kt

@@ -36,8 +36,6 @@ import com.flipcash.services.internal.model.account.UserFlags
 import com.flipcash.services.user.AuthState
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.theme.CodeCircularProgressIndicator
-import com.getcode.util.permissions.LocalPermissionChecker
-import com.getcode.util.permissions.PermissionChecker
 import com.getcode.utils.trace
 import dev.theolm.rinku.DeepLink
 import kotlinx.coroutines.delay
@@ -122,7 +120,7 @@ internal class MainRoot(private val deepLink: () -> DeepLink?) : Screen, Parcela
                             showLogo = true
                         }
 
-                        AuthState.LoggedIn -> {
+                        AuthState.LoggedInWithUser -> {
                             showLogo = false
                         }
 
@@ -167,7 +165,7 @@ internal class MainRoot(private val deepLink: () -> DeepLink?) : Screen, Parcela
                 }
             }
 
-            AuthState.LoggedIn -> {
+            AuthState.LoggedInWithUser -> {
                 val screens = router.processDestination(deepLink())
 
                 screens.ifEmpty {

apps/flipcash/features/menu/src/main/kotlin/com/flipcash/app/menu/internal/MenuScreenViewModel.kt

@@ -74,7 +74,7 @@ internal class MenuScreenViewModel @Inject constructor(
 
     init {
         userManager.state
-            .filter { it.authState is AuthState.LoggedIn }
+            .filter { it.authState is AuthState.LoggedInWithUser }
             .mapNotNull { it.flags }
             .map { it.isStaff }
             .onEach {
@@ -83,12 +83,12 @@ internal class MenuScreenViewModel @Inject constructor(
             }.launchIn(viewModelScope)
 
         featureFlags.observeOverride()
-            .filter { userManager.authState is AuthState.LoggedIn }
+            .filter { userManager.authState is AuthState.LoggedInWithUser }
             .onEach { dispatchEvent(Event.OnBetaFeaturesUnlocked(it)) }
             .launchIn(viewModelScope)
 
         featureFlags.observe()
-            .filter { userManager.authState is AuthState.LoggedIn }
+            .filter { userManager.authState is AuthState.LoggedInWithUser }
             .onEach { dispatchEvent(Event.OnFeatureFlagsUpdated(it)) }
             .launchIn(viewModelScope)
 

apps/flipcash/features/scanner/src/main/kotlin/com/flipcash/app/scanner/internal/ui/components/ScannerNavigationBar.kt

@@ -72,16 +72,15 @@ internal fun ScannerNavigationBar(
             onClick = { onAction(ScannerDecorItem.Cash) }
         )
 
-        if (state.poolsOpen) {
-            BottomBarAction(
-                modifier = Modifier.weight(1f),
-                label = stringResource(R.string.action_pool),
-                painter = painterResource(R.drawable.ic_flipcash_pools),
-                badgeCount = 0,
-                onClick = { onAction(ScannerDecorItem.Pools) },
-                toast = {}
-            )
-        }
+
+        BottomBarAction(
+            modifier = Modifier.weight(1f),
+            label = stringResource(R.string.action_pool),
+            painter = painterResource(R.drawable.ic_flipcash_pools),
+            badgeCount = 0,
+            onClick = { onAction(ScannerDecorItem.Pools) },
+            toast = {}
+        )
 
         BottomBarAction(
             modifier = Modifier.weight(1f),

apps/flipcash/shared/authentication/src/main/kotlin/com/flipcash/app/auth/AuthManager.kt

@@ -5,9 +5,9 @@ import com.bugsnag.android.Bugsnag
 import com.flipcash.app.appsettings.AppSettingsCoordinator
 import com.flipcash.app.auth.internal.credentials.LookupResult
 import com.flipcash.app.auth.internal.credentials.PassphraseCredentialManager
-import com.flipcash.app.persistence.PersistenceProvider
 import com.flipcash.app.auth.internal.extensions.token
 import com.flipcash.app.featureflags.FeatureFlagController
+import com.flipcash.app.persistence.PersistenceProvider
 import com.flipcash.services.controllers.AccountController
 import com.flipcash.services.controllers.PushController
 import com.flipcash.services.user.AuthState
@@ -16,7 +16,6 @@ import com.flipcash.shared.authentication.BuildConfig
 import com.getcode.crypt.MnemonicPhrase
 import com.getcode.opencode.controllers.BalanceController
 import com.getcode.opencode.model.core.ID
-import com.getcode.utils.ErrorUtils
 import com.getcode.utils.TraceType
 import com.getcode.utils.trace
 import com.google.firebase.Firebase
@@ -75,7 +74,6 @@ class AuthManager @Inject constructor(
 
     private suspend fun softLogin(entropyB64: String): Result<ID> {
         if (softLoginDisabled) return Result.failure(Throwable("Disabled"))
-        println("entropyB64: $entropyB64")
         return login(entropyB64, isSoftLogin = true)
     }
 
@@ -101,7 +99,9 @@ class AuthManager @Inject constructor(
     suspend fun onUserAccessKeySeen(): Result<Unit> {
         return credentialManager.onUserAccessKeySeen()
             .onSuccess {
-                userManager.set(AuthState.Registered(true))
+                if (userManager.authState !is AuthState.LoggedIn) {
+                    userManager.set(AuthState.Registered(true))
+                }
             }.map { Unit }
     }
 
@@ -116,7 +116,7 @@ class AuthManager @Inject constructor(
         return credentialManager.onAccountPurchased()
             .fold(
                 onSuccess = {
-                    userManager.set(AuthState.LoggedIn)
+                    userManager.set(AuthState.LoggedInWithUser)
                     accountController.getUserFlags()
                         .onSuccess { userManager.set(it) }
                 },
@@ -149,9 +149,8 @@ class AuthManager @Inject constructor(
 
                 accountController.getUserFlags()
                     .onSuccess { flags ->
-                        println("flags: $flags")
                         userManager.set(flags)
-                        userManager.set(if (flags.isRegistered) AuthState.LoggedIn else AuthState.Registered())
+                        userManager.set(if (flags.isRegistered) AuthState.LoggedInWithUser else AuthState.Registered())
                     }.onFailure {
                         taggedTrace("Failed to get user flags", type = TraceType.Error, cause = it)
                         userManager.set(authState = AuthState.Registered())

apps/flipcash/shared/authentication/src/main/kotlin/com/flipcash/app/auth/internal/credentials/PassphraseCredentialManager.kt

@@ -202,7 +202,7 @@ class PassphraseCredentialManager @Inject constructor(
         val selectedMetadata = getSelectedMetadata()
         if (selectedMetadata != null && selectedMetadata.entropy == entropy) {
             storeMetadata(selectedMetadata, isSelected = true)
-            updateUserManager(selectedMetadata.id, AuthState.LoggedIn)
+            updateUserManager(selectedMetadata.id, AuthState.LoggedInWithUser)
             return Result.success(selectedMetadata)
         }
 

apps/flipcash/shared/router/src/main/kotlin/com/flipcash/app/router/internal/AppRouter.kt

@@ -10,7 +10,6 @@ import com.flipcash.app.core.navigation.fragments
 import com.flipcash.app.router.Router
 import com.flipcash.services.user.AuthState
 import com.flipcash.services.user.UserManager
-import com.getcode.vendor.Base58
 import dev.theolm.rinku.DeepLink
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -29,22 +28,22 @@ internal class AppRouter(
             val type = processType(deeplink) ?: return emptyList()
             when (type) {
                 is DeeplinkType.Login -> {
-                    if (userManager.authState is AuthState.LoggedIn) {
+                    if (userManager.authState is AuthState.LoggedInWithUser) {
                         listOf(ScreenRegistry.get(NavScreenProvider.HomeScreen.Scanner(type)))
                     } else {
                         listOf(ScreenRegistry.get(NavScreenProvider.Login.Home(type.entropy, true)))
                     }
                 }
                 is DeeplinkType.CashLink -> {
-                    if (userManager.authState is AuthState.LoggedIn) {
+                    if (userManager.authState is AuthState.LoggedInWithUser) {
                         listOf(ScreenRegistry.get(NavScreenProvider.HomeScreen.Scanner(type)))
                     } else {
                         listOf(ScreenRegistry.get(NavScreenProvider.Login.Home()))
                     }
                 }
 
                 is DeeplinkType.Pool -> {
-                    if (userManager.authState is AuthState.LoggedIn) {
+                    if (userManager.authState is AuthState.LoggedInWithUser) {
                         listOf(ScreenRegistry.get(NavScreenProvider.HomeScreen.Scanner(type)))
                     } else {
                         listOf(ScreenRegistry.get(NavScreenProvider.Login.Home()))
@@ -79,7 +78,6 @@ internal class AppRouter(
 
                         pool.contains(deeplink.pathSegments[0]) -> {
                             val seed = deeplink.data.toUri().fragments[Key.entropy] ?: return null
-                            println("seed=$seed")
                             DeeplinkType.Pool(seed)
                         }
                         else -> null

apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/SessionController.kt

@@ -34,7 +34,6 @@ interface SessionController {
 data class SessionState(
     val isCameraPermissionGranted: Boolean? = null,
     val vibrateOnScan: Boolean = false,
-    val poolsOpen: Boolean = false,
     val balance: Fiat? = null,
     val logScanTimes: Boolean = false,
     val showNetworkOffline: Boolean = false,

apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt

@@ -154,10 +154,6 @@ class RealSessionController @Inject constructor(
             .onEach { enabled -> _state.update { it.copy(vibrateOnScan = enabled) } }
             .launchIn(scope)
 
-        featureFlagController.observe(FeatureFlag.Pools)
-            .onEach { enabled -> _state.update { it.copy(poolsOpen = enabled) } }
-            .launchIn(scope)
-
         poolsCoordinator.openPool
             .onEach { id ->
                 if (id == null) {

services/flipcash/src/main/kotlin/com/flipcash/services/user/UserManager.kt

@@ -5,12 +5,10 @@ import com.flipcash.services.internal.model.account.UserFlags
 import com.getcode.crypt.DerivePath
 import com.getcode.crypt.DerivedKey
 import com.getcode.crypt.MnemonicPhrase
-import com.getcode.opencode.controllers.AccountController
 import com.getcode.opencode.controllers.BalanceController
 import com.getcode.opencode.events.Events
 import com.getcode.opencode.model.accounts.AccountCluster
 import com.getcode.opencode.managers.MnemonicManager
-import com.getcode.opencode.model.accounts.AccountInfo
 import com.getcode.opencode.model.accounts.PoolAccount
 import com.getcode.opencode.model.core.ID
 import com.getcode.opencode.model.core.NoId
@@ -31,23 +29,25 @@ import javax.inject.Singleton
 sealed interface AuthState {
     // still to determine
     data object Unknown : AuthState
-    // account has been created but not yet paid for
+    // account has been created but not yet paid for (if required)
     // seenAccessKey used as a flag whether to land them back on
     // access key screen or purchase
     data class Registered(val seenAccessKey: Boolean = true) : AuthState
-    // account has been created and paid for
+
+    sealed interface LoggedIn
+    // account has been created and paid for (if required)
     // and we are waiting for metadata to be pulled from storage
-    data object LoggedInAwaitingUser : AuthState
-    // account is paid for and we ready for use in app
-    data object LoggedIn : AuthState
+    data object LoggedInAwaitingUser : AuthState, LoggedIn
+    // account is paid for (if required) and is ready for use in app
+    data object LoggedInWithUser : AuthState, LoggedIn
     // logged out
     data object LoggedOut : AuthState
 
     val canAccessAuthenticatedApis: Boolean
-        get() = this is LoggedIn
+        get() = this is LoggedInWithUser
 
     val isAtLeastRegistered: Boolean
-        get() = this is LoggedIn || this is Registered
+        get() = this is LoggedInWithUser || this is Registered
 }
 
 @Singleton
@@ -79,9 +79,6 @@ class UserManager @Inject constructor(
     val authState: AuthState
         get() = _state.value.authState
 
-    val isRegistered: Boolean
-        get() = _state.value.flags?.isRegistered == true
-
     val nextPoolIndex: Long
         get() = _state.value.nextPoolIndex
 
@@ -135,8 +132,7 @@ class UserManager @Inject constructor(
         _state.update { it.copy(authState = authState) }
 
         when (authState) {
-            AuthState.LoggedIn,
-            AuthState.LoggedInAwaitingUser -> {
+            is AuthState.LoggedIn -> {
                 accountCluster?.let { owner ->
                     eventBus.send(Events.UpdateLimits(owner = owner, force = true))
                 }