fix(flipcash): move register call pre-payment as intended

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

apps/flipcash/features/purchase/src/main/kotlin/com/flipcash/app/purchase/internal/PurchaseAccountViewModel.kt

@@ -20,7 +20,6 @@ import com.getcode.view.BaseViewModel2
 import com.getcode.view.LoadingSuccessState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.flatMapLatest
@@ -152,7 +151,7 @@ internal class PurchaseAccountViewModel @Inject constructor(
             }.filterIsInstance<IapPaymentEvent.OnSuccess>()
             .onEach {
                 dispatchEvent(Event.OnCreatingChanged(true))
-                authManager.registerAccount()
+                authManager.presentCredentialStorage()
                     .onSuccess {
                         dispatchEvent(Event.OnCreatingChanged(creating = false, created = true))
                         delay(2.seconds)

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

@@ -75,7 +75,7 @@ class AuthManager @Inject constructor(
     }
 
     suspend fun createAccount(): Result<Unit> {
-        return credentialManager.create()
+        return credentialManager.createAccount()
             .onSuccess { entropy ->
                 persistence.openDatabase(entropy)
             }.onFailure {
@@ -90,8 +90,8 @@ class AuthManager @Inject constructor(
             }.map { Unit }
     }
 
-    suspend fun registerAccount(): Result<Unit> {
-        return credentialManager.registerCreatedAccount()
+    suspend fun presentCredentialStorage(): Result<Unit> {
+        return credentialManager.presentSaveOption()
             .onSuccess {
                 accountController.getUserFlags().onSuccess { userManager.set(it) }
             }.onFailure {

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

@@ -2,7 +2,6 @@ package com.flipcash.app.auth.internal.credentials
 
 import android.content.Context
 import androidx.credentials.CreatePasswordRequest
-import androidx.credentials.Credential
 import androidx.credentials.CredentialManager
 import androidx.credentials.GetCredentialRequest
 import androidx.credentials.GetPasswordOption
@@ -46,8 +45,9 @@ class PassphraseCredentialManager @Inject constructor(
     private val mnemonicManager: MnemonicManager,
 ) {
     companion object {
-        private val temporaryAccountKey = stringPreferencesKey("temporaryAccount")
-        private fun seenAccessKeyKey(entropy: String) = booleanPreferencesKey("${entropy}_seenAccessKey")
+        private val temporaryEntropyKey = stringPreferencesKey("temporaryEntropy")
+        private val temporaryUserIdKey = stringPreferencesKey("temporaryUserId")
+        private fun seenAccessKeyKey(accountId: String) = booleanPreferencesKey("${accountId}_seenAccessKey")
         private val selectedAccountIdKey = stringPreferencesKey("selectedAccount")
         private fun entropyKey(accountId: String) = stringPreferencesKey("${accountId}_entropy")
         private fun userIdKey(entropy: String) = stringPreferencesKey("${entropy}_userId")
@@ -70,27 +70,14 @@ class PassphraseCredentialManager @Inject constructor(
         produceFile = { context.preferencesDataStoreFile("credentials") }
     )
 
-    suspend fun create(): Result<String> {
+    suspend fun createAccount(): Result<String> {
         // Setup as new
         val seedB64 = Ed25519.createSeed16().encodeBase64()
         userManager.establish(seedB64)
         storage.edit { preferences ->
-            preferences[temporaryAccountKey] = seedB64
-        }
-        return Result.success(seedB64)
-    }
-
-    suspend fun onUserAccessKeySeen(): Result<Unit> {
-        storage.edit { prefs ->
-            prefs[temporaryAccountKey]?.let { entropy ->
-                prefs[seenAccessKeyKey(entropy)] = true
-            }
+            preferences[temporaryEntropyKey] = seedB64
         }
 
-        return Result.success(Unit)
-    }
-
-    suspend fun registerCreatedAccount(): Result<AccountMetadata> {
         // Seed is retrieved internally via userManager state
         val backendResult = accountController.createAccount()
         if (backendResult.isFailure) {
@@ -102,15 +89,38 @@ class PassphraseCredentialManager @Inject constructor(
         }
 
         val userId = backendResult.getOrNull()!!
+
+        storage.edit { preferences ->
+            preferences[temporaryUserIdKey] = userId.base58
+        }
+
+        updateUserManager(userId, AuthState.Unregistered(false))
+
+        return Result.success(seedB64)
+    }
+
+    suspend fun onUserAccessKeySeen(): Result<Unit> {
+        storage.edit { prefs ->
+            prefs[temporaryUserIdKey]?.let { userId ->
+                prefs[seenAccessKeyKey(userId)] = true
+            }
+        }
+
+        return Result.success(Unit)
+    }
+
+    suspend fun presentSaveOption(): Result<AccountMetadata> {
+        val userId = userManager.userId!!
         val entropy = userManager.entropy.orEmpty()
 
         // Store credential
         storeCredential(entropy, userId)
 
         // remove temporary states
         storage.edit {
-            it.remove(temporaryAccountKey)
-            it.remove(seenAccessKeyKey(entropy))
+            it.remove(temporaryEntropyKey)
+            it.remove(temporaryUserIdKey)
+            it.remove(seenAccessKeyKey(userId.base58))
         }
 
         // Store metadata
@@ -133,7 +143,7 @@ class PassphraseCredentialManager @Inject constructor(
             return LookupResult.ExistingAccountFound(existingAccount)
         }
 
-        val temporaryAccount = storage.data.map { it[temporaryAccountKey] }.firstOrNull()
+        val temporaryAccount = storage.data.map { it[temporaryUserIdKey] }.firstOrNull()
         if (temporaryAccount != null) {
             val seenAccessKey = storage.data.map { it[seenAccessKeyKey(temporaryAccount)] }.firstOrNull() ?: false
             return LookupResult.TemporaryAccountCreated(temporaryAccount, seenAccessKey)

services/flipcash/src/main/kotlin/com/flipcash/services/internal/network/api/PurchaseApi.kt

@@ -5,6 +5,7 @@ import com.codeinc.flipcash.gen.iap.v1.IapGrpc
 import com.codeinc.flipcash.gen.iap.v1.IapService
 import com.flipcash.services.internal.annotations.FlipcashManagedChannel
 import com.flipcash.services.internal.model.billing.IapMetadata
+import com.flipcash.services.internal.model.billing.Receipt
 import com.flipcash.services.internal.network.extensions.authenticate
 import com.getcode.ed25519.Ed25519.KeyPair
 import com.getcode.opencode.internal.network.core.GrpcApi
@@ -24,12 +25,12 @@ class PurchaseApi @Inject constructor(
     // OnPurchaseCompleted is called when an IAP has been completed
     fun onPurchaseCompleted(
         owner: KeyPair,
-        receiptValue: String,
+        receipt: Receipt,
         metadata: IapMetadata,
     ): Flow<IapService.OnPurchaseCompletedResponse> {
         val request = IapService.OnPurchaseCompletedRequest.newBuilder()
             .setPlatform(Common.Platform.GOOGLE)
-            .setReceipt(IapService.Receipt.newBuilder().setValue(receiptValue))
+            .setReceipt(IapService.Receipt.newBuilder().setValue(receipt.value))
             .setMetadata(IapService.Metadata.newBuilder()
                 .setProduct(metadata.product)
                 .setCurrency(metadata.currency.name.lowercase())

services/flipcash/src/main/kotlin/com/flipcash/services/internal/network/services/PurchaseService.kt

@@ -17,7 +17,7 @@ internal class PurchaseService @Inject constructor(
 ) {
     suspend fun onPurchaseCompleted(owner: KeyPair, receipt: Receipt, metadata: IapMetadata): Result<Unit> {
         return try {
-            networkOracle.managedRequest(api.onPurchaseCompleted(owner, receipt.value, metadata))
+            networkOracle.managedRequest(api.onPurchaseCompleted(owner, receipt, metadata))
                 .map { response ->
                     when (response.result) {
                         IapService.OnPurchaseCompletedResponse.Result.OK -> Result.success(Unit)

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

@@ -2,6 +2,8 @@ package com.flipcash.services.user
 
 import com.bugsnag.android.Bugsnag
 import com.flipcash.services.internal.model.account.UserFlags
+import com.getcode.crypt.DerivePath
+import com.getcode.crypt.DerivePath.Companion
 import com.getcode.crypt.DerivedKey
 import com.getcode.opencode.controllers.BalanceController
 import com.getcode.opencode.events.Events
@@ -20,10 +22,18 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 sealed interface AuthState {
+    // still to determine
     data object Unknown : AuthState
+    // account has been created but not yet paid for
+    // seenAccessKey used as a flag whether to land them back on
+    // access key screen or purchase
     data class Unregistered(val seenAccessKey: Boolean = true) : AuthState
+    // account has been created and paid for
+    // 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
+    // logged out
     data object LoggedOut : AuthState
 
     val canAccessAuthenticatedApis: Boolean
@@ -73,7 +83,7 @@ class UserManager @Inject constructor(
 
     fun establish(entropy: String) {
         val mnemonic = mnemonicManager.fromEntropyBase64(entropy)
-        val authority = DerivedKey.derive(com.getcode.crypt.DerivePath.primary, mnemonic)
+        val authority = DerivedKey.derive(DerivePath.primary, mnemonic)
         val cluster = AccountCluster.newInstance(authority)
         _state.update {
             it.copy(