Merge pull request #1385 from Adyen/revert-1331-refactor/bcmc

Revert "Refactor BCMC"

bcmc/src/main/java/com/adyen/checkout/bcmc/BcmcComponent.kt

@@ -1,36 +1,106 @@
 /*
- * Copyright (c) 2023 Adyen N.V.
+ * Copyright (c) 2019 Adyen N.V.
  *
  * This file is open source and available under the MIT license. See the LICENSE file for more info.
  *
- * Created by ozgur on 22/8/2023.
+ * Created by arman on 18/9/2019.
  */
-
 package com.adyen.checkout.bcmc
 
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.adyen.checkout.action.core.internal.ActionHandlingComponent
 import com.adyen.checkout.action.core.internal.DefaultActionHandlingComponent
 import com.adyen.checkout.action.core.internal.ui.GenericActionDelegate
 import com.adyen.checkout.bcmc.internal.provider.BcmcComponentProvider
-import com.adyen.checkout.card.CardComponent
-import com.adyen.checkout.card.internal.ui.CardDelegate
+import com.adyen.checkout.bcmc.internal.ui.BcmcDelegate
+import com.adyen.checkout.card.CardBrand
+import com.adyen.checkout.card.CardType
 import com.adyen.checkout.components.core.PaymentMethodTypes
+import com.adyen.checkout.components.core.internal.ButtonComponent
 import com.adyen.checkout.components.core.internal.ComponentEventHandler
 import com.adyen.checkout.components.core.internal.PaymentComponent
+import com.adyen.checkout.components.core.internal.PaymentComponentEvent
+import com.adyen.checkout.components.core.internal.toActionCallback
+import com.adyen.checkout.components.core.internal.ui.ComponentDelegate
+import com.adyen.checkout.core.internal.util.LogUtil
+import com.adyen.checkout.core.internal.util.Logger
+import com.adyen.checkout.ui.core.internal.ui.ButtonDelegate
+import com.adyen.checkout.ui.core.internal.ui.ComponentViewType
+import com.adyen.checkout.ui.core.internal.ui.ViewableComponent
+import com.adyen.checkout.ui.core.internal.util.mergeViewFlows
+import kotlinx.coroutines.flow.Flow
 
 /**
  * A [PaymentComponent] that supports the [PaymentMethodTypes.BCMC] payment method.
  */
-class BcmcComponent(
-    cardDelegate: CardDelegate,
-    genericActionDelegate: GenericActionDelegate,
-    actionHandlingComponent: DefaultActionHandlingComponent,
+class BcmcComponent internal constructor(
+    private val bcmcDelegate: BcmcDelegate,
+    private val genericActionDelegate: GenericActionDelegate,
+    private val actionHandlingComponent: DefaultActionHandlingComponent,
     internal val componentEventHandler: ComponentEventHandler<BcmcComponentState>,
-) : CardComponent(cardDelegate, genericActionDelegate, actionHandlingComponent, componentEventHandler) {
+) : ViewModel(),
+    PaymentComponent,
+    ViewableComponent,
+    ButtonComponent,
+    ActionHandlingComponent by actionHandlingComponent {
+
+    override val delegate: ComponentDelegate get() = actionHandlingComponent.activeDelegate
+
+    override val viewFlow: Flow<ComponentViewType?> = mergeViewFlows(
+        viewModelScope,
+        bcmcDelegate.viewFlow,
+        genericActionDelegate.viewFlow,
+    )
+
+    init {
+        bcmcDelegate.initialize(viewModelScope)
+        genericActionDelegate.initialize(viewModelScope)
+        componentEventHandler.initialize(viewModelScope)
+    }
+
+    internal fun observe(
+        lifecycleOwner: LifecycleOwner,
+        callback: (PaymentComponentEvent<BcmcComponentState>) -> Unit
+    ) {
+        bcmcDelegate.observe(lifecycleOwner, viewModelScope, callback)
+        genericActionDelegate.observe(lifecycleOwner, viewModelScope, callback.toActionCallback())
+    }
+
+    internal fun removeObserver() {
+        bcmcDelegate.removeObserver()
+        genericActionDelegate.removeObserver()
+    }
+
+    override fun isConfirmationRequired(): Boolean = bcmcDelegate.isConfirmationRequired()
+
+    override fun submit() {
+        (delegate as? ButtonDelegate)?.onSubmit() ?: Logger.e(TAG, "Component is currently not submittable, ignoring.")
+    }
+
+    override fun setInteractionBlocked(isInteractionBlocked: Boolean) {
+        (delegate as? BcmcDelegate)?.setInteractionBlocked(isInteractionBlocked)
+            ?: Logger.e(TAG, "Payment component is not interactable, ignoring.")
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        Logger.d(TAG, "onCleared")
+        bcmcDelegate.onCleared()
+        genericActionDelegate.onCleared()
+        componentEventHandler.onCleared()
+    }
+
     companion object {
+        private val TAG = LogUtil.getTag()
+
         @JvmField
         val PROVIDER = BcmcComponentProvider()
 
         @JvmField
         val PAYMENT_METHOD_TYPES = listOf(PaymentMethodTypes.BCMC)
+
+        internal val SUPPORTED_CARD_TYPE = CardBrand(cardType = CardType.BCMC)
     }
 }

bcmc/src/main/java/com/adyen/checkout/bcmc/BcmcComponentState.kt

@@ -3,11 +3,20 @@
  *
  * This file is open source and available under the MIT license. See the LICENSE file for more info.
  *
- * Created by ozgur on 27/9/2023.
+ * Created by ozgur on 20/2/2023.
  */
 
 package com.adyen.checkout.bcmc
 
-import com.adyen.checkout.card.CardComponentState
+import com.adyen.checkout.components.core.PaymentComponentData
+import com.adyen.checkout.components.core.PaymentComponentState
+import com.adyen.checkout.components.core.paymentmethod.CardPaymentMethod
 
-typealias BcmcComponentState = CardComponentState
+/**
+ * Represents the state of [BcmcComponent].
+ */
+data class BcmcComponentState(
+    override val data: PaymentComponentData<CardPaymentMethod>,
+    override val isInputValid: Boolean,
+    override val isReady: Boolean
+) : PaymentComponentState<CardPaymentMethod>

bcmc/src/main/java/com/adyen/checkout/bcmc/internal/provider/BcmcComponentProvider.kt

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2023 Adyen N.V.
+ * Copyright (c) 2019 Adyen N.V.
  *
  * This file is open source and available under the MIT license. See the LICENSE file for more info.
  *
- * Created by ozgur on 22/8/2023.
+ * Created by arman on 18/9/2019.
  */
 
 package com.adyen.checkout.bcmc.internal.provider
@@ -19,11 +19,9 @@ import com.adyen.checkout.action.core.internal.provider.GenericActionComponentPr
 import com.adyen.checkout.bcmc.BcmcComponent
 import com.adyen.checkout.bcmc.BcmcComponentState
 import com.adyen.checkout.bcmc.BcmcConfiguration
+import com.adyen.checkout.bcmc.internal.ui.DefaultBcmcDelegate
 import com.adyen.checkout.bcmc.internal.ui.model.BcmcComponentParamsMapper
-import com.adyen.checkout.card.internal.data.api.BinLookupService
-import com.adyen.checkout.card.internal.data.api.DefaultDetectCardTypeRepository
 import com.adyen.checkout.card.internal.ui.CardValidationMapper
-import com.adyen.checkout.card.internal.ui.DefaultCardDelegate
 import com.adyen.checkout.components.core.ComponentCallback
 import com.adyen.checkout.components.core.Order
 import com.adyen.checkout.components.core.PaymentMethod
@@ -56,8 +54,6 @@ import com.adyen.checkout.sessions.core.internal.data.api.SessionRepository
 import com.adyen.checkout.sessions.core.internal.data.api.SessionService
 import com.adyen.checkout.sessions.core.internal.provider.SessionPaymentComponentProvider
 import com.adyen.checkout.sessions.core.internal.ui.model.SessionParamsFactory
-import com.adyen.checkout.ui.core.internal.data.api.AddressService
-import com.adyen.checkout.ui.core.internal.data.api.DefaultAddressRepository
 import com.adyen.checkout.ui.core.internal.ui.SubmitHandler
 
 class BcmcComponentProvider
@@ -82,7 +78,6 @@ constructor(
 
     private val componentParamsMapper = BcmcComponentParamsMapper(overrideComponentParams, overrideSessionParams)
 
-    @Suppress("LongMethod")
     override fun get(
         savedStateRegistryOwner: SavedStateRegistryOwner,
         viewModelStoreOwner: ViewModelStoreOwner,
@@ -95,45 +90,39 @@ constructor(
         key: String?,
     ): BcmcComponent {
         assertSupported(paymentMethod)
-        val bcmcFactory = viewModelFactory(savedStateRegistryOwner, null) { savedStateHandle ->
-            val componentParams = componentParamsMapper.mapToParams(configuration, null, paymentMethod)
-            val httpClient = HttpClientFactory.getHttpClient(componentParams.environment)
-            val publicKeyService = PublicKeyService(httpClient)
-            val publicKeyRepository = DefaultPublicKeyRepository(publicKeyService)
-            val cardValidationMapper = CardValidationMapper()
-            val dateGenerator = DateGenerator()
-            val clientSideEncrypter = ClientSideEncrypter()
-            val genericEncrypter = DefaultGenericEncrypter(clientSideEncrypter, dateGenerator)
-            val cardEncrypter = DefaultCardEncrypter(genericEncrypter)
-            val addressService = AddressService(httpClient)
-            val addressRepository = DefaultAddressRepository(addressService)
-            val binLookupService = BinLookupService(httpClient)
-            val detectCardTypeRepository = DefaultDetectCardTypeRepository(cardEncrypter, binLookupService)
 
-            val analyticsRepository = analyticsRepository ?: DefaultAnalyticsRepository(
-                analyticsRepositoryData = AnalyticsRepositoryData(
-                    application = application,
-                    componentParams = componentParams,
-                    paymentMethod = paymentMethod,
-                ),
-                analyticsService = AnalyticsService(
-                    HttpClientFactory.getAnalyticsHttpClient(componentParams.environment)
-                ),
-                analyticsMapper = AnalyticsMapper(),
-            )
+        val componentParams = componentParamsMapper.mapToParams(configuration, null)
+        val httpClient = HttpClientFactory.getHttpClient(componentParams.environment)
+        val publicKeyService = PublicKeyService(httpClient)
+        val publicKeyRepository = DefaultPublicKeyRepository(publicKeyService)
+        val cardValidationMapper = CardValidationMapper()
+        val dateGenerator = DateGenerator()
+        val clientSideEncrypter = ClientSideEncrypter()
+        val genericEncrypter = DefaultGenericEncrypter(clientSideEncrypter, dateGenerator)
+        val cardEncrypter = DefaultCardEncrypter(genericEncrypter)
+
+        val analyticsRepository = analyticsRepository ?: DefaultAnalyticsRepository(
+            analyticsRepositoryData = AnalyticsRepositoryData(
+                application = application,
+                componentParams = componentParams,
+                paymentMethod = paymentMethod,
+            ),
+            analyticsService = AnalyticsService(
+                HttpClientFactory.getAnalyticsHttpClient(componentParams.environment)
+            ),
+            analyticsMapper = AnalyticsMapper(),
+        )
 
-            val cardDelegate = DefaultCardDelegate(
+        val bcmcFactory = viewModelFactory(savedStateRegistryOwner, null) { savedStateHandle ->
+            val bcmcDelegate = DefaultBcmcDelegate(
                 observerRepository = PaymentObserverRepository(),
-                publicKeyRepository = publicKeyRepository,
-                componentParams = componentParams,
                 paymentMethod = paymentMethod,
                 order = order,
-                analyticsRepository = analyticsRepository,
-                addressRepository = addressRepository,
-                detectCardTypeRepository = detectCardTypeRepository,
+                publicKeyRepository = publicKeyRepository,
+                componentParams = componentParams,
                 cardValidationMapper = cardValidationMapper,
                 cardEncrypter = cardEncrypter,
-                genericEncrypter = genericEncrypter,
+                analyticsRepository = analyticsRepository,
                 submitHandler = SubmitHandler(savedStateHandle)
             )
 
@@ -144,16 +133,13 @@ constructor(
             )
 
             BcmcComponent(
-                cardDelegate = cardDelegate,
+                bcmcDelegate = bcmcDelegate,
                 genericActionDelegate = genericActionDelegate,
-                actionHandlingComponent = DefaultActionHandlingComponent(genericActionDelegate, cardDelegate),
+                actionHandlingComponent = DefaultActionHandlingComponent(genericActionDelegate, bcmcDelegate),
                 componentEventHandler = DefaultComponentEventHandler(),
             )
         }
-        return ViewModelProvider(
-            viewModelStoreOwner,
-            bcmcFactory
-        )[key, BcmcComponent::class.java].also { component ->
+        return ViewModelProvider(viewModelStoreOwner, bcmcFactory)[key, BcmcComponent::class.java].also { component ->
             component.observe(lifecycleOwner) {
                 component.componentEventHandler.onPaymentComponentEvent(it, componentCallback)
             }
@@ -173,50 +159,43 @@ constructor(
         key: String?
     ): BcmcComponent {
         assertSupported(paymentMethod)
-        val bcmcFactory = viewModelFactory(savedStateRegistryOwner, null) { savedStateHandle ->
-            val componentParams = componentParamsMapper.mapToParams(
-                bcmcConfiguration = configuration,
-                sessionParams = SessionParamsFactory.create(checkoutSession),
-                paymentMethod = paymentMethod
-            )
-            val httpClient = HttpClientFactory.getHttpClient(componentParams.environment)
-            val publicKeyService = PublicKeyService(httpClient)
-            val publicKeyRepository = DefaultPublicKeyRepository(publicKeyService)
-            val cardValidationMapper = CardValidationMapper()
-            val dateGenerator = DateGenerator()
-            val clientSideEncrypter = ClientSideEncrypter()
-            val genericEncrypter = DefaultGenericEncrypter(clientSideEncrypter, dateGenerator)
-            val cardEncrypter = DefaultCardEncrypter(genericEncrypter)
-            val addressService = AddressService(httpClient)
-            val addressRepository = DefaultAddressRepository(addressService)
-            val binLookupService = BinLookupService(httpClient)
-            val detectCardTypeRepository = DefaultDetectCardTypeRepository(cardEncrypter, binLookupService)
 
-            val analyticsRepository = analyticsRepository ?: DefaultAnalyticsRepository(
-                analyticsRepositoryData = AnalyticsRepositoryData(
-                    application = application,
-                    componentParams = componentParams,
-                    paymentMethod = paymentMethod,
-                    sessionId = checkoutSession.sessionSetupResponse.id,
-                ),
-                analyticsService = AnalyticsService(
-                    HttpClientFactory.getAnalyticsHttpClient(componentParams.environment)
-                ),
-                analyticsMapper = AnalyticsMapper(),
-            )
+        val componentParams = componentParamsMapper.mapToParams(
+            bcmcConfiguration = configuration,
+            sessionParams = SessionParamsFactory.create(checkoutSession)
+        )
+        val httpClient = HttpClientFactory.getHttpClient(componentParams.environment)
+        val publicKeyService = PublicKeyService(httpClient)
+        val publicKeyRepository = DefaultPublicKeyRepository(publicKeyService)
+        val cardValidationMapper = CardValidationMapper()
+        val dateGenerator = DateGenerator()
+        val clientSideEncrypter = ClientSideEncrypter()
+        val genericEncrypter = DefaultGenericEncrypter(clientSideEncrypter, dateGenerator)
+        val cardEncrypter = DefaultCardEncrypter(genericEncrypter)
+
+        val analyticsRepository = analyticsRepository ?: DefaultAnalyticsRepository(
+            analyticsRepositoryData = AnalyticsRepositoryData(
+                application = application,
+                componentParams = componentParams,
+                paymentMethod = paymentMethod,
+                sessionId = checkoutSession.sessionSetupResponse.id,
+            ),
+            analyticsService = AnalyticsService(
+                HttpClientFactory.getAnalyticsHttpClient(componentParams.environment)
+            ),
+            analyticsMapper = AnalyticsMapper(),
+        )
 
-            val cardDelegate = DefaultCardDelegate(
+        val bcmcFactory = viewModelFactory(savedStateRegistryOwner, null) { savedStateHandle ->
+            val bcmcDelegate = DefaultBcmcDelegate(
                 observerRepository = PaymentObserverRepository(),
-                publicKeyRepository = publicKeyRepository,
-                componentParams = componentParams,
                 paymentMethod = paymentMethod,
                 order = checkoutSession.order,
-                analyticsRepository = analyticsRepository,
-                addressRepository = addressRepository,
-                detectCardTypeRepository = detectCardTypeRepository,
+                publicKeyRepository = publicKeyRepository,
+                componentParams = componentParams,
                 cardValidationMapper = cardValidationMapper,
                 cardEncrypter = cardEncrypter,
-                genericEncrypter = genericEncrypter,
+                analyticsRepository = analyticsRepository,
                 submitHandler = SubmitHandler(savedStateHandle)
             )
 
@@ -246,17 +225,13 @@ constructor(
             )
 
             BcmcComponent(
-                cardDelegate = cardDelegate,
+                bcmcDelegate = bcmcDelegate,
                 genericActionDelegate = genericActionDelegate,
-                actionHandlingComponent = DefaultActionHandlingComponent(genericActionDelegate, cardDelegate),
+                actionHandlingComponent = DefaultActionHandlingComponent(genericActionDelegate, bcmcDelegate),
                 componentEventHandler = sessionComponentEventHandler,
             )
         }
-
-        return ViewModelProvider(
-            viewModelStoreOwner,
-            bcmcFactory
-        )[key, BcmcComponent::class.java].also { component ->
+        return ViewModelProvider(viewModelStoreOwner, bcmcFactory)[key, BcmcComponent::class.java].also { component ->
             component.observe(lifecycleOwner) {
                 component.componentEventHandler.onPaymentComponentEvent(it, componentCallback)
             }