PayTo: Stored payment method

Adyen/Core/Core Protocols/PaymentComponentBuilder.swift

@@ -84,6 +84,9 @@ public protocol PaymentComponentBuilder: AdyenContextAware {
 
     /// Builds a certain `PaymentComponent` based on a `PayToPaymentMethod`.
     func build(paymentMethod: PayToPaymentMethod) -> PaymentComponent?
+
+    /// Builds a certain `PaymentComponent` based on a `StoredPayToPaymentMethod`.
+    func build(paymentMethod: StoredPayToPaymentMethod) -> PaymentComponent?
 
     /// Builds a certain `PaymentComponent` based on a `CashAppPayPaymentMethod`.
     func build(paymentMethod: CashAppPayPaymentMethod) -> PaymentComponent?

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

@@ -16,6 +16,7 @@ internal enum AnyPaymentMethod: Codable {
     case storedAchDirectDebit(StoredACHDirectDebitPaymentMethod)
     case storedCashAppPay(StoredCashAppPayPaymentMethod)
     case storedTwint(StoredTwintPaymentMethod)
+    case storedPayTo(StoredPayToPaymentMethod)
 
     case instant(PaymentMethod)
     case card(AnyCardPaymentMethod)
@@ -91,6 +92,7 @@ internal enum AnyPaymentMethod: Codable {
         case let .storedPayByBankUS(paymentMethod): return paymentMethod
         case let .payByBankUS(paymentMethod): return paymentMethod
         case let .payTo(paymentMethod): return paymentMethod
+        case let .storedPayTo(paymentMethod): return paymentMethod
         case .none: return nil
         }
     }

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

@@ -543,11 +543,22 @@ private struct TwintPaymentMethodDecoder: PaymentMethodDecoder {
 
 private struct PayToPaymentMethodDecoder: PaymentMethodDecoder {
     func decode(from decoder: Decoder, isStored: Bool) throws -> AnyPaymentMethod {
-        try .payTo(PayToPaymentMethod(from: decoder))
+        if isStored {
+            return try .storedPayTo(StoredPayToPaymentMethod(from: decoder))
+        } else {
+            return try .payTo(PayToPaymentMethod(from: decoder))
+        }
     }
 
     func anyPaymentMethod(from paymentMethod: any PaymentMethod) -> AnyPaymentMethod? {
-        (paymentMethod as? PayToPaymentMethod).map { .payTo($0) }
+        switch paymentMethod {
+        case let regular as PayToPaymentMethod:
+            .payTo(regular)
+        case let stored as StoredPayToPaymentMethod:
+            .storedPayTo(stored)
+        default:
+            nil
+        }
     }
 }
 

Adyen/Core/Payment Methods/PayToPaymentMethod.swift

@@ -28,3 +28,46 @@ public struct PayToPaymentMethod: PaymentMethod {
     }
 
 }
+
+/// A stored PayTo payment method.
+public struct StoredPayToPaymentMethod: StoredPaymentMethod {
+
+    public let type: PaymentMethodType
+
+    public let name: String
+
+    public let identifier: String
+
+    public let label: String
+
+    public let supportedShopperInteractions: [ShopperInteraction]
+
+    public var merchantProvidedDisplayInformation: MerchantCustomDisplayInformation?
+
+    @_spi(AdyenInternal)
+    public func buildComponent(using builder: PaymentComponentBuilder) -> PaymentComponent? {
+        builder.build(paymentMethod: self)
+    }
+
+    public func defaultDisplayInformation(using parameters: LocalizationParameters?) -> DisplayInformation {
+        let accessibilityLabel = [
+            name,
+            label
+        ].joined(separator: ", ")
+
+        return DisplayInformation(
+            title: label,
+            subtitle: name,
+            logoName: type.rawValue,
+            accessibilityLabel: accessibilityLabel
+        )
+    }
+
+    private enum CodingKeys: String, CodingKey {
+        case type
+        case name
+        case identifier = "id"
+        case label
+        case supportedShopperInteractions
+    }
+}

AdyenDropIn/Utilities/ComponentManager+PaymentComponentBuilder.swift

@@ -219,14 +219,6 @@ extension ComponentManager: PaymentComponentBuilder {
         )
     }
 
-    internal func build(paymentMethod: PayToPaymentMethod) -> PaymentComponent? {
-        PayToComponent(
-            paymentMethod: paymentMethod,
-            context: context,
-            configuration: .init(style: configuration.style.formComponent)
-        )
-    }
-
     internal func build(paymentMethod: UPIPaymentMethod) -> PaymentComponent? {
         UPIComponent(
             paymentMethod: paymentMethod,
@@ -288,6 +280,22 @@ extension ComponentManager: PaymentComponentBuilder {
             configuration: configuration
         )
     }
+
+    internal func build(paymentMethod: PayToPaymentMethod) -> PaymentComponent? {
+        PayToComponent(
+            paymentMethod: paymentMethod,
+            context: context,
+            configuration: .init(style: configuration.style.formComponent)
+        )
+    }
+
+    internal func build(paymentMethod: StoredPayToPaymentMethod) -> (any PaymentComponent)? {
+        StoredPaymentMethodComponent(
+            paymentMethod: paymentMethod,
+            context: context,
+            configuration: .init(localizationParameters: configuration.localizationParameters)
+        )
+    }
 }
 
 // MARK: - Privates

Demo/Common/Networking/PaymentsRequest.swift

@@ -66,6 +66,7 @@ internal struct PaymentsRequest: APIRequest {
         try container.encode(ConfigurationConstants.lineItems, forKey: .lineItems)
         try container.encode(ConfigurationConstants.recurringProcessingModel, forKey: .recurringProcessingModel)
         try container.encodeIfPresent(data.checkoutAttemptId, forKey: .checkoutAttemptId)
+        try container.encode(ConfigurationConstants.mandate, forKey: .mandate)
     }
 
     private enum CodingKeys: String, CodingKey {
@@ -94,6 +95,7 @@ internal struct PaymentsRequest: APIRequest {
         case lineItems
         case delegatedAuthenticationData
         case recurringProcessingModel
+        case mandate
     }
 
 }

Demo/Common/Networking/SessionRequest.swift

@@ -39,6 +39,7 @@ internal struct SessionRequest: APIRequest {
         try container.encode("iOS", forKey: .channel)
         try container.encode(ConfigurationConstants.additionalData, forKey: .additionalData)
         try container.encode(ConfigurationConstants.lineItems, forKey: .lineItems)
+        try container.encode(ConfigurationConstants.mandate, forKey: .mandate)
 
         if ConfigurationConstants.current.cardSettings.enableInstallments {
             let installmentOptions = [
@@ -58,8 +59,8 @@ internal struct SessionRequest: APIRequest {
                 message: "API version should be v70 or above to apply card component's store payment method field",
                 condition: ConfigurationConstants.current.apiVersion < 70
             )
-            try container.encode("askForConsent", forKey: .storePaymentMethodMode)
-            try container.encode("CardOnFile", forKey: .recurringProcessingModel)
+            try container.encode("enabled", forKey: .storePaymentMethodMode)
+            try container.encode(ConfigurationConstants.recurringProcessingModel, forKey: .recurringProcessingModel)
         }
 
         if ConfigurationConstants.current.dropInSettings.allowDisablingStoredPaymentMethods {
@@ -85,6 +86,7 @@ internal struct SessionRequest: APIRequest {
         case recurringProcessingModel
         case showInstallmentAmount
         case showRemovePaymentMethodButton
+        case mandate
     }
 
 }

Demo/Configuration.swift

@@ -65,15 +65,13 @@ internal enum ConfigurationConstants {
     ]]
 
     // sample mandate object (e.g., for PayTo)
-    static let mandate = [[
-        "amount": "4001", // [Mandatory] for PayTo - Mandate Amount field
-        "amountRule": "max", // [Mandatory] for PayTo - Needs to be Localised
-        "endsAt": "2024-12-31", // [Mandatory] for PayTo - Date format
-        "frequency": "adhoc", // [Mandatory] for PayTo - Needs to be Localised
-        "remarks": "testThroughFlow1", // [Mandatory] for PayTo - Needs to be Localised as "Description"
-        "count": "3", // [Optional] will be returned only if the merchant sends it
-        "startsAt": "2024-11-13"
-    ]]
+    static let mandate = [
+        "amount": "\(current.amount.value)",
+        "amountRule": "max",
+        "endsAt": "2027-10-01",
+        "frequency": "adhoc",
+        "remarks": "Remark on mandate"
+    ]
 
     static var delegatedAuthenticationConfigurations: ThreeDS2Component.Configuration.DelegatedAuthentication {
         .init(relyingPartyIdentifier: "test-authentication-adyen.netlify.app")

Tests/IntegrationTests/Card Tests/StoredPaymentMethodComponentTests.swift

@@ -168,6 +168,26 @@ class StoredPaymentMethodComponentTests: XCTestCase {
         XCTAssertEqual(viewController?.message, paymentMethod.defaultDisplayInformation(using: nil).title)
         XCTAssertEqual(viewController?.title, localizedString(.dropInStoredTitle, nil, paymentMethod.name))
     }
+
+    func test_storedPaymentComponent_matches_payTo() throws {
+        // Given
+        let paymentMethod = StoredPayToPaymentMethod(
+            type: .payTo,
+            name: "PayTo Account",
+            identifier: "twint",
+            label: "***123",
+            supportedShopperInteractions: [.shopperPresent]
+        )
+        let sut = StoredPaymentMethodComponent(paymentMethod: paymentMethod, context: context)
+
+        let viewController = sut.viewController as? UIAlertController
+        XCTAssertNotNil(viewController)
+        XCTAssertEqual(viewController?.actions.count, 2)
+        XCTAssertEqual(viewController?.actions.first?.title, localizedString(.cancelButton, nil))
+        XCTAssertEqual(viewController?.actions.last?.title, localizedSubmitButtonTitle(with: Dummy.payment.amount, style: .immediate, nil))
+        XCTAssertEqual(viewController?.message, paymentMethod.defaultDisplayInformation(using: nil).title)
+        XCTAssertEqual(viewController?.title, localizedString(.dropInStoredTitle, nil, paymentMethod.name))
+    }
 
     func testViewDidLoadShouldSendInitialEvent() throws {
         // Given

Tests/IntegrationTests/DropIn Tests/ComponentManagerTests.swift

@@ -31,7 +31,8 @@ class ComponentManagerTests: XCTestCase {
             storedPayPalDictionary,
             storedBcmcDictionary,
             storedACHDictionary,
-            storedTwintDictionary
+            storedTwintDictionary,
+            storedPayToDictionary
         ],
         "paymentMethods": [
             creditCardDictionary,
@@ -68,11 +69,13 @@ class ComponentManagerTests: XCTestCase {
             cashAppPay,
             giftCard,
             mealVoucherSodexo,
-            twint
+            twint,
+            payto
         ]
     ]
 
-    let numberOfExpectedRegularComponents = 27
+    let numberOfExpectedRegularComponents = 28
+    let numberOfExpectedStoredComponent = 7
 
     var presentationDelegate: PresentationDelegateMock!
     var context: AdyenContext!
@@ -102,14 +105,14 @@ class ComponentManagerTests: XCTestCase {
             presentationDelegate: presentationDelegate
         )
 
-        XCTAssertEqual(sut.storedComponents.count, 6)
+        XCTAssertEqual(sut.storedComponents.count, numberOfExpectedStoredComponent)
         XCTAssertEqual(sut.regularComponents.count, numberOfExpectedRegularComponents)
 
-        XCTAssertEqual(sut.storedComponents.filter { $0.context.apiContext.clientKey == Dummy.apiContext.clientKey }.count, 6)
+        XCTAssertEqual(sut.storedComponents.filter { $0.context.apiContext.clientKey == Dummy.apiContext.clientKey }.count, numberOfExpectedStoredComponent)
         XCTAssertEqual(sut.regularComponents.filter { $0.context.apiContext.clientKey == Dummy.apiContext.clientKey }.count, numberOfExpectedRegularComponents)
 
-        XCTAssertEqual(sut.regularComponents.filter { $0 is LoadingComponent }.count, 22)
-        XCTAssertEqual(sut.regularComponents.filter { $0 is PresentableComponent }.count, 22)
+        XCTAssertEqual(sut.regularComponents.filter { $0 is LoadingComponent }.count, 23)
+        XCTAssertEqual(sut.regularComponents.filter { $0 is PresentableComponent }.count, 23)
         XCTAssertEqual(sut.regularComponents.filter { $0 is FinalizableComponent }.count, 0)
     }
 
@@ -123,11 +126,11 @@ class ComponentManagerTests: XCTestCase {
             presentationDelegate: presentationDelegate
         )
 
-        XCTAssertEqual(sut.storedComponents.count, 6)
+        XCTAssertEqual(sut.storedComponents.count, numberOfExpectedStoredComponent)
         XCTAssertEqual(sut.regularComponents.count, numberOfExpectedRegularComponents + 1)
 
-        XCTAssertEqual(sut.regularComponents.filter { $0 is LoadingComponent }.count, 22)
-        XCTAssertEqual(sut.regularComponents.filter { $0 is PresentableComponent }.count, 23)
+        XCTAssertEqual(sut.regularComponents.filter { $0 is LoadingComponent }.count, 23)
+        XCTAssertEqual(sut.regularComponents.filter { $0 is PresentableComponent }.count, 24)
         XCTAssertEqual(sut.regularComponents.filter { $0 is FinalizableComponent }.count, 1)
     }
 
@@ -207,6 +210,38 @@ class ComponentManagerTests: XCTestCase {
         let storedTwintComponent = paymentComponent as? StoredPaymentMethodComponent
         XCTAssertNotNil(storedTwintComponent)
     }
+
+    func test_componentManager_contains_payToComponent() throws {
+        let sut = ComponentManager(
+            paymentMethods: paymentMethods,
+            context: context,
+            configuration: configuration,
+            order: nil,
+            presentationDelegate: presentationDelegate
+        )
+
+        // When
+        let paymentComponent = sut.regularComponents.first { $0.paymentMethod.type.rawValue == "payto" }
+
+        XCTAssertNotNil(paymentComponent)
+    }
+
+    func test_componentManager_contains_storedPayToComponent() throws {
+        // Given
+        let sut = ComponentManager(
+            paymentMethods: paymentMethods,
+            context: context,
+            configuration: configuration,
+            order: nil,
+            presentationDelegate: presentationDelegate
+        )
+
+        // When
+        let paymentComponent = sut.storedComponents.first { $0.paymentMethod.type.rawValue == "payto" }
+
+        // Then
+        XCTAssertNotNil(paymentComponent as? StoredPaymentMethodComponent)
+    }
 
     func testLocalizationWithCustomTableName() throws {
         configuration.localizationParameters = LocalizationParameters(tableName: "AdyenUIHost", keySeparator: nil)
@@ -219,10 +254,10 @@ class ComponentManagerTests: XCTestCase {
             presentationDelegate: presentationDelegate
         )
 
-        XCTAssertEqual(sut.storedComponents.count, 6)
+        XCTAssertEqual(sut.storedComponents.count, numberOfExpectedStoredComponent)
         XCTAssertEqual(sut.regularComponents.count, numberOfExpectedRegularComponents)
 
-        XCTAssertEqual(sut.storedComponents.compactMap { ($0 as? StoredPaymentMethodComponent)?.configuration.localizationParameters }.filter { $0.tableName == "AdyenUIHost" }.count, 4)
+        XCTAssertEqual(sut.storedComponents.compactMap { ($0 as? StoredPaymentMethodComponent)?.configuration.localizationParameters }.filter { $0.tableName == "AdyenUIHost" }.count, 5)
     }
 
     func testLocalizationWithCustomKeySeparator() throws {
@@ -236,10 +271,10 @@ class ComponentManagerTests: XCTestCase {
             presentationDelegate: presentationDelegate
         )
 
-        XCTAssertEqual(sut.storedComponents.count, 6)
+        XCTAssertEqual(sut.storedComponents.count, numberOfExpectedStoredComponent)
         XCTAssertEqual(sut.regularComponents.count, numberOfExpectedRegularComponents)
 
-        XCTAssertEqual(sut.storedComponents.compactMap { ($0 as? StoredPaymentMethodComponent)?.configuration.localizationParameters }.filter { $0.keySeparator == "_" }.count, 4)
+        XCTAssertEqual(sut.storedComponents.compactMap { ($0 as? StoredPaymentMethodComponent)?.configuration.localizationParameters }.filter { $0.keySeparator == "_" }.count, 5)
     }
 
     func testOrderInjection() throws {
@@ -270,11 +305,11 @@ class ComponentManagerTests: XCTestCase {
         )
 
         XCTAssertEqual(sut.paidComponents.count, 2)
-        XCTAssertEqual(sut.storedComponents.count, 6)
+        XCTAssertEqual(sut.storedComponents.count, numberOfExpectedStoredComponent)
         XCTAssertEqual(sut.regularComponents.count, numberOfExpectedRegularComponents)
 
         XCTAssertEqual(sut.paidComponents.filter { $0.order == order }.count, 2)
-        XCTAssertEqual(sut.storedComponents.filter { $0.order == order }.count, 6)
+        XCTAssertEqual(sut.storedComponents.filter { $0.order == order }.count, numberOfExpectedStoredComponent)
         XCTAssertEqual(sut.regularComponents.filter { $0.order == order }.count, numberOfExpectedRegularComponents)
     }