Tolu/intent conf proto

link/src/main/java/com/stripe/android/link/LinkActivityViewModel.kt

@@ -21,13 +21,16 @@ import com.stripe.android.link.model.LinkAccount
 import com.stripe.android.link.ui.LinkAppBarState
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 internal class LinkActivityViewModel @Inject constructor(
     val activityRetainedComponent: NativeLinkComponent,
-    private val linkAccountManager: LinkAccountManager
+    private val linkAccountManager: LinkAccountManager,
+    private val linkIntentConfirmationHandler: LinkIntentConfirmationHandler
 ) : ViewModel(), DefaultLifecycleObserver {
     private val _linkState = MutableStateFlow(
         value = LinkAppBarState(
@@ -45,6 +48,16 @@ internal class LinkActivityViewModel @Inject constructor(
     var navController: NavHostController? = null
     var dismissWithResult: ((LinkActivityResult) -> Unit)? = null
 
+    fun listenForSuccessfulPayment() {
+        viewModelScope.launch {
+            linkIntentConfirmationHandler.state
+                .filterIsInstance<LinkIntentConfirmationHandler.State.Success>()
+                .collect {
+//                    dismissWithResult?.invoke(LinkActivityResult.Completed())
+                }
+        }
+    }
+
     fun handleViewAction(action: LinkAction) {
         when (action) {
             LinkAction.BackPressed -> handleBackPressed()
@@ -102,10 +115,11 @@ internal class LinkActivityViewModel @Inject constructor(
                 val handle: SavedStateHandle = savedStateHandle ?: createSavedStateHandle()
                 val app = this[APPLICATION_KEY] as Application
                 val args: NativeLinkArgs = getArgs(handle) ?: throw NoArgsException()
-
+                val linkIntentConfirmationHandler = LinkIntentConfirmation.handler ?: throw NoArgsException()
                 DaggerNativeLinkComponent
                     .builder()
                     .configuration(args.configuration)
+                    .linkIntentConfirmationHandler(linkIntentConfirmationHandler)
                     .publishableKeyProvider { args.publishableKey }
                     .stripeAccountIdProvider { args.stripeAccountId }
                     .context(app)

link/src/main/java/com/stripe/android/link/LinkIntentConfirmation.kt

@@ -0,0 +1,33 @@
+package com.stripe.android.link
+
+import com.stripe.android.core.strings.ResolvableString
+import com.stripe.android.model.PaymentMethod
+import com.stripe.android.model.PaymentMethodCreateParams
+import com.stripe.android.model.StripeIntent
+import kotlinx.coroutines.flow.Flow
+
+interface LinkIntentConfirmationHandler {
+    val state: Flow<State>
+
+    suspend fun confirmIntent(
+        intent: StripeIntent,
+        params: PaymentMethodCreateParams
+    )
+
+    sealed interface State {
+        data class Failed(
+            val cause: Throwable,
+            val message: ResolvableString,
+        ) : State
+
+        data object Cancelled : State
+
+        data object Idle : State
+
+        data object Success : State
+    }
+}
+
+object LinkIntentConfirmation {
+    var handler: LinkIntentConfirmationHandler? = null
+}

link/src/main/java/com/stripe/android/link/LinkPaymentLauncher.kt

@@ -59,6 +59,7 @@ class LinkPaymentLauncher @Inject internal constructor(
     fun unregister() {
         linkActivityResultLauncher?.unregister()
         linkActivityResultLauncher = null
+        LinkIntentConfirmation.handler = null
     }
 
     /**
@@ -68,7 +69,9 @@ class LinkPaymentLauncher @Inject internal constructor(
      */
     fun present(
         configuration: LinkConfiguration,
+        linkIntentConfirmationHandler: LinkIntentConfirmationHandler? = null
     ) {
+        LinkIntentConfirmation.handler = linkIntentConfirmationHandler
         val args = LinkActivityContract.Args(
             configuration,
         )

link/src/main/java/com/stripe/android/link/injection/NativeLinkComponent.kt

@@ -6,6 +6,7 @@ import com.stripe.android.core.injection.PUBLISHABLE_KEY
 import com.stripe.android.core.injection.STRIPE_ACCOUNT_ID
 import com.stripe.android.link.LinkActivityViewModel
 import com.stripe.android.link.LinkConfiguration
+import com.stripe.android.link.LinkIntentConfirmationHandler
 import com.stripe.android.link.account.LinkAccountManager
 import com.stripe.android.link.analytics.LinkEventsReporter
 import dagger.BindsInstance
@@ -29,12 +30,16 @@ internal interface NativeLinkComponent {
     val linkEventsReporter: LinkEventsReporter
     val logger: Logger
     val viewModel: LinkActivityViewModel
+    val linkIntentConfirmationHandler: LinkIntentConfirmationHandler
 
     @Component.Builder
     interface Builder {
         @BindsInstance
         fun configuration(configuration: LinkConfiguration): Builder
 
+        @BindsInstance
+        fun linkIntentConfirmationHandler(linkIntentConfirmationHandler: LinkIntentConfirmationHandler): Builder
+
         @BindsInstance
         fun publishableKeyProvider(@Named(PUBLISHABLE_KEY) publishableKeyProvider: () -> String): Builder
 

link/src/test/java/com/stripe/android/link/ui/wallet/WalletScreenTest.kt

@@ -41,7 +41,6 @@ internal class WalletScreenTest {
         composeTestRule.setContent {
             WalletScreen(viewModel)
         }
-        composeTestRule.waitForIdle()
 
         onWalletCollapsedHeader().assertIsDisplayed()
         onWalletCollapsedChevron().assertIsDisplayed()
@@ -56,12 +55,8 @@ internal class WalletScreenTest {
             WalletScreen(viewModel)
         }
 
-        composeTestRule.waitForIdle()
-
         onCollapsedWalletRow().performClick()
 
-        composeTestRule.waitForIdle()
-
         onWalletAddPaymentMethodRow().assertIsDisplayed().assertHasClickAction()
         onExpandedWalletHeader().assertIsDisplayed()
         onPaymentMethodList().assertCountEquals(3)
@@ -77,8 +72,6 @@ internal class WalletScreenTest {
             WalletScreen(viewModel)
         }
 
-        composeTestRule.waitForIdle()
-
         onLoader().assertIsDisplayed()
         onPaymentMethodList().assertCountEquals(0)
     }

paymentsheet/src/main/java/com/stripe/android/paymentelement/confirmation/DefaultLinkIntentConfirmationHandler.kt

@@ -0,0 +1,81 @@
+package com.stripe.android.paymentelement.confirmation
+
+import com.stripe.android.link.LinkIntentConfirmationHandler
+import com.stripe.android.model.PaymentIntent
+import com.stripe.android.model.PaymentMethodCreateParams
+import com.stripe.android.model.SetupIntent
+import com.stripe.android.model.StripeIntent
+import com.stripe.android.paymentsheet.state.PaymentElementLoader
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+
+internal class DefaultLinkIntentConfirmationHandler @Inject constructor(
+    private val confirmationHandler: ConfirmationHandler
+) : LinkIntentConfirmationHandler {
+
+    override val state: Flow<LinkIntentConfirmationHandler.State>
+        get() {
+            return confirmationHandler.state.map(::transformConfirmationHandlerState)
+        }
+
+    override suspend fun confirmIntent(
+        intent: StripeIntent,
+        params: PaymentMethodCreateParams
+    ) {
+        confirmationHandler.start(
+            arguments = ConfirmationHandler.Args(
+                intent = intent,
+                confirmationOption = PaymentMethodConfirmationOption.New(
+                    initializationMode = intent.initializationMode(),
+                    shippingDetails = null,
+                    createParams = params,
+                    optionsParams = null,
+                    shouldSave = false
+                )
+            )
+        )
+    }
+
+    private fun transformConfirmationHandlerState(
+        confirmationHandlerState: ConfirmationHandler.State
+    ): LinkIntentConfirmationHandler.State {
+        return when (confirmationHandlerState) {
+            is ConfirmationHandler.State.Complete -> {
+                when (val result = confirmationHandlerState.result) {
+                    is ConfirmationHandler.Result.Canceled -> {
+                        LinkIntentConfirmationHandler.State.Cancelled
+                    }
+                    is ConfirmationHandler.Result.Failed -> {
+                        LinkIntentConfirmationHandler.State.Failed(
+                            cause = result.cause,
+                            message = result.message
+                        )
+                    }
+                    is ConfirmationHandler.Result.Succeeded -> {
+                        LinkIntentConfirmationHandler.State.Success
+                    }
+                }
+            }
+            is ConfirmationHandler.State.Confirming -> {
+                LinkIntentConfirmationHandler.State.Idle
+            }
+            ConfirmationHandler.State.Idle -> {
+                LinkIntentConfirmationHandler.State.Idle
+            }
+        }
+    }
+
+    private fun StripeIntent.initializationMode(): PaymentElementLoader.InitializationMode {
+        return when (this) {
+            is PaymentIntent -> {
+                PaymentElementLoader.InitializationMode.PaymentIntent(
+                    clientSecret = clientSecret ?: ""
+                )
+            }
+            is SetupIntent -> PaymentElementLoader.InitializationMode.SetupIntent(
+                clientSecret = clientSecret ?: ""
+            )
+        }
+    }
+}

paymentsheet/src/main/java/com/stripe/android/paymentsheet/LinkHandler.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.SavedStateHandle
 import com.stripe.android.link.LinkActivityResult
 import com.stripe.android.link.LinkConfiguration
 import com.stripe.android.link.LinkConfigurationCoordinator
+import com.stripe.android.link.LinkIntentConfirmationHandler
 import com.stripe.android.link.LinkPaymentDetails
 import com.stripe.android.link.LinkPaymentLauncher
 import com.stripe.android.link.account.LinkStore
@@ -37,6 +38,7 @@ internal class LinkHandler @Inject constructor(
     val linkConfigurationCoordinator: LinkConfigurationCoordinator,
     private val savedStateHandle: SavedStateHandle,
     private val linkStore: LinkStore,
+    private val linkIntentConfirmationHandler: LinkIntentConfirmationHandler,
     linkAnalyticsComponentBuilder: LinkAnalyticsComponent.Builder,
 ) {
     sealed class ProcessingState {
@@ -203,6 +205,7 @@ internal class LinkHandler @Inject constructor(
 
         linkLauncher.present(
             config,
+            linkIntentConfirmationHandler
         )
 
         _processingState.tryEmit(ProcessingState.Launched)

paymentsheet/src/main/java/com/stripe/android/paymentsheet/flowcontroller/DefaultFlowController.kt

@@ -16,6 +16,7 @@ import com.stripe.android.common.exception.stripeErrorMessage
 import com.stripe.android.core.exception.StripeException
 import com.stripe.android.core.injection.ENABLE_LOGGING
 import com.stripe.android.link.LinkActivityResult
+import com.stripe.android.link.LinkIntentConfirmationHandler
 import com.stripe.android.link.LinkPaymentLauncher
 import com.stripe.android.model.PaymentMethod
 import com.stripe.android.model.PaymentMethodOptionsParams
@@ -85,7 +86,8 @@ internal class DefaultFlowController @Inject internal constructor(
     private val configurationHandler: FlowControllerConfigurationHandler,
     private val errorReporter: ErrorReporter,
     @InitializedViaCompose private val initializedViaCompose: Boolean,
-    private val cvcRecollectionHandler: CvcRecollectionHandler
+    private val cvcRecollectionHandler: CvcRecollectionHandler,
+    private val linkIntentConfirmationHandler: LinkIntentConfirmationHandler
 ) : PaymentSheet.FlowController {
     private val paymentOptionActivityLauncher: ActivityResultLauncher<PaymentOptionContract.Args>
     private val sepaMandateActivityLauncher: ActivityResultLauncher<SepaMandateContract.Args>
@@ -662,7 +664,10 @@ internal class DefaultFlowController @Inject internal constructor(
 
         if (paymentSelection is PaymentSelection.Link) {
             // User selected Link as the payment method, not inline
-            linkLauncher.present(linkConfig)
+            linkLauncher.present(
+                linkConfig,
+                linkIntentConfirmationHandler
+            )
         } else {
             // New user paying inline, complete without launching Link
             confirmPaymentSelection(paymentSelection, state, appearance)

paymentsheet/src/main/java/com/stripe/android/paymentsheet/flowcontroller/FlowControllerModule.kt

@@ -5,8 +5,10 @@ import android.content.Context
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import com.stripe.android.core.injection.IOContext
+import com.stripe.android.link.LinkIntentConfirmationHandler
 import com.stripe.android.paymentelement.confirmation.ALLOWS_MANUAL_CONFIRMATION
 import com.stripe.android.paymentelement.confirmation.ConfirmationHandler
+import com.stripe.android.paymentelement.confirmation.DefaultLinkIntentConfirmationHandler
 import com.stripe.android.payments.core.injection.PRODUCT_USAGE
 import com.stripe.android.paymentsheet.analytics.EventReporter
 import com.stripe.android.paymentsheet.injection.PaymentOptionsViewModelSubcomponent
@@ -64,6 +66,16 @@ internal object FlowControllerModule {
         )
     }
 
+    @Provides
+    @Singleton
+    fun providesLinkIntentConfirmationHandler(
+        confirmationHandler: ConfirmationHandler,
+    ): LinkIntentConfirmationHandler {
+        return DefaultLinkIntentConfirmationHandler(
+            confirmationHandler = confirmationHandler
+        )
+    }
+
     @Provides
     @Singleton
     fun provideStripeImageLoader(context: Context): StripeImageLoader {

paymentsheet/src/main/java/com/stripe/android/paymentsheet/injection/PaymentOptionsViewModelFactoryComponent.kt

@@ -3,6 +3,8 @@ package com.stripe.android.paymentsheet.injection
 import android.content.Context
 import com.stripe.android.core.injection.CoreCommonModule
 import com.stripe.android.core.injection.CoroutineContextModule
+import com.stripe.android.googlepaylauncher.injection.GooglePayLauncherModule
+import com.stripe.android.paymentelement.confirmation.ConfirmationModule
 import com.stripe.android.payments.core.injection.PRODUCT_USAGE
 import com.stripe.android.payments.core.injection.StripeRepositoryModule
 import com.stripe.android.ui.core.forms.resources.injection.ResourceRepositoryModule
@@ -19,7 +21,9 @@ import javax.inject.Singleton
         PaymentOptionsViewModelModule::class,
         CoroutineContextModule::class,
         CoreCommonModule::class,
-        ResourceRepositoryModule::class
+        ResourceRepositoryModule::class,
+        ConfirmationModule::class,
+        GooglePayLauncherModule::class,
     ]
 )
 internal interface PaymentOptionsViewModelFactoryComponent {

paymentsheet/src/main/java/com/stripe/android/paymentsheet/injection/PaymentOptionsViewModelModule.kt

@@ -1,8 +1,11 @@
 package com.stripe.android.paymentsheet.injection
 
+import com.stripe.android.paymentelement.confirmation.ALLOWS_MANUAL_CONFIRMATION
+//import com.stripe.android.paymentelement.confirmation.STATUS_BAR_COLOR_PROVIDER
 import com.stripe.android.paymentsheet.analytics.EventReporter
 import dagger.Module
 import dagger.Provides
+import javax.inject.Named
 import javax.inject.Singleton
 
 @Module(
@@ -15,4 +18,14 @@ internal class PaymentOptionsViewModelModule {
     @Provides
     @Singleton
     fun provideEventReporterMode(): EventReporter.Mode = EventReporter.Mode.Custom
+
+//    @Provides
+//    @Named(STATUS_BAR_COLOR_PROVIDER)
+//    fun providesStatusBarColor(): () -> Int? {
+//        return { null }
+//    }
+
+    @Provides
+    @Named(ALLOWS_MANUAL_CONFIRMATION)
+    fun provideAllowsManualConfirmation() = false
 }

paymentsheet/src/main/java/com/stripe/android/paymentsheet/injection/PaymentOptionsViewModelSubcomponent.kt

@@ -2,12 +2,15 @@ package com.stripe.android.paymentsheet.injection
 
 import android.app.Application
 import androidx.lifecycle.SavedStateHandle
+import com.stripe.android.paymentelement.confirmation.ConfirmationModule
 import com.stripe.android.paymentsheet.PaymentOptionContract
 import com.stripe.android.paymentsheet.PaymentOptionsViewModel
 import dagger.BindsInstance
 import dagger.Subcomponent
 
-@Subcomponent
+@Subcomponent(
+    modules = [ConfirmationModule::class]
+)
 internal interface PaymentOptionsViewModelSubcomponent {
     val viewModel: PaymentOptionsViewModel
 

paymentsheet/src/test/java/com/stripe/android/paymentelement/confirmation/DefaultIntentConfirmationInterceptorTest.kt → paymentsheet/src/test/java/com/stripe/android/paymentelement/confirmation/DefaultLinkIntentConfirmationInterceptorTest.kt

@@ -39,7 +39,7 @@ import java.util.Objects
 import kotlin.test.assertFailsWith
 
 @RunWith(RobolectricTestRunner::class)
-class DefaultIntentConfirmationInterceptorTest {
+class DefaultLinkIntentConfirmationInterceptorTest {
 
     @get:Rule
     val intentConfirmationInterceptorTestRule = IntentConfirmationInterceptorTestRule()