Merge pull request #128 from Tinkoff/MC-7189-mir-3ds

MC-7189 3dsv2 для привязки карт мир
tinkoff-mobile-tech · Nov 8, 2022 · 4519710 · 4519710
2 parents ec2d993 + 0a0539a
commit 4519710
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 8 deletions.
diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/network/NetworkClient.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/network/NetworkClient.kt
@@ -127,6 +127,11 @@ internal class NetworkClient {
             builder.header("User-Agent", System.getProperty("http.agent"))
             builder.header("Accept", JSON)
         }
+
+        getHeaders().forEach { (key, value) ->
+            builder.header(key, value)
+        }
+
     }.build()
 
     private fun <R : AcquiringResponse> checkResult(result: R, onChecked: (isSuccess: Boolean) -> Unit) {

diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/AcquiringRequest.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/AcquiringRequest.kt
@@ -19,6 +19,7 @@ package ru.tinkoff.acquiring.sdk.requests
 import com.google.gson.Gson
 import ru.tinkoff.acquiring.sdk.AcquiringSdk
 import ru.tinkoff.acquiring.sdk.network.AcquiringApi
+import ru.tinkoff.acquiring.sdk.network.AcquiringApi.JSON
 import ru.tinkoff.acquiring.sdk.network.NetworkClient
 import ru.tinkoff.acquiring.sdk.responses.AcquiringResponse
 import ru.tinkoff.acquiring.sdk.utils.Request
@@ -43,6 +44,7 @@ abstract class AcquiringRequest<R : AcquiringResponse>(internal val apiMethod: S
     @Volatile
     private var disposed = false
     private val ignoredFieldsSet: HashSet<String> = hashSetOf(DATA, RECEIPT, RECEIPTS, SHOPS)
+    private val headersMap: HashMap<String, String> = hashMapOf()
 
     internal open val tokenIgnoreFields: HashSet<String>
         get() = ignoredFieldsSet
@@ -66,10 +68,12 @@ abstract class AcquiringRequest<R : AcquiringResponse>(internal val apiMethod: S
         return map
     }
 
-    protected fun <R : AcquiringResponse> performRequest(request: AcquiringRequest<R>,
-                                                         responseClass: Class<R>,
-                                                         onSuccess: (R) -> Unit,
-                                                         onFailure: (Exception) -> Unit) {
+    protected fun <R : AcquiringResponse> performRequest(
+        request: AcquiringRequest<R>,
+        responseClass: Class<R>,
+        onSuccess: (R) -> Unit,
+        onFailure: (Exception) -> Unit
+    ) {
         request.validate()
         val client = NetworkClient()
         client.call(request, responseClass, onSuccess, onFailure)
@@ -104,9 +108,19 @@ abstract class AcquiringRequest<R : AcquiringResponse>(internal val apiMethod: S
         }
     }
 
+    fun addUserAgentHeader(userAgent: String = System.getProperty("http.agent")) {
+        headersMap.put("User-Agent", userAgent)
+    }
+
+    fun addContentHeader(content: String = JSON) {
+        headersMap.put("Accept", content)
+    }
+
     protected open fun getToken(): String? =
         AcquiringSdk.tokenGenerator?.generateToken(this, paramsForToken())
 
+    internal fun getHeaders() = headersMap
+
     private fun paramsForToken(): MutableMap<String, Any> {
         val tokenParams = asMap()
         tokenIgnoreFields.forEach {

diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/responses/Check3dsVersionResponse.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/responses/Check3dsVersionResponse.kt
@@ -44,4 +44,7 @@ class Check3dsVersionResponse(
         @SerializedName("PaymentSystem")
         val paymentSystem: String? = null
 
-) : AcquiringResponse()
+) : AcquiringResponse() {
+
+    fun is3DsVersionV2() = version?.startsWith("2") ?: false
+}
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/AttachCardViewModel.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/AttachCardViewModel.kt
@@ -99,9 +99,13 @@ internal class AttachCardViewModel(
             coroutine.call(
                 check3DsRequest,
                 onSuccess = {
-                    val check3dsMap = ThreeDsHelper.CollectData.invoke(context, it)
-                    ThreeDsHelper.CollectData.addExtraData(check3dsMap, it)
-                    attachCard(requestKey, check3dsMap + (data ?: mapOf()) , it)
+                    if (it.is3DsVersionV2()) {
+                        val check3dsMap = ThreeDsHelper.CollectData.invoke(context, it)
+                        ThreeDsHelper.CollectData.addExtraData(check3dsMap, it)
+                        attachCard(requestKey, check3dsMap + (data ?: mapOf()) , it)
+                    } else {
+                        attachCard(requestKey, data, it)
+                    }
                 }
             )
         }
@@ -114,6 +118,11 @@ internal class AttachCardViewModel(
             this.requestKey = requestKey
             this.data = data
             this.cardData = this@AttachCardViewModel.cardData
+
+            if (check3dsVersionResponse?.is3DsVersionV2() == true) {
+                this.addContentHeader()
+                this.addUserAgentHeader()
+            }
         }
         coroutine.call(attachCardRequest,
                 onSuccess = { handleAttachSuccess(it, check3dsVersionResponse) },