Adding support for iDeal 2.0 (#1687)

## Summary
- Changed iDeal to be an InstantPaymentMethod (ignoring the issuers)

## Release Notes
<new>
The new iDEAL payment flow where the shopper is redirected to the iDEAL
payment page to select their bank and authorize the payment.
</new>


https://github.com/Adyen/adyen-ios/assets/4838877/878a70a3-8c06-4e8b-9945-9ac4e70b5dca

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: goergisn <[email protected]>

Adyen.docc/API Reference.md

@@ -216,7 +216,6 @@ The Adyen DropIn/Components SDK API Reference.
 ### Issuer List Component
 
 - ``IssuerListComponent``
-- ``IdealComponent``
 - ``OnlineBankingPolandComponent``
 - ``MOLPayComponent``
 - ``DotpayComponent``
@@ -228,7 +227,6 @@ The Adyen DropIn/Components SDK API Reference.
 - ``EPSDetails``
 - ``DotpayDetails``
 - ``MOLPayDetails``
-- ``IdealDetails``
 - ``OnlineBankingPolandDetails``
 - ``IssuerListDetails``
 

Adyen/Core/Payment Methods/Abstract/AnyPaymentMethodDecoder.swift

@@ -30,6 +30,7 @@ private struct PaymentMethodField: Decodable {
 }
 
 internal enum AnyPaymentMethodDecoder {
+
     private static var decoders: [PaymentMethodType: PaymentMethodDecoder] = [
 
         // Unsupported payment methods
@@ -46,7 +47,6 @@ internal enum AnyPaymentMethodDecoder {
         // Supported payment methods
         .card: CardPaymentMethodDecoder(),
         .scheme: CardPaymentMethodDecoder(),
-        .ideal: IssuerListPaymentMethodDecoder(),
         .entercash: IssuerListPaymentMethodDecoder(),
         .eps: IssuerListPaymentMethodDecoder(),
         .dotpay: IssuerListPaymentMethodDecoder(),
@@ -91,15 +91,20 @@ internal enum AnyPaymentMethodDecoder {
     internal static func decode(from decoder: Decoder) -> AnyPaymentMethod {
         do {
             let container = try decoder.container(keyedBy: AnyPaymentMethod.CodingKeys.self)
-            let type = try container.decode(String.self, forKey: .type)
+            let type = try PaymentMethodType(rawValue: container.decode(String.self, forKey: .type))
             let isStored = decoder.codingPath.contains { $0.stringValue == PaymentMethods.CodingKeys.stored.stringValue }
             let brand = try? container.decode(String.self, forKey: .brand)
             let isIssuersList = try container.containsValue(.issuers)
-
+
+            if type == .ideal {
+                return try InstantPaymentMethodDecoder().decode(from: decoder, isStored: isStored)
+            }
+
             if isIssuersList {
-                if type == "onlineBanking_CZ" || type == "onlineBanking_SK" {
+                if type == .onlineBankingCZ || type == .onlineBankingSK {
                     return try OnlineBankingPaymentMethodDecoder().decode(from: decoder, isStored: isStored)
                 }
+
                 return try IssuerListPaymentMethodDecoder().decode(from: decoder, isStored: isStored)
             }
 
@@ -111,11 +116,11 @@ internal enum AnyPaymentMethodDecoder {
             // That includes brand, type, isStored, and requiresDetails,
             // This matching struct will be used as the key to the decoders
             // dictionary.
-            if isStored, brand == "bcmc", type == "scheme" {
+            if isStored, brand == "bcmc", type == .scheme {
                 return try decoders[.bcmc, default: defaultDecoder].decode(from: decoder, isStored: true)
             }
 
-            let paymentDecoder = PaymentMethodType(rawValue: type).map { decoders[$0, default: defaultDecoder] } ?? defaultDecoder
+            let paymentDecoder = type.map { decoders[$0, default: defaultDecoder] } ?? defaultDecoder
             return try paymentDecoder.decode(from: decoder, isStored: isStored)
         } catch {
             return .none

Adyen/Core/Payment Methods/IssuerListPaymentMethod.swift

@@ -6,7 +6,7 @@
 
 import Foundation
 
-/// An issuer list payment method, such as iDEAL or Open Banking.
+/// An issuer list payment method, such as Open Banking.
 public struct IssuerListPaymentMethod: PaymentMethod {
 
     public let type: PaymentMethodType

AdyenComponents/Issuer List/IssuerListComponent.swift

@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 
-/// A generic component for "issuer-based" payment methods, such as iDEAL and MOLPay.
+/// A generic component for "issuer-based" payment methods, such as MOLPay.
 /// This component will provide a list in which the user can select their issuer.
 public final class IssuerListComponent: PaymentComponent, PaymentAware, PresentableComponent, LoadingComponent {
 
@@ -183,9 +183,6 @@ extension IssuerListComponent {
     }
 }
 
-/// Provides an issuer selection list for iDEAL payments.
-public typealias IdealComponent = IssuerListComponent
-
 /// Provides an issuer selection list for MOLPay payments.
 public typealias MOLPayComponent = IssuerListComponent
 

AdyenComponents/Issuer List/IssuerListDetails.swift

@@ -31,9 +31,6 @@ public struct IssuerListDetails: PaymentMethodDetails {
 
 }
 
-/// Contains the details supplied by the IDEAL component.
-public typealias IdealDetails = IssuerListDetails
-
 /// Contains the details supplied by the MOLPay component.
 public typealias MOLPayDetails = IssuerListDetails
 

Demo/Common/Assets/payment_methods_response.json

@@ -76,9 +76,9 @@
           "type" : "select"
         }
       ],
-      "name" : "iDEAL",
       "supportsRecurring" : true,
-      "type" : "ideal"
+      "type": "onlineBanking_PL",
+      "name": "Online Banking"
     },
     {
       "brands" : [

Demo/SwiftUI/ComponentsViewModel.swift

@@ -107,7 +107,7 @@ internal final class ComponentsViewModel: ObservableObject, Identifiable {
                 ComponentsItem(title: "Card", selectionHandler: presentCardComponent),
                 ComponentsItem(
                     title: "Issuer List",
-                    subtitle: "e.g. Ideal, Open Banking, ...",
+                    subtitle: "e.g. Open Banking, ...",
                     selectionHandler: presentIssuerListComponent
                 ),
                 ComponentsItem(

Demo/UIKit/ComponentsViewController.swift

@@ -89,7 +89,7 @@ internal final class ComponentsViewController: UIViewController {
                 ComponentsItem(title: "Card", selectionHandler: presentCardComponent),
                 ComponentsItem(
                     title: "Issuer List",
-                    subtitle: "e.g. Ideal, Open Banking, ...",
+                    subtitle: "e.g. Open Banking, ...",
                     selectionHandler: presentIssuerListComponent
                 ),
                 ComponentsItem(

README.md

@@ -251,7 +251,6 @@ In order to have more flexibility over the checkout flow, you can use our Compon
 - [3D Secure 2 Component][reference.threeDS2Component]
 - [Apple Pay Component][reference.applePayComponent]
 - [BCMC Component][reference.bcmcComponent]
-- [iDEAL Component][reference.issuerListComponent]
 - [SEPA Direct Debit Component][reference.sepaDirectDebitComponent]
 - [MOLPay Component][reference.issuerListComponent]
 - [Dotpay Component][reference.issuerListComponent]

Tests/IntegrationTests/DropIn Tests/DropInTests.swift

@@ -43,9 +43,9 @@ class DropInTests: XCTestCase {
                   "type" : "select"
                 }
               ],
-              "name" : "iDEAL",
+              "name" : "Online Banking",
               "supportsRecurring" : true,
-              "type" : "ideal"
+              "type" : "onlineBanking_PL"
             },
             {
               "brands" : [ "mc", "visa" ],

Tests/UnitTests/Core/PaymentMethodTests.swift

@@ -80,7 +80,8 @@ class PaymentMethodTests: XCTestCase {
                 affirm,
                 atome,
                 upi,
-                cashAppPay
+                cashAppPay,
+                idealDictionary
             ]
         ]
     }
@@ -170,16 +171,19 @@ class PaymentMethodTests: XCTestCase {
 
         // Regular payment methods
 
-        XCTAssertEqual(paymentMethods.regular.count, 31)
+        XCTAssertEqual(paymentMethods.regular.count, 32)
 
         let creditCardPaymentMethod = try XCTUnwrap(paymentMethods.regular[0] as? CardPaymentMethod)
         XCTAssertEqual(creditCardPaymentMethod.fundingSource, .credit)
 
         XCTAssertTrue(paymentMethods.regular[1] is IssuerListPaymentMethod)
+        XCTAssertEqual(paymentMethods.regular[1].type.rawValue, "onlineBanking_PL")
+        XCTAssertEqual(paymentMethods.regular[1].name, "Online Banking")
+
         XCTAssertTrue(paymentMethods.regular[2] is SEPADirectDebitPaymentMethod)
-        XCTAssertTrue(paymentMethods.regular[3] is InstantPaymentMethod)
 
         // Unknown redirect
+        XCTAssertTrue(paymentMethods.regular[3] is InstantPaymentMethod)
         XCTAssertEqual(paymentMethods.regular[3].type.rawValue, "unknown")
         XCTAssertEqual(paymentMethods.regular[3].name, "Redirect Payment Method")
 
@@ -306,6 +310,10 @@ class PaymentMethodTests: XCTestCase {
         XCTAssertEqual(cashAppPay.type.rawValue, "cashapp")
         XCTAssertEqual(cashAppPay.clientId, "testClient")
         XCTAssertEqual(cashAppPay.scopeId, "testScope")
+
+        XCTAssertTrue(paymentMethods.regular[31] is InstantPaymentMethod)
+        XCTAssertEqual(paymentMethods.regular[31].type.rawValue, "ideal")
+        XCTAssertEqual(paymentMethods.regular[31].name, "iDeal")
     }
 
     // MARK: - Display Information Override
@@ -745,8 +753,8 @@ class PaymentMethodTests: XCTestCase {
 
     func testDecodingIssuerListPaymentMethod() throws {
         let paymentMethod = try AdyenCoder.decode(issuerListDictionary) as IssuerListPaymentMethod
-        XCTAssertEqual(paymentMethod.type.rawValue, "ideal")
-        XCTAssertEqual(paymentMethod.name, "iDEAL")
+        XCTAssertEqual(paymentMethod.type.rawValue, "onlineBanking_PL")
+        XCTAssertEqual(paymentMethod.name, "Online Banking")
 
         XCTAssertEqual(paymentMethod.issuers.count, 3)
         XCTAssertEqual(paymentMethod.issuers[0].identifier, "xxxx")

Tests/UnitTests/Mocks/DummyData/DummyPaymentMethods.swift

@@ -75,6 +75,11 @@ let applePayDictionary = [
     "type": "applepay"
 ] as [String: Any]
 
+let idealDictionary = [
+    "type": "ideal",
+    "name": "iDeal"
+] as [String: Any]
+
 let bcmcCardDictionary = [
     "name": "Bancontact card",
     "supportsRecurring": true,
@@ -96,8 +101,8 @@ let storedBcmcDictionary = [
 ] as [String: Any]
 
 let issuerListDictionary = [
-    "type": "ideal",
-    "name": "iDEAL",
+    "type": "onlineBanking_PL",
+    "name": "Online Banking",
     "details": [
         [
             "items": [