feat(ad-hoc): (nAPM) Manual finalization

build.gradle

@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 
 buildscript {
     ext {
-        androidGradlePluginVersion = '9.3.1'
+        androidGradlePluginVersion = '9.4.1'
         kotlinVersion = '2.1.20'
         kspVersion = '2.1.20-1.0.32'
         dokkaVersion = '1.9.20'

sdk/src/main/kotlin/com/processout/sdk/api/model/request/POCreateInvoiceRequest.kt

@@ -16,6 +16,26 @@ data class POCreateInvoiceRequest(
     @Json(name = "return_url")
     val returnUrl: String? = null,
     val shipping: POContact? = null,
+    @Json(name = "payment_configuration")
+    val paymentConfiguration: PaymentConfiguration? = null,
     val device: Map<String, String> = mapOf("channel" to "android"),
     val metadata: Map<String, String>? = null
-)
+) {
+
+    @JsonClass(generateAdapter = true)
+    data class PaymentConfiguration(
+        val apm: AlternativePaymentConfiguration
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class AlternativePaymentConfiguration(
+        @Json(name = "preferred_finalization_mode")
+        val preferredFinalizationMode: PreferredFinalizationMode
+    )
+
+    @Suppress("EnumEntryName")
+    @JsonClass(generateAdapter = false)
+    enum class PreferredFinalizationMode {
+        automatic, manual
+    }
+}

sdk/src/main/kotlin/com/processout/sdk/api/model/response/napm/v2/PONativeAlternativePaymentAuthorizationResponse.kt

@@ -14,14 +14,16 @@ import kotlinx.parcelize.Parcelize
  * @param[paymentMethod] Payment method details.
  * @param[elements] An ordered list of elements that needs to be rendered on the UI during native alternative payment flow.
  * @param[redirect] Indicates required redirect.
+ * @param[availableActions] Available actions to advance the payment.
  */
 @Parcelize
 data class PONativeAlternativePaymentAuthorizationResponse(
     val state: PONativeAlternativePaymentState,
     val invoice: Invoice,
     val paymentMethod: PONativeAlternativePaymentMethodDetails,
     val elements: List<PONativeAlternativePaymentElement>?,
-    val redirect: PONativeAlternativePaymentRedirect?
+    val redirect: PONativeAlternativePaymentRedirect?,
+    val availableActions: List<PONativeAlternativePaymentAvailableAction>?
 ) : Parcelable {
 
     /**
@@ -47,5 +49,7 @@ internal data class NativeAlternativePaymentAuthorizationResponseBody(
     @Json(name = "payment_method")
     val paymentMethod: PONativeAlternativePaymentMethodDetails,
     val elements: List<NativeAlternativePaymentElement>?,
-    val redirect: PONativeAlternativePaymentRedirect?
+    val redirect: PONativeAlternativePaymentRedirect?,
+    @Json(name = "available_actions")
+    val availableActions: List<PONativeAlternativePaymentAvailableAction>?
 )

sdk/src/main/kotlin/com/processout/sdk/api/model/response/napm/v2/PONativeAlternativePaymentAvailableAction.kt

@@ -0,0 +1,24 @@
+package com.processout.sdk.api.model.response.napm.v2
+
+import com.processout.sdk.core.annotation.ProcessOutInternalApi
+import com.squareup.moshi.JsonClass
+
+/**
+ * Available action to advance the payment.
+ */
+@JsonClass(generateAdapter = false)
+enum class PONativeAlternativePaymentAvailableAction {
+
+    /** Authorization is possible. */
+    AUTHORIZE,
+
+    /** Capture is possible. */
+    CAPTURE,
+
+    /**
+     * Placeholder that allows adding additional cases while staying backward compatible.
+     * __Warning:__ Do not match this case directly, use _when-else_ instead.
+     */
+    @ProcessOutInternalApi
+    UNKNOWN
+}

sdk/src/main/kotlin/com/processout/sdk/api/model/response/napm/v2/PONativeAlternativePaymentState.kt

@@ -8,9 +8,19 @@ import com.squareup.moshi.JsonClass
  */
 @JsonClass(generateAdapter = false)
 enum class PONativeAlternativePaymentState {
+
     /** Next step is required to proceed. */
     NEXT_STEP_REQUIRED,
 
+    /** Customer interaction completed. Explicit authorization and/or capture is expected to advance the payment. */
+    CUSTOMER_ACTIONS_COMPLETED,
+
+    /** Authorization was requested and it’s still pending. No further actions are expected, payment will advance to next state automatically. */
+    AUTHORIZATION_PENDING,
+
+    /** Authorization was requested and completed. */
+    AUTHORIZED,
+
     /** Pending payment processing. */
     PENDING,
 

sdk/src/main/kotlin/com/processout/sdk/api/model/response/napm/v2/PONativeAlternativePaymentTokenizationResponse.kt

@@ -12,13 +12,15 @@ import kotlinx.parcelize.Parcelize
  * @param[paymentMethod] Payment method details.
  * @param[elements] An ordered list of elements that needs to be rendered on the UI during native alternative payment flow.
  * @param[redirect] Indicates required redirect.
+ * @param[availableActions] Available actions to advance the payment.
  */
 @Parcelize
 data class PONativeAlternativePaymentTokenizationResponse(
     val state: PONativeAlternativePaymentState,
     val paymentMethod: PONativeAlternativePaymentMethodDetails,
     val elements: List<PONativeAlternativePaymentElement>?,
-    val redirect: PONativeAlternativePaymentRedirect?
+    val redirect: PONativeAlternativePaymentRedirect?,
+    val availableActions: List<PONativeAlternativePaymentAvailableAction>?
 ) : Parcelable
 
 @JsonClass(generateAdapter = true)
@@ -27,5 +29,7 @@ internal data class NativeAlternativePaymentTokenizationResponseBody(
     @Json(name = "payment_method")
     val paymentMethod: PONativeAlternativePaymentMethodDetails,
     val elements: List<NativeAlternativePaymentElement>?,
-    val redirect: PONativeAlternativePaymentRedirect?
+    val redirect: PONativeAlternativePaymentRedirect?,
+    @Json(name = "available_actions")
+    val availableActions: List<PONativeAlternativePaymentAvailableAction>?
 )

sdk/src/main/kotlin/com/processout/sdk/api/model/response/napm/v2/PONativeAlternativePaymentUrlResolutionResponse.kt

@@ -13,6 +13,7 @@ import com.squareup.moshi.JsonClass
  * @param[customerToken] Customer token details if any.
  * @param[elements] An ordered list of elements that needs to be rendered on the UI during native alternative payment flow.
  * @param[redirect] Indicates required redirect.
+ * @param[availableActions] Available actions to advance the payment.
  */
 @ProcessOutInternalApi
 data class PONativeAlternativePaymentUrlResolutionResponse(
@@ -21,7 +22,8 @@ data class PONativeAlternativePaymentUrlResolutionResponse(
     val invoice: PONativeAlternativePaymentInvoice?,
     val customerToken: PONativeAlternativePaymentCustomerToken?,
     val elements: List<PONativeAlternativePaymentElement>?,
-    val redirect: PONativeAlternativePaymentRedirect?
+    val redirect: PONativeAlternativePaymentRedirect?,
+    val availableActions: List<PONativeAlternativePaymentAvailableAction>?
 )
 
 @JsonClass(generateAdapter = true)
@@ -33,5 +35,7 @@ internal data class NativeAlternativePaymentUrlResolutionResponseBody(
     @Json(name = "customer_token")
     val customerToken: PONativeAlternativePaymentCustomerToken?,
     val elements: List<NativeAlternativePaymentElement>?,
-    val redirect: PONativeAlternativePaymentRedirect?
+    val redirect: PONativeAlternativePaymentRedirect?,
+    @Json(name = "available_actions")
+    val availableActions: List<PONativeAlternativePaymentAvailableAction>?
 )

sdk/src/main/kotlin/com/processout/sdk/api/repository/DefaultCustomerTokensRepository.kt

@@ -118,6 +118,7 @@ internal class DefaultCustomerTokensRepository(
                         PONativeAlternativePaymentElement.Unknown
                 }
             },
-            redirect = redirect
+            redirect = redirect,
+            availableActions = availableActions
         )
 }

sdk/src/main/kotlin/com/processout/sdk/api/repository/DefaultInvoicesRepository.kt

@@ -176,7 +176,8 @@ internal class DefaultInvoicesRepository(
             invoice = invoice,
             paymentMethod = paymentMethod,
             elements = elements?.map { it.toModel() },
-            redirect = redirect
+            redirect = redirect,
+            availableActions = availableActions
         )
 
     private fun NativeAlternativePaymentUrlResolutionResponseBody.toModel() =
@@ -186,7 +187,8 @@ internal class DefaultInvoicesRepository(
             invoice = invoice,
             customerToken = customerToken,
             elements = elements?.map { it.toModel() },
-            redirect = redirect
+            redirect = redirect,
+            availableActions = availableActions
         )
 
     private fun NativeAlternativePaymentElement.toModel() =

sdk/src/main/kotlin/com/processout/sdk/core/POFailure.kt

@@ -149,6 +149,7 @@ class POFailure private constructor() {
         invalidUrl("request.validation.invalid-url"),
         invalidUser("request.validation.invalid-user"),
         invalidRedirectResult("request.validation.redirect-result-invalid"),
+        unexpectedRedirectResult("request.validation.redirect-result-unexpected"),
         missingCurrency("request.validation.missing-currency"),
         missingCustomerInput("gateway.missing-customer-input"),
         missingDescription("request.validation.missing-description"),

ui/src/main/kotlin/com/processout/sdk/ui/napm/NativeAlternativePaymentCapturePoller.kt

@@ -5,11 +5,10 @@ package com.processout.sdk.ui.napm
 import android.os.SystemClock
 import com.processout.sdk.api.model.request.napm.v2.PONativeAlternativePaymentAuthorizationRequest
 import com.processout.sdk.api.model.request.napm.v2.PONativeAlternativePaymentTokenizationRequest
-import com.processout.sdk.api.model.response.napm.v2.PONativeAlternativePaymentAuthorizationResponse
-import com.processout.sdk.api.model.response.napm.v2.PONativeAlternativePaymentElement
-import com.processout.sdk.api.model.response.napm.v2.PONativeAlternativePaymentState
-import com.processout.sdk.api.model.response.napm.v2.PONativeAlternativePaymentState.SUCCESS
-import com.processout.sdk.api.model.response.napm.v2.PONativeAlternativePaymentTokenizationResponse
+import com.processout.sdk.api.model.response.napm.v2.*
+import com.processout.sdk.api.model.response.napm.v2.PONativeAlternativePaymentAuthorizationResponse.Invoice
+import com.processout.sdk.api.model.response.napm.v2.PONativeAlternativePaymentState.AUTHORIZATION_PENDING
+import com.processout.sdk.api.model.response.napm.v2.PONativeAlternativePaymentState.PENDING
 import com.processout.sdk.api.service.POCustomerTokensService
 import com.processout.sdk.api.service.POInvoicesService
 import com.processout.sdk.core.POFailure.Code.*
@@ -41,7 +40,11 @@ internal class NativeAlternativePaymentCapturePoller(
 
     data class CaptureResponse(
         val state: PONativeAlternativePaymentState,
-        val elements: List<PONativeAlternativePaymentElement>?
+        val invoice: Invoice?,
+        val paymentMethod: PONativeAlternativePaymentMethodDetails,
+        val elements: List<PONativeAlternativePaymentElement>?,
+        val redirect: PONativeAlternativePaymentRedirect?,
+        val availableActions: List<PONativeAlternativePaymentAvailableAction>?
     )
 
     private var backoffIterator = retryStrategy.newBackoffIterator()
@@ -106,7 +109,7 @@ internal class NativeAlternativePaymentCapturePoller(
     private fun isRetryable(
         result: ProcessOutResult<CaptureResponse>
     ): Boolean = result.fold(
-        onSuccess = { it.state != SUCCESS },
+        onSuccess = { it.state == PENDING || it.state == AUTHORIZATION_PENDING },
         onFailure = { failure ->
             val retryableCodes = listOf(
                 NetworkUnreachable,
@@ -124,7 +127,11 @@ internal class NativeAlternativePaymentCapturePoller(
                 ProcessOutResult.Success(
                     CaptureResponse(
                         state = it.state,
-                        elements = it.elements
+                        invoice = it.invoice,
+                        paymentMethod = it.paymentMethod,
+                        elements = it.elements,
+                        redirect = it.redirect,
+                        availableActions = it.availableActions
                     )
                 )
             },
@@ -138,7 +145,11 @@ internal class NativeAlternativePaymentCapturePoller(
                 ProcessOutResult.Success(
                     CaptureResponse(
                         state = it.state,
-                        elements = it.elements
+                        invoice = null,
+                        paymentMethod = it.paymentMethod,
+                        elements = it.elements,
+                        redirect = it.redirect,
+                        availableActions = it.availableActions
                     )
                 )
             },