Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preserve payment selection for guests #5480

Merged
merged 8 commits into from
Sep 9, 2022
Merged

Preserve payment selection for guests #5480

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
40f245e
Preserve payment selection for guests
tillh-stripe Aug 29, 2022
9c8b2d4
Add tests for new initializer logic
tillh-stripe Aug 29, 2022
f2c4ec4
Inject whether Link is enabled for testability
tillh-stripe Aug 30, 2022
4a31c7b
Add test to check that Link is preferred
tillh-stripe Aug 30, 2022
bd261ef
Tweak code in initializer
tillh-stripe Aug 30, 2022
11d4389
Update API
tillh-stripe Aug 30, 2022
a48e9d5
Fix tests
tillh-stripe Aug 30, 2022
2cdcc4a
Update changelog
tillh-stripe Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Inject whether Link is enabled for testability
  • Loading branch information
@tillh-stripe
tillh-stripe committed Sep 9, 2022
commit f2c4ec4a39318d0ac23feb9e1f8a5d9e8c499fb4
6 changes: 6 additions & 0 deletions link/src/main/java/com/stripe/android/link/injection/NamedConstants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ const val CUSTOMER_NAME = "customerName"
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
const val SHIPPING_VALUES = "shippingValues"

/**
* Identifies whether Link is enabled.
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
const val LINK_ENABLED = "linkEnabled"

/**
* Identifies the Stripe Intent being processed by Link.
*/
Expand Down
7 changes: 5 additions & 2 deletions ...n/java/com/stripe/android/paymentsheet/flowcontroller/DefaultFlowControllerInitializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.stripe.android.core.injection.IOContext
import com.stripe.android.googlepaylauncher.GooglePayEnvironment
import com.stripe.android.googlepaylauncher.GooglePayRepository
import com.stripe.android.link.LinkPaymentLauncher
import com.stripe.android.link.injection.LINK_ENABLED
import com.stripe.android.model.PaymentMethod
import com.stripe.android.model.StripeIntent
import com.stripe.android.paymentsheet.PaymentSheet
Expand All @@ -23,6 +24,7 @@ import com.stripe.android.ui.core.forms.resources.ResourceRepository
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.withContext
import javax.inject.Inject
import javax.inject.Named
import javax.inject.Singleton
import kotlin.coroutines.CoroutineContext

Expand All @@ -38,7 +40,8 @@ internal class DefaultFlowControllerInitializer @Inject constructor(
private val lpmResourceRepository: ResourceRepository<LpmRepository>,
private val logger: Logger,
val eventReporter: EventReporter,
@IOContext private val workContext: CoroutineContext
@IOContext private val workContext: CoroutineContext,
@Named(LINK_ENABLED) private val isLinkEnabled: Boolean
) : FlowControllerInitializer {

override suspend fun init(
Expand All @@ -50,7 +53,7 @@ internal class DefaultFlowControllerInitializer @Inject constructor(
retrieveStripeIntent(clientSecret)
}.fold(
onSuccess = { stripeIntent ->
val isLinkReady = LinkPaymentLauncher.LINK_ENABLED &&
val isLinkReady = isLinkEnabled &&
stripeIntent.paymentMethodTypes.contains(PaymentMethod.Type.Link.code)

create(
Expand Down
7 changes: 7 additions & 0 deletions paymentsheet/src/main/java/com/stripe/android/paymentsheet/injection/FlowControllerModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import android.content.Context
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelStoreOwner
import com.stripe.android.core.injection.IOContext
import com.stripe.android.link.LinkPaymentLauncher
import com.stripe.android.link.injection.LINK_ENABLED
import com.stripe.android.payments.core.injection.PRODUCT_USAGE
import com.stripe.android.paymentsheet.DefaultPrefsRepository
import com.stripe.android.paymentsheet.PaymentSheet
Expand Down Expand Up @@ -70,6 +72,11 @@ internal abstract class FlowControllerModule {
@Named(PRODUCT_USAGE)
fun provideProductUsageTokens() = setOf("PaymentSheet.FlowController")

@Provides
@Singleton
@Named(LINK_ENABLED)
fun provideLinkEnabled() = LinkPaymentLauncher.LINK_ENABLED

@Provides
@Singleton
fun provideViewModel(viewModelStoreOwner: ViewModelStoreOwner): FlowControllerViewModel =
Expand Down