chore: improvements to appcheck implementation

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

Author: bmc08gt

api/src/main/java/com/getcode/network/appcheck/AppCheck.kt

@@ -3,41 +3,69 @@ package com.getcode.network.appcheck
 import com.codeinc.gen.common.v1.Model
 import com.google.firebase.Firebase
 import com.google.firebase.appcheck.AppCheckToken
+import com.google.firebase.appcheck.AppCheckTokenResult
 import com.google.firebase.appcheck.appCheck
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Single
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.reactive.asFlow
+import timber.log.Timber
+
+data class DeviceTokenResult(
+    val token: AppCheckToken?
+)
 
 object AppCheck {
 
     @Deprecated("Replace with Flow variant")
-    fun limitedUseTokenSingle(): Single<AppCheckToken> {
+    fun limitedUseTokenSingle(): Single<DeviceTokenResult> {
         return Single.create { emitter ->
             Firebase.appCheck.limitedUseAppCheckToken
-                .addOnSuccessListener { emitter.onSuccess(it) }
-                .addOnFailureListener { emitter.onError(it) }
+                .addOnSuccessListener { emitter.onSuccess(DeviceTokenResult(it)) }
+                .addOnFailureListener { error ->
+                    val match = "code: \\d+".toRegex().find(error.message.orEmpty())
+                    val errorCode = match?.value?.removePrefix("code: ")?.toInt() ?: -1
+                    Timber.e("Failed to get appcheck token: errorCode=$errorCode ${error.message}")
+
+                    if (errorCode >= 500) {
+                        emitter.onError(error)
+                        return@addOnFailureListener
+                    }
+
+                    emitter.onSuccess(DeviceTokenResult(null))
+                }
         }
     }
 
     @Deprecated("Replace with Flow variant")
     fun limitedUseTokenFlowable(
         backpressureStrategy: BackpressureStrategy = BackpressureStrategy.BUFFER
-    ): Flowable<AppCheckToken> {
+    ): Flowable<DeviceTokenResult> {
         return Flowable.create({ emitter ->
             Firebase.appCheck.limitedUseAppCheckToken
-                .addOnSuccessListener { emitter.onNext(it) }
-                .addOnFailureListener { emitter.onError(it) }
+                .addOnSuccessListener { emitter.onNext(DeviceTokenResult(it)) }
+                .addOnFailureListener { error ->
+                    val match = "code: \\d+".toRegex().find(error.message.orEmpty())
+                    val errorCode = match?.value?.removePrefix("code: ")?.toInt() ?: -1
+                    Timber.e("Failed to get appcheck token: errorCode=$errorCode ${error.message}")
+
+                    if (errorCode >= 500) {
+                        emitter.onError(error)
+                        return@addOnFailureListener
+                    }
+
+                    emitter.onNext(DeviceTokenResult(null))
+                }
         }, backpressureStrategy)
     }
 
     fun limitedUseToken(
         backpressureStrategy: BackpressureStrategy = BackpressureStrategy.BUFFER
-    ): Flow<AppCheckToken> {
+    ): Flow<DeviceTokenResult> {
         return limitedUseTokenFlowable(backpressureStrategy).asFlow()
     }
 }
 
-fun AppCheckToken.toDeviceToken() = Model.DeviceToken.newBuilder().setValue(token).build()
+fun AppCheckToken.toDeviceToken() = Model.DeviceToken.newBuilder().setValue(this.token).build()
 fun String.toDeviceToken() = Model.DeviceToken.newBuilder().setValue(this).build()

api/src/main/java/com/getcode/network/repository/PhoneRepository.kt

@@ -1,16 +1,12 @@
 package com.getcode.network.repository
 
-import com.codeinc.gen.common.v1.Model.DeviceToken
 import com.codeinc.gen.phone.v1.PhoneVerificationService
 import com.getcode.db.Database
-import com.getcode.db.InMemoryDao
 import com.getcode.ed25519.Ed25519
-import com.getcode.model.PrefsBool
-import com.getcode.model.PrefsString
-import com.getcode.network.core.NetworkOracle
 import com.getcode.network.api.PhoneApi
 import com.getcode.network.appcheck.AppCheck
 import com.getcode.network.appcheck.toDeviceToken
+import com.getcode.network.core.NetworkOracle
 import com.google.firebase.Firebase
 import com.google.firebase.appcheck.AppCheckToken
 import com.google.firebase.appcheck.appCheck
@@ -60,8 +56,12 @@ class PhoneRepository @Inject constructor(
                 val request =
                     PhoneVerificationService.SendVerificationCodeRequest.newBuilder()
                         .setPhoneNumber(phoneValue.toPhoneNumber())
-                        .setDeviceToken(tokenResult.toDeviceToken())
-                        .build()
+                        .apply {
+                            if (tokenResult.token != null) {
+                                setDeviceToken(tokenResult.token.toDeviceToken())
+                            }
+                        }.build()
+
 
                 phoneApi.sendVerificationCode(request)
                     .map { it.result }

api/src/main/java/com/getcode/network/repository/TransactionRepository.kt

@@ -90,7 +90,7 @@ class TransactionRepository @Inject constructor(
 
         return AppCheck.limitedUseTokenSingle()
             .flatMap { tokenResult ->
-                submit(createAccounts, organizer.tray.owner.getCluster().authority.keyPair, tokenResult.token)
+                submit(createAccounts, organizer.tray.owner.getCluster().authority.keyPair, tokenResult.token?.token)
             }
     }