Merge pull request #1265 from Adyen/develop

Release 5.0.0-alpha02
Adyen · Jul 18, 2023 · 6388365 · 6388365
2 parents 4a3e0a4 + df7316d
commit 6388365
Show file tree

Hide file tree

Showing 499 changed files with 16,700 additions and 2,268 deletions.
diff --git a/.github/workflows/check_pr.yml b/.github/workflows/check_pr.yml
@@ -17,13 +17,13 @@ jobs:
       # https://github.com/marketplace/actions/checkout
       - uses: actions/checkout@v3
 
-      # Setup Java 11
+      # Setup Java 17
       # https://github.com/marketplace/actions/setup-java-jdk
-      - name: Set up JDK 11
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
           cache: 'gradle'
 
       - name: Grant execute permission for gradlew

diff --git a/.github/workflows/check_release.yml b/.github/workflows/check_release.yml
@@ -17,13 +17,13 @@ jobs:
       # https://github.com/marketplace/actions/checkout
       - uses: actions/checkout@v3
 
-      # Setup Java 11
+      # Setup Java 17
       # https://github.com/marketplace/actions/setup-java-jdk
-      - name: Set up JDK 11
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
           cache: 'gradle'
 
       - name: Grant execute permission for gradlew

diff --git a/.github/workflows/publish_docs.yml b/.github/workflows/publish_docs.yml
@@ -18,7 +18,7 @@ jobs:
         run: ./gradlew dokkaHtmlMultiModule --no-daemon
 
       - name: Deploy GitHub Pages
-        uses: JamesIves/[email protected].1
+        uses: JamesIves/[email protected].3
         with:
           BRANCH: gh-pages
           FOLDER: build/docs/
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -16,11 +16,11 @@ jobs:
         with:
           ref: main
 
-      - name: Set up JDK 11
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
           cache: 'gradle'
 
       - name: Grant execute permission for gradlew

diff --git a/.github/workflows/update_verification_metadata.yml b/.github/workflows/update_verification_metadata.yml
@@ -0,0 +1,45 @@
+name: Update verification metadata
+
+on:
+  push:
+    branches:
+      - 'renovate/**'
+    paths:
+      - 'dependencies.gradle'
+
+jobs:
+  gradle-update-verification-metadata:
+    # https://github.com/actions/virtual-environments/
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      # https://github.com/marketplace/actions/checkout
+      - uses: actions/checkout@v3
+
+      # Setup Java 17
+      # https://github.com/marketplace/actions/setup-java-jdk
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+          cache: 'gradle'
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      # Run gradlew check
+      - name: Gradle update verification metadata
+        run: ./gradlew --write-verification-metadata sha256 build --no-daemon
+
+      - name: Commit
+        run: |
+          git config --local user.email '[email protected]'
+          git config --local user.name 'GitHub Action'
+          git add .
+          git commit -am 'Update verification metadata'
+
+      - name: Push
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ github.ref }}
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/...c/main/java/com/adyen/checkout/adyen3ds2/internal/data/api/SubmitFingerprintRepository.kt b/...c/main/java/com/adyen/checkout/adyen3ds2/internal/data/api/SubmitFingerprintRepository.kt
@@ -50,7 +50,7 @@ internal class SubmitFingerprintRepository internal constructor(
             }
             else -> {
                 Logger.e(TAG, "submitFingerprint: unexpected response $response")
-                throw IllegalStateException("Failed to retrieve 3DS2 fingerprint result")
+                error("Failed to retrieve 3DS2 fingerprint result")
             }
         }
     }

diff --git a/...rc/main/java/com/adyen/checkout/adyen3ds2/internal/provider/Adyen3DS2ComponentProvider.kt b/...rc/main/java/com/adyen/checkout/adyen3ds2/internal/provider/Adyen3DS2ComponentProvider.kt
@@ -40,11 +40,11 @@ import com.adyen.checkout.components.core.internal.util.viewModelFactory
 import com.adyen.checkout.core.internal.data.api.HttpClientFactory
 import com.adyen.checkout.ui.core.internal.DefaultRedirectHandler
 import com.adyen.threeds2.ThreeDS2Service
-import com.adyen.threeds2.parameters.ChallengeParameters
 import kotlinx.coroutines.Dispatchers
 
+class Adyen3DS2ComponentProvider
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-class Adyen3DS2ComponentProvider(
+constructor(
     overrideComponentParams: ComponentParams? = null,
     overrideSessionParams: SessionParams? = null,
 ) : ActionComponentProvider<Adyen3DS2Component, Adyen3DS2Configuration, Adyen3DS2Delegate> {
@@ -79,11 +79,9 @@ class Adyen3DS2ComponentProvider(
         savedStateHandle: SavedStateHandle,
         application: Application,
     ): Adyen3DS2Delegate {
-        val defaultThreeDSRequestorAppURL = ChallengeParameters.getEmbeddedRequestorAppURL(application)
         val componentParams = componentParamsMapper.mapToParams(
             adyen3DS2Configuration = configuration,
             sessionParams = null,
-            defaultThreeDSRequestorAppURL = defaultThreeDSRequestorAppURL,
         )
         val httpClient = HttpClientFactory.getHttpClient(componentParams.environment)
         val submitFingerprintService = SubmitFingerprintService(httpClient)

diff --git a/3ds2/src/main/java/com/adyen/checkout/adyen3ds2/internal/ui/Adyen3DS2ViewProvider.kt b/3ds2/src/main/java/com/adyen/checkout/adyen3ds2/internal/ui/Adyen3DS2ViewProvider.kt
@@ -24,7 +24,7 @@ internal object Adyen3DS2ViewProvider : ViewProvider {
         defStyleAttr: Int
     ): ComponentView = when (viewType) {
         Adyen3DS2ComponentViewType -> PaymentInProgressView(context, attrs, defStyleAttr)
-        else -> throw IllegalStateException("Unsupported view type")
+        else -> error("Unsupported view type")
     }
 }
 

diff --git a/3ds2/src/main/java/com/adyen/checkout/adyen3ds2/internal/ui/DefaultAdyen3DS2Delegate.kt b/3ds2/src/main/java/com/adyen/checkout/adyen3ds2/internal/ui/DefaultAdyen3DS2Delegate.kt
@@ -197,11 +197,11 @@ internal class DefaultAdyen3DS2Delegate(
 
         val fingerprintToken = FingerprintToken.SERIALIZER.deserialize(fingerprintJson)
         val configParameters = AdyenConfigParameters.Builder(
-            /* directoryServerId = */
+            // directoryServerId
             fingerprintToken.directoryServerId,
-            /* directoryServerPublicKey = */
+            // directoryServerPublicKey
             fingerprintToken.directoryServerPublicKey,
-            /* directoryServerRootCertificates = */
+            // directoryServerRootCertificates
             fingerprintToken.directoryServerRootCertificates,
         ).build()
 
@@ -211,6 +211,9 @@ internal class DefaultAdyen3DS2Delegate(
         }
 
         coroutineScope.launch(defaultDispatcher + coroutineExceptionHandler) {
+            // This makes sure the 3DS2 SDK doesn't re-use any state from previous transactions
+            closeTransaction()
+
             @Suppress("SwallowedException")
             try {
                 Logger.d(TAG, "initialize 3DS2 SDK")

diff --git a/.../src/main/java/com/adyen/checkout/adyen3ds2/internal/ui/model/Adyen3DS2ComponentParams.kt b/.../src/main/java/com/adyen/checkout/adyen3ds2/internal/ui/model/Adyen3DS2ComponentParams.kt
@@ -24,5 +24,5 @@ internal data class Adyen3DS2ComponentParams(
     override val isCreatedByDropIn: Boolean,
     override val amount: Amount,
     val uiCustomization: UiCustomization?,
-    val threeDSRequestorAppURL: String,
+    val threeDSRequestorAppURL: String?,
 ) : ComponentParams
diff --git a/...ain/java/com/adyen/checkout/adyen3ds2/internal/ui/model/Adyen3DS2ComponentParamsMapper.kt b/...ain/java/com/adyen/checkout/adyen3ds2/internal/ui/model/Adyen3DS2ComponentParamsMapper.kt
@@ -20,17 +20,14 @@ internal class Adyen3DS2ComponentParamsMapper(
     fun mapToParams(
         adyen3DS2Configuration: Adyen3DS2Configuration,
         sessionParams: SessionParams?,
-        defaultThreeDSRequestorAppURL: String,
     ): Adyen3DS2ComponentParams {
         return adyen3DS2Configuration
-            .mapToParamsInternal(defaultThreeDSRequestorAppURL)
+            .mapToParamsInternal()
             .override(overrideComponentParams)
             .override(sessionParams ?: overrideSessionParams)
     }
 
-    private fun Adyen3DS2Configuration.mapToParamsInternal(
-        defaultThreeDSRequestorAppURL: String,
-    ): Adyen3DS2ComponentParams {
+    private fun Adyen3DS2Configuration.mapToParamsInternal(): Adyen3DS2ComponentParams {
         return Adyen3DS2ComponentParams(
             shopperLocale = shopperLocale,
             environment = environment,
@@ -39,7 +36,7 @@ internal class Adyen3DS2ComponentParamsMapper(
             isCreatedByDropIn = false,
             amount = amount,
             uiCustomization = uiCustomization,
-            threeDSRequestorAppURL = threeDSRequestorAppURL ?: defaultThreeDSRequestorAppURL,
+            threeDSRequestorAppURL = threeDSRequestorAppURL,
         )
     }
 

diff --git a/3ds2/src/test/java/com/adyen/checkout/adyen3ds2/internal/ui/DefaultAdyen3DS2DelegateTest.kt b/3ds2/src/test/java/com/adyen/checkout/adyen3ds2/internal/ui/DefaultAdyen3DS2DelegateTest.kt
@@ -91,7 +91,7 @@ internal class DefaultAdyen3DS2DelegateTest(
             observerRepository = ActionObserverRepository(),
             savedStateHandle = SavedStateHandle(),
             componentParams = Adyen3DS2ComponentParamsMapper(null, null)
-                .mapToParams(configuration, null, "embeddedRequestorAppUrl"),
+                .mapToParams(configuration, null),
             submitFingerprintRepository = submitFingerprintRepository,
             paymentDataRepository = paymentDataRepository,
             adyen3DS2Serializer = adyen3DS2Serializer,
@@ -526,7 +526,7 @@ internal class DefaultAdyen3DS2DelegateTest(
         }
 
         override fun getProgressView(p0: Activity?): ProgressDialog {
-            throw IllegalStateException("This method should not be used")
+            error("This method should not be used")
         }
 
         override fun close() = Unit

diff --git a/...java/com/adyen/checkout/adyen3ds2/internal/ui/model/Adyen3DS2ComponentParamsMapperTest.kt b/...java/com/adyen/checkout/adyen3ds2/internal/ui/model/Adyen3DS2ComponentParamsMapperTest.kt
@@ -13,7 +13,7 @@ import com.adyen.checkout.components.core.Amount
 import com.adyen.checkout.components.core.internal.ui.model.GenericComponentParams
 import com.adyen.checkout.core.Environment
 import com.adyen.threeds2.customization.UiCustomization
-import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import java.util.Locale
 
@@ -25,11 +25,11 @@ internal class Adyen3DS2ComponentParamsMapperTest {
             .build()
 
         val params = Adyen3DS2ComponentParamsMapper(null, null)
-            .mapToParams(adyen3DS2Configuration, null, TEST_REQUESTOR_APP_URL)
+            .mapToParams(adyen3DS2Configuration, null)
 
         val expected = getAdyen3DS2ComponentParams()
 
-        Assertions.assertEquals(expected, params)
+        assertEquals(expected, params)
     }
 
     @Test
@@ -43,14 +43,14 @@ internal class Adyen3DS2ComponentParamsMapperTest {
             .build()
 
         val params = Adyen3DS2ComponentParamsMapper(null, null)
-            .mapToParams(adyen3DS2Configuration, null, TEST_REQUESTOR_APP_URL)
+            .mapToParams(adyen3DS2Configuration, null)
 
         val expected = getAdyen3DS2ComponentParams(
             uiCustomization = uiCustomization,
             threeDSRequestorAppURL = testUrl,
         )
 
-        Assertions.assertEquals(expected, params)
+        assertEquals(expected, params)
     }
 
     @Test
@@ -73,7 +73,7 @@ internal class Adyen3DS2ComponentParamsMapperTest {
         )
 
         val params = Adyen3DS2ComponentParamsMapper(overrideParams, null)
-            .mapToParams(adyen3DS2Configuration, null, TEST_REQUESTOR_APP_URL)
+            .mapToParams(adyen3DS2Configuration, null)
 
         val expected = getAdyen3DS2ComponentParams(
             shopperLocale = Locale.GERMAN,
@@ -87,7 +87,7 @@ internal class Adyen3DS2ComponentParamsMapperTest {
             ),
         )
 
-        Assertions.assertEquals(expected, params)
+        assertEquals(expected, params)
     }
 
     private fun getAdyen3DS2ConfigurationBuilder() = Adyen3DS2Configuration.Builder(
@@ -105,7 +105,7 @@ internal class Adyen3DS2ComponentParamsMapperTest {
         isCreatedByDropIn: Boolean = false,
         amount: Amount = Amount.EMPTY,
         uiCustomization: UiCustomization? = null,
-        threeDSRequestorAppURL: String = TEST_REQUESTOR_APP_URL,
+        threeDSRequestorAppURL: String? = null,
     ) = Adyen3DS2ComponentParams(
         shopperLocale = shopperLocale,
         environment = environment,
@@ -120,6 +120,5 @@ internal class Adyen3DS2ComponentParamsMapperTest {
     companion object {
         private const val TEST_CLIENT_KEY_1 = "test_qwertyuiopasdfghjklzxcvbnmqwerty"
         private const val TEST_CLIENT_KEY_2 = "live_qwertyui34566776787zxcvbnmqwerty"
-        private const val TEST_REQUESTOR_APP_URL = "TEST_REQUESTOR_APP_URL"
     }
 }
diff --git a/README.md b/README.md
@@ -29,11 +29,11 @@ If you are upgrading from 3.x.x to a current release, check out our [migration g
 Import the Component module for the Payment Method you want to use by adding it to your `build.gradle` file.
 For example, for the Drop-in solution you should add:
 ```groovy
-implementation "com.adyen.checkout:drop-in:4.11.0"
+implementation "com.adyen.checkout:drop-in:4.12.0"
 ```
 For a Credit Card component you should add:
 ```groovy
-implementation "com.adyen.checkout:card:4.11.0"
+implementation "com.adyen.checkout:card:4.12.0"
 ```
 
 ### Client Key