feat(POM-436): (Dynamic Checkout) Cancel express payment when switched during processing

sdk/src/main/kotlin/com/processout/sdk/api/service/DefaultInvoicesService.kt

@@ -14,6 +14,7 @@ import com.processout.sdk.core.ProcessOutResult
 import com.processout.sdk.core.logger.POLogAttribute
 import com.processout.sdk.core.logger.POLogger
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
@@ -79,39 +80,37 @@ internal class DefaultInvoicesService(
         request: POInvoiceAuthorizationRequest,
         threeDSService: PO3DSService,
         callback: (ProcessOutResult<Unit>) -> Unit
-    ) {
-        scope.launch {
-            when (val result = repository.authorizeInvoice(request)) {
-                is ProcessOutResult.Success ->
-                    result.value.customerAction?.let { action ->
-                        this@DefaultInvoicesService.threeDSService
-                            .handle(action, threeDSService) { serviceResult ->
-                                @Suppress("DEPRECATION")
-                                when (serviceResult) {
-                                    is ProcessOutResult.Success ->
-                                        authorizeInvoice(
-                                            request.copy(source = serviceResult.value),
-                                            threeDSService,
-                                            callback
-                                        )
-                                    is ProcessOutResult.Failure -> {
-                                        threeDSService.cleanup()
-                                        callback(serviceResult)
-                                    }
+    ): Job = scope.launch {
+        when (val result = repository.authorizeInvoice(request)) {
+            is ProcessOutResult.Success ->
+                result.value.customerAction?.let { action ->
+                    this@DefaultInvoicesService.threeDSService
+                        .handle(action, threeDSService) { serviceResult ->
+                            @Suppress("DEPRECATION")
+                            when (serviceResult) {
+                                is ProcessOutResult.Success ->
+                                    authorizeInvoice(
+                                        request.copy(source = serviceResult.value),
+                                        threeDSService,
+                                        callback
+                                    )
+                                is ProcessOutResult.Failure -> {
+                                    threeDSService.cleanup()
+                                    callback(serviceResult)
                                 }
                             }
-                    } ?: run {
-                        threeDSService.cleanup()
-                        callback(ProcessOutResult.Success(Unit))
-                    }
-                is ProcessOutResult.Failure -> {
-                    POLogger.warn(
-                        message = "Failed to authorize invoice: %s", result,
-                        attributes = mapOf(POLogAttribute.INVOICE_ID to request.invoiceId)
-                    )
+                        }
+                } ?: run {
                     threeDSService.cleanup()
-                    callback(result)
+                    callback(ProcessOutResult.Success(Unit))
                 }
+            is ProcessOutResult.Failure -> {
+                POLogger.warn(
+                    message = "Failed to authorize invoice: %s", result,
+                    attributes = mapOf(POLogAttribute.INVOICE_ID to request.invoiceId)
+                )
+                threeDSService.cleanup()
+                callback(result)
             }
         }
     }

sdk/src/main/kotlin/com/processout/sdk/api/service/POInvoicesService.kt

@@ -11,6 +11,7 @@ import com.processout.sdk.api.model.response.PONativeAlternativePaymentMethodTra
 import com.processout.sdk.core.ProcessOutCallback
 import com.processout.sdk.core.ProcessOutResult
 import com.processout.sdk.core.annotation.ProcessOutInternalApi
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.SharedFlow
 
 /**
@@ -41,7 +42,7 @@ interface POInvoicesService {
         request: POInvoiceAuthorizationRequest,
         threeDSService: PO3DSService,
         callback: (ProcessOutResult<Unit>) -> Unit
-    )
+    ): Job
 
     /**
      * Initiates native alternative payment with the given request.

sdk/src/main/kotlin/com/processout/sdk/api/service/proxy3ds/PODefaultProxy3DSService.kt

@@ -12,14 +12,17 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import java.util.UUID
 
 /** @suppress */
 @ProcessOutInternalApi
 class PODefaultProxy3DSService(
-    private val scope: CoroutineScope = MainScope(),
-    private val eventDispatcher: POEventDispatcher = POEventDispatcher
+    private val scope: CoroutineScope = MainScope()
 ) : POProxy3DSService {
 
+    private val uuid = UUID.randomUUID()
+    private val eventDispatcher = POEventDispatcher
+
     private var authenticationCallback: ((ProcessOutResult<PO3DS2AuthenticationRequest>) -> Unit)? = null
     private var challengeCallback: ((ProcessOutResult<Boolean>) -> Unit)? = null
     private var redirectCallback: ((ProcessOutResult<String>) -> Unit)? = null
@@ -28,10 +31,14 @@ class PODefaultProxy3DSService(
         eventDispatcher.subscribeForResponse<POProxy3DSServiceResponse>(
             coroutineScope = scope
         ) { response ->
+            if (response.uuid != uuid) {
+                return@subscribeForResponse
+            }
             when (response) {
                 is POProxy3DSServiceResponse.Authentication -> authenticationCallback?.invoke(response.result)
                 is POProxy3DSServiceResponse.Challenge -> challengeCallback?.invoke(response.result)
                 is POProxy3DSServiceResponse.Redirect -> redirectCallback?.invoke(response.result)
+                is POProxy3DSServiceResponse.Close -> close()
             }
         }
     }
@@ -41,38 +48,34 @@ class PODefaultProxy3DSService(
         callback: (ProcessOutResult<PO3DS2AuthenticationRequest>) -> Unit
     ) {
         authenticationCallback = callback
-        scope.launch {
-            eventDispatcher.send(Authentication(configuration = configuration))
-        }
+        dispatch(Authentication(uuid = uuid, configuration = configuration))
     }
 
     override fun handle(
         challenge: PO3DS2Challenge,
         callback: (ProcessOutResult<Boolean>) -> Unit
     ) {
         challengeCallback = callback
-        scope.launch {
-            eventDispatcher.send(Challenge(challenge = challenge))
-        }
+        dispatch(Challenge(uuid = uuid, challenge = challenge))
     }
 
     override fun handle(
         redirect: PO3DSRedirect,
         callback: (ProcessOutResult<String>) -> Unit
     ) {
         redirectCallback = callback
-        scope.launch {
-            eventDispatcher.send(Redirect(redirect = redirect))
-        }
+        dispatch(Redirect(uuid = uuid, redirect = redirect))
     }
 
     override fun cleanup() {
         authenticationCallback = null
         challengeCallback = null
         redirectCallback = null
-        scope.launch {
-            eventDispatcher.send(Cleanup())
-        }
+        dispatch(Cleanup(uuid = uuid))
+    }
+
+    private fun dispatch(request: POProxy3DSServiceRequest) {
+        scope.launch { eventDispatcher.send(request) }
     }
 
     override fun close() {

sdk/src/main/kotlin/com/processout/sdk/api/service/proxy3ds/POProxy3DSServiceRequest.kt

@@ -12,21 +12,19 @@ import java.util.UUID
 sealed interface POProxy3DSServiceRequest : POEventDispatcher.Request {
 
     data class Authentication(
-        override val uuid: UUID = UUID.randomUUID(),
+        override val uuid: UUID,
         val configuration: PO3DS2Configuration
     ) : POProxy3DSServiceRequest
 
     data class Challenge(
-        override val uuid: UUID = UUID.randomUUID(),
+        override val uuid: UUID,
         val challenge: PO3DS2Challenge
     ) : POProxy3DSServiceRequest
 
     data class Redirect(
-        override val uuid: UUID = UUID.randomUUID(),
+        override val uuid: UUID,
         val redirect: PO3DSRedirect
     ) : POProxy3DSServiceRequest
 
-    data class Cleanup(
-        override val uuid: UUID = UUID.randomUUID()
-    ) : POProxy3DSServiceRequest
+    data class Cleanup(override val uuid: UUID) : POProxy3DSServiceRequest
 }

sdk/src/main/kotlin/com/processout/sdk/api/service/proxy3ds/POProxy3DSServiceResponse.kt

@@ -24,4 +24,6 @@ sealed interface POProxy3DSServiceResponse : POEventDispatcher.Response {
         override val uuid: UUID,
         val result: ProcessOutResult<String>
     ) : POProxy3DSServiceResponse
+
+    data class Close(override val uuid: UUID) : POProxy3DSServiceResponse
 }

sdk/src/main/kotlin/com/processout/sdk/ui/apm/POAlternativePaymentMethodCustomTabLauncher.kt

@@ -15,10 +15,10 @@ import com.processout.sdk.core.logger.POLogger
 import com.processout.sdk.ui.web.WebAuthorizationActivityResultDispatcher
 import com.processout.sdk.ui.web.WebAuthorizationDelegate
 import com.processout.sdk.ui.web.WebAuthorizationDelegateCache
-import com.processout.sdk.ui.web.customtab.CustomTabAuthorizationActivityContract
-import com.processout.sdk.ui.web.customtab.CustomTabConfiguration
+import com.processout.sdk.ui.web.customtab.POCustomTabAuthorizationActivityContract
+import com.processout.sdk.ui.web.customtab.POCustomTabConfiguration
 import com.processout.sdk.ui.web.webview.WebViewAuthorizationActivityLauncher
-import com.processout.sdk.ui.web.webview.WebViewConfiguration
+import com.processout.sdk.ui.web.webview.POWebViewConfiguration
 
 /**
  * Launcher that starts [POCustomTabAuthorizationActivity][com.processout.sdk.ui.web.customtab.POCustomTabAuthorizationActivity]
@@ -30,7 +30,7 @@ class POAlternativePaymentMethodCustomTabLauncher private constructor(
     private val delegateCache: WebAuthorizationDelegateCache
 ) {
 
-    private lateinit var customTabLauncher: ActivityResultLauncher<CustomTabConfiguration>
+    private lateinit var customTabLauncher: ActivityResultLauncher<POCustomTabConfiguration>
     private lateinit var webViewFallbackLauncher: WebViewAuthorizationActivityLauncher
 
     companion object {
@@ -48,7 +48,7 @@ class POAlternativePaymentMethodCustomTabLauncher private constructor(
         ).apply {
             val activityResultHandler = ActivityResultHandler(alternativePaymentMethods, callback)
             customTabLauncher = from.registerForActivityResult(
-                CustomTabAuthorizationActivityContract(from.requireActivity()),
+                POCustomTabAuthorizationActivityContract(from.requireActivity()),
                 activityResultHandler
             )
             webViewFallbackLauncher = WebViewAuthorizationActivityLauncher.create(
@@ -70,7 +70,7 @@ class POAlternativePaymentMethodCustomTabLauncher private constructor(
         ).apply {
             val activityResultHandler = ActivityResultHandler(alternativePaymentMethods, callback)
             customTabLauncher = from.registerForActivityResult(
-                CustomTabAuthorizationActivityContract(from),
+                POCustomTabAuthorizationActivityContract(from),
                 from.activityResultRegistry,
                 activityResultHandler
             )
@@ -92,7 +92,7 @@ class POAlternativePaymentMethodCustomTabLauncher private constructor(
             WebAuthorizationActivityResultDispatcher
         ).apply {
             customTabLauncher = from.registerForActivityResult(
-                CustomTabAuthorizationActivityContract(from.requireActivity()),
+                POCustomTabAuthorizationActivityContract(from.requireActivity()),
                 activityResultCallback
             )
             webViewFallbackLauncher = WebViewAuthorizationActivityLauncher.create(
@@ -113,7 +113,7 @@ class POAlternativePaymentMethodCustomTabLauncher private constructor(
             WebAuthorizationActivityResultDispatcher
         ).apply {
             customTabLauncher = from.registerForActivityResult(
-                CustomTabAuthorizationActivityContract(from),
+                POCustomTabAuthorizationActivityContract(from),
                 from.activityResultRegistry,
                 activityResultCallback
             )
@@ -145,7 +145,7 @@ class POAlternativePaymentMethodCustomTabLauncher private constructor(
     fun launch(uri: Uri, returnUrl: String) {
         if (ProcessOut.instance.browserCapabilities.isCustomTabsSupported()) {
             customTabLauncher.launch(
-                CustomTabConfiguration(
+                POCustomTabConfiguration(
                     uri = uri,
                     returnUri = Uri.parse(returnUrl),
                     timeoutSeconds = null
@@ -154,7 +154,7 @@ class POAlternativePaymentMethodCustomTabLauncher private constructor(
         } else {
             POLogger.info("Custom Chrome Tabs is not supported on device. Will use WebView.")
             webViewFallbackLauncher.launch(
-                WebViewConfiguration(
+                POWebViewConfiguration(
                     uri = uri,
                     returnUris = listOf(
                         Uri.parse(ApiConstants.CHECKOUT_RETURN_URL),

sdk/src/main/kotlin/com/processout/sdk/ui/apm/POAlternativePaymentMethodWebViewBuilder.kt

@@ -10,7 +10,7 @@ import com.processout.sdk.api.network.ApiConstants
 import com.processout.sdk.core.ProcessOutResult
 import com.processout.sdk.ui.web.WebAuthorizationDelegate
 import com.processout.sdk.ui.web.webview.ProcessOutWebView
-import com.processout.sdk.ui.web.webview.WebViewConfiguration
+import com.processout.sdk.ui.web.webview.POWebViewConfiguration
 
 @Deprecated("Use POAlternativePaymentMethodCustomTabLauncher.")
 class POAlternativePaymentMethodWebViewBuilder(
@@ -30,7 +30,7 @@ class POAlternativePaymentMethodWebViewBuilder(
 
     fun build(): WebView = ProcessOutWebView(
         activity,
-        WebViewConfiguration(
+        POWebViewConfiguration(
             uri = delegate?.uri,
             returnUris = listOf(Uri.parse(ApiConstants.CHECKOUT_RETURN_URL)),
             sdkVersion = ProcessOut.VERSION,

sdk/src/main/kotlin/com/processout/sdk/ui/threeds/PO3DSRedirectCustomTabLauncher.kt

@@ -9,14 +9,14 @@ import com.processout.sdk.api.network.ApiConstants
 import com.processout.sdk.core.POFailure
 import com.processout.sdk.core.ProcessOutResult
 import com.processout.sdk.core.logger.POLogger
-import com.processout.sdk.ui.web.ActivityResultApi
+import com.processout.sdk.ui.web.POActivityResultApi
 import com.processout.sdk.ui.web.WebAuthorizationActivityResultDispatcher
 import com.processout.sdk.ui.web.WebAuthorizationDelegate
 import com.processout.sdk.ui.web.WebAuthorizationDelegateCache
-import com.processout.sdk.ui.web.customtab.CustomTabAuthorizationActivityContract
-import com.processout.sdk.ui.web.customtab.CustomTabConfiguration
+import com.processout.sdk.ui.web.customtab.POCustomTabAuthorizationActivityContract
+import com.processout.sdk.ui.web.customtab.POCustomTabConfiguration
 import com.processout.sdk.ui.web.webview.WebViewAuthorizationActivityLauncher
-import com.processout.sdk.ui.web.webview.WebViewConfiguration
+import com.processout.sdk.ui.web.webview.POWebViewConfiguration
 
 /**
  * Launcher that starts [POCustomTabAuthorizationActivity][com.processout.sdk.ui.web.customtab.POCustomTabAuthorizationActivity]
@@ -27,7 +27,7 @@ class PO3DSRedirectCustomTabLauncher private constructor(
     private val delegateCache: WebAuthorizationDelegateCache
 ) {
 
-    private lateinit var contract: CustomTabAuthorizationActivityContract
+    private lateinit var contract: POCustomTabAuthorizationActivityContract
     private lateinit var webViewFallbackLauncher: WebViewAuthorizationActivityLauncher
 
     companion object {
@@ -37,7 +37,7 @@ class PO3DSRedirectCustomTabLauncher private constructor(
         fun create(from: Fragment) = PO3DSRedirectCustomTabLauncher(
             WebAuthorizationActivityResultDispatcher
         ).apply {
-            contract = CustomTabAuthorizationActivityContract(from.requireActivity())
+            contract = POCustomTabAuthorizationActivityContract(from.requireActivity())
             webViewFallbackLauncher = WebViewAuthorizationActivityLauncher.create(
                 from, activityResultCallback = null
             )
@@ -49,7 +49,7 @@ class PO3DSRedirectCustomTabLauncher private constructor(
         fun create(from: ComponentActivity) = PO3DSRedirectCustomTabLauncher(
             WebAuthorizationActivityResultDispatcher
         ).apply {
-            contract = CustomTabAuthorizationActivityContract(from)
+            contract = POCustomTabAuthorizationActivityContract(from)
             webViewFallbackLauncher = WebViewAuthorizationActivityLauncher.create(
                 from, activityResultCallback = null
             )
@@ -82,25 +82,25 @@ class PO3DSRedirectCustomTabLauncher private constructor(
 
         if (ProcessOut.instance.browserCapabilities.isCustomTabsSupported()) {
             contract.startActivity(
-                CustomTabConfiguration(
+                POCustomTabConfiguration(
                     uri = delegate.uri,
                     returnUri = Uri.parse(returnUrl),
                     timeoutSeconds = redirect.timeoutSeconds,
-                    resultApi = ActivityResultApi.Dispatcher
+                    resultApi = POActivityResultApi.Dispatcher
                 )
             )
         } else {
             POLogger.info("Custom Chrome Tabs is not supported on device. Will use WebView.")
             webViewFallbackLauncher.startActivity(
-                WebViewConfiguration(
+                POWebViewConfiguration(
                     uri = delegate.uri,
                     returnUris = listOf(
                         Uri.parse(ApiConstants.CHECKOUT_RETURN_URL),
                         Uri.parse(returnUrl)
                     ),
                     sdkVersion = ProcessOut.VERSION,
                     timeoutSeconds = redirect.timeoutSeconds,
-                    resultApi = ActivityResultApi.Dispatcher
+                    resultApi = POActivityResultApi.Dispatcher
                 )
             )
         }

sdk/src/main/kotlin/com/processout/sdk/ui/threeds/PO3DSRedirectWebViewBuilder.kt

@@ -9,7 +9,7 @@ import com.processout.sdk.api.network.ApiConstants
 import com.processout.sdk.core.ProcessOutResult
 import com.processout.sdk.ui.web.WebAuthorizationDelegate
 import com.processout.sdk.ui.web.webview.ProcessOutWebView
-import com.processout.sdk.ui.web.webview.WebViewConfiguration
+import com.processout.sdk.ui.web.webview.POWebViewConfiguration
 
 @Deprecated("Use PO3DSRedirectCustomTabLauncher.")
 class PO3DSRedirectWebViewBuilder(
@@ -29,7 +29,7 @@ class PO3DSRedirectWebViewBuilder(
 
     fun build(): WebView = ProcessOutWebView(
         activity,
-        WebViewConfiguration(
+        POWebViewConfiguration(
             uri = delegate?.uri,
             returnUris = listOf(Uri.parse(ApiConstants.CHECKOUT_RETURN_URL)),
             sdkVersion = ProcessOut.VERSION,