feat(fc): add iap protos and integrate into GooglePlayBillingClient

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

Author: bmc08gt

definitions/flipchat/protos/src/main/proto/common/v1/flipchat.proto

@@ -88,3 +88,8 @@ message QueryOptions {
         DESC = 1;
     }
 }
+enum Platform {
+    UNKNOWN = 0;
+    APPLE   = 1;
+    GOOGLE  = 2;
+}

definitions/flipchat/protos/src/main/proto/iap/v1/iap_service.proto

@@ -0,0 +1,27 @@
+syntax = "proto3";
+package flipchat.iap.v1;
+option go_package = "github.com/code-payments/flipchat-protobuf-api/generated/go/iap/v1;iappb";
+option java_package = "com.codeinc.flipchat.gen.iap.v1";
+option objc_class_prefix = "FPBIapV1";
+import "common/v1/flipchat.proto";
+
+service Iap {
+    // OnPurchaseCompleted is called when an IAP has been completed
+    rpc OnPurchaseCompleted(OnPurchaseCompletedRequest) returns (OnPurchaseCompletedResponse);
+}
+message OnPurchaseCompletedRequest {
+    common.v1.Platform platform = 1;
+    Receipt receipt = 2;
+    common.v1.Auth auth = 3;
+}
+message OnPurchaseCompletedResponse {
+    Result result = 1;
+    enum Result {
+        OK              = 0;
+        DENIED          = 1;
+        INVALID_RECEIPT = 2; // Returned if the receipt is invalid, or not in a completed payment state
+    }
+}
+message Receipt {
+    string value = 1 ;
+}

flipchatApp/src/main/kotlin/xyz/flipchat/app/MainActivity.kt

@@ -24,17 +24,13 @@ import com.getcode.utils.network.NetworkConnectivityListener
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import dagger.hilt.android.AndroidEntryPoint
 import dev.bmcreations.tipkit.engines.TipsEngine
-import dev.theolm.rinku.RinkuInit
 import dev.theolm.rinku.compose.ext.Rinku
 import xyz.flipchat.app.beta.BetaFlags
-import xyz.flipchat.app.features.home.HomeViewModel
 import xyz.flipchat.app.ui.LocalBetaFeatures
-import xyz.flipchat.app.util.Router
 import xyz.flipchat.services.LocalPaymentController
 import xyz.flipchat.services.PaymentController
-import xyz.flipchat.services.billing.BillingController
-import xyz.flipchat.services.billing.GooglePlayBillingController
-import xyz.flipchat.services.billing.LocalIapController
+import xyz.flipchat.services.billing.BillingClient
+import xyz.flipchat.services.billing.LocalBillingClient
 import xyz.flipchat.services.user.UserManager
 import javax.inject.Inject
 import kotlin.system.exitProcess
@@ -70,7 +66,7 @@ class MainActivity : FragmentActivity() {
     lateinit var betaFeatures: BetaFlags
 
     @Inject
-    lateinit var iapController: BillingController
+    lateinit var iapController: BillingClient
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -87,7 +83,7 @@ class MainActivity : FragmentActivity() {
                 LocalUserManager provides userManager,
                 LocalPaymentController provides paymentController,
                 LocalBetaFeatures provides betaFeatures,
-                LocalIapController provides iapController
+                LocalBillingClient provides iapController
             ) {
                 Rinku {
                     App(tipsEngine = tipsEngine)

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/login/register/PurchaseAccountScreen.kt

@@ -58,10 +58,11 @@ import xyz.flipchat.app.R
 import xyz.flipchat.app.auth.AuthManager
 import xyz.flipchat.app.features.chat.lookup.confirm.LoadingSuccessState
 import xyz.flipchat.app.ui.LocalUserManager
-import xyz.flipchat.services.billing.BillingController
+import xyz.flipchat.controllers.PurchaseController
+import xyz.flipchat.services.billing.BillingClient
 import xyz.flipchat.services.billing.IapPaymentEvent
 import xyz.flipchat.services.billing.IapProduct
-import xyz.flipchat.services.billing.LocalIapController
+import xyz.flipchat.services.billing.LocalBillingClient
 import xyz.flipchat.services.user.UserManager
 import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
@@ -85,7 +86,7 @@ class PurchaseAccountScreen : ModalScreen, Parcelable {
 private fun PurchaseAccountScreenContent(viewModel: PurchaseAccountViewModel) {
     val navigator = LocalCodeNavigator.current
     val context = LocalContext.current
-    val billingController = LocalIapController.current
+    val billingController = LocalBillingClient.current
     val userManager = LocalUserManager.current
     val composeScope = rememberCoroutineScope()
 
@@ -179,7 +180,8 @@ private fun PurchaseAccountScreenContent(viewModel: PurchaseAccountViewModel) {
 private class PurchaseAccountViewModel @Inject constructor(
     private val userManager: UserManager,
     private val authManager: AuthManager,
-    iapController: BillingController,
+    iapController: PurchaseController,
+    billingClient: BillingClient,
     resources: ResourceHelper,
 ) : BaseViewModel2<PurchaseAccountViewModel.State, PurchaseAccountViewModel.Event>(
     initialState = State(),
@@ -205,10 +207,10 @@ private class PurchaseAccountViewModel @Inject constructor(
             .launchIn(viewModelScope)
 
         viewModelScope.launch {
-            dispatchEvent(Event.OnCostChanged(iapController.costOf(IapProduct.CreateAccount)))
+            dispatchEvent(Event.OnCostChanged(billingClient.costOf(IapProduct.CreateAccount)))
         }
 
-        iapController.eventFlow
+        billingClient.eventFlow
             .mapNotNull { event ->
                 when (event) {
                     IapPaymentEvent.OnCancelled -> null
@@ -224,6 +226,7 @@ private class PurchaseAccountViewModel @Inject constructor(
                     is IapPaymentEvent.OnSuccess -> event
                 }
             }.filterIsInstance<IapPaymentEvent.OnSuccess>()
+
             .onEach {
                 dispatchEvent(Event.OnCreatingChanged(true))
                 authManager.register(userManager.displayName!!)

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/login/register/RegisterInfoScreen.kt

@@ -17,7 +17,6 @@ import androidx.compose.material.icons.filled.Person
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
@@ -41,7 +40,7 @@ import com.getcode.ui.theme.CodeScaffold
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.parcelize.Parcelize
 import xyz.flipchat.app.R
-import xyz.flipchat.services.billing.BillingController
+import xyz.flipchat.services.billing.BillingClient
 import xyz.flipchat.services.billing.IapProduct
 import xyz.flipchat.services.user.UserManager
 import javax.inject.Inject
@@ -164,7 +163,7 @@ private fun RegisterInfoScreenContent(
 @HiltViewModel
 private class RegisterInfoViewModel @Inject constructor(
     private val userManager: UserManager,
-    private val iapController: BillingController
+    private val iapController: BillingClient
 ) : ViewModel() {
 
     val userId: ID?

flipchatApp/src/main/kotlin/xyz/flipchat/app/inject/AppModule.kt

@@ -7,7 +7,6 @@ import android.net.ConnectivityManager
 import android.net.wifi.WifiManager
 import android.os.Build
 import android.os.VibratorManager
-import android.support.v4.os.IResultReceiver.Stub
 import android.telephony.TelephonyManager
 import androidx.core.app.NotificationManagerCompat
 import com.getcode.services.analytics.AnalyticsService
@@ -36,9 +35,9 @@ import xyz.flipchat.app.util.AndroidLocale
 import xyz.flipchat.app.util.FcTab
 import xyz.flipchat.app.util.Router
 import xyz.flipchat.app.util.RouterImpl
-import xyz.flipchat.services.billing.BillingController
-import xyz.flipchat.services.billing.GooglePlayBillingController
-import xyz.flipchat.services.billing.StubBillingController
+import xyz.flipchat.services.billing.BillingClient
+import xyz.flipchat.services.billing.GooglePlayBillingClient
+import xyz.flipchat.services.billing.StubBillingClient
 import xyz.flipchat.services.user.UserManager
 import javax.inject.Singleton
 
@@ -152,9 +151,9 @@ object AppModule {
     fun providesBillingController(
         @ApplicationContext context: Context,
         userManager: UserManager,
-    ): BillingController = if (BuildConfig.DEBUG) {
-        StubBillingController
+    ): BillingClient = if (BuildConfig.DEBUG) {
+        StubBillingClient
     } else {
-        GooglePlayBillingController(context, userManager)
+        GooglePlayBillingClient(context, userManager)
     }
 }

services/flipchat/chat/build.gradle.kts

@@ -46,6 +46,9 @@ dependencies {
     implementation(Libs.kotlinx_serialization_json)
     implementation(Libs.inject)
 
+    implementation(platform(Libs.compose_bom))
+    implementation(Libs.compose_ui)
+
     implementation(Libs.grpc_android)
     implementation(Libs.grpc_okhttp)
     implementation(Libs.grpc_kotlin)
@@ -70,6 +73,9 @@ dependencies {
     kapt(Libs.androidx_room_compiler)
     implementation(Libs.sqlcipher)
 
+    api(Libs.google_play_billing_runtime)
+    api(Libs.google_play_billing_ktx)
+
     implementation(Libs.fingerprint_pro)
 
     implementation(Libs.lib_phone_number_google)

…at/services/billing/BillingController.kt …ipchat/services/billing/BillingClient.ktservices/flipchat/payments/src/main/kotlin/xyz/flipchat/services/billing/BillingController.kt renamed to services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/billing/BillingClient.kt services/flipchat/payments/src/main/kotlin/xyz/flipchat/services/billing/BillingController.kt renamed to services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/billing/BillingClient.kt

@@ -32,9 +32,9 @@ enum class BillingClientState {
     fun canConnect() = this == Disconnected || this == ConnectionLost || this == Failed
 }
 
-val LocalIapController = staticCompositionLocalOf<BillingController> { StubBillingController }
+val LocalBillingClient = staticCompositionLocalOf<BillingClient> { StubBillingClient }
 
-interface BillingController {
+interface BillingClient {
     val eventFlow: SharedFlow<IapPaymentEvent>
     val state: StateFlow<BillingClientState>
 
@@ -45,7 +45,7 @@ interface BillingController {
     suspend fun purchase(activity: Activity, product: IapProduct)
 }
 
-object StubBillingController: BillingController {
+object StubBillingClient: BillingClient {
     private val _eventFlow: MutableSharedFlow<IapPaymentEvent> = MutableSharedFlow()
     override val eventFlow: SharedFlow<IapPaymentEvent> = _eventFlow.asSharedFlow()