Create encodable for credit cards post

Braintree.xcodeproj/project.pbxproj

@@ -201,6 +201,8 @@
 		A9E80A9F24FEF40C00196BD3 /* BraintreeTestShared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A903E1A624F9D34000C314E1 /* BraintreeTestShared.framework */; };
 		A9E80AA324FEF4D800196BD3 /* MockLocalPaymentRequestDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9E80AA224FEF4D800196BD3 /* MockLocalPaymentRequestDelegate.swift */; };
 		B8BA342E2D4811560030423C /* BTContactInformation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8BA342D2D4811560030423C /* BTContactInformation.swift */; };
+		B8F870152D48435D000FCE3C /* CreditCardPOSTBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F870142D48435D000FCE3C /* CreditCardPOSTBody.swift */; };
+		B8F870162D48435D000FCE3C /* CreditCardGraphQLBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F870132D48435D000FCE3C /* CreditCardGraphQLBody.swift */; };
 		BC17F9B428D23C5C004B18CC /* BTGraphQLMultiErrorNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC17F9B328D23C5C004B18CC /* BTGraphQLMultiErrorNode.swift */; };
 		BC17F9BC28D24C9E004B18CC /* BTGraphQLErrorTree.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC17F9BB28D24C9E004B18CC /* BTGraphQLErrorTree.swift */; };
 		BC17F9BE28D25054004B18CC /* BTGraphQLErrorNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC17F9BD28D25054004B18CC /* BTGraphQLErrorNode.swift */; };
@@ -896,6 +898,8 @@
 		A9E5C22824FD6D0800EE691F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A9E80AA224FEF4D800196BD3 /* MockLocalPaymentRequestDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockLocalPaymentRequestDelegate.swift; sourceTree = "<group>"; };
 		B8BA342D2D4811560030423C /* BTContactInformation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTContactInformation.swift; sourceTree = "<group>"; };
+		B8F870132D48435D000FCE3C /* CreditCardGraphQLBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreditCardGraphQLBody.swift; sourceTree = "<group>"; };
+		B8F870142D48435D000FCE3C /* CreditCardPOSTBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreditCardPOSTBody.swift; sourceTree = "<group>"; };
 		BC17F9B328D23C5C004B18CC /* BTGraphQLMultiErrorNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTGraphQLMultiErrorNode.swift; sourceTree = "<group>"; };
 		BC17F9BB28D24C9E004B18CC /* BTGraphQLErrorTree.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTGraphQLErrorTree.swift; sourceTree = "<group>"; };
 		BC17F9BD28D25054004B18CC /* BTGraphQLErrorNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTGraphQLErrorNode.swift; sourceTree = "<group>"; };
@@ -1746,6 +1750,8 @@
 				BEFE9A3C29C8ECAA00BF69AB /* BTCardError.swift */,
 				BE80C00A29C66F4800793A6C /* BTCardNonce.swift */,
 				BE80C00629C5516E00793A6C /* BTThreeDSecureInfo.swift */,
+				B8F870132D48435D000FCE3C /* CreditCardGraphQLBody.swift */,
+				B8F870142D48435D000FCE3C /* CreditCardPOSTBody.swift */,
 				806C85622B90EBED00A2754C /* PrivacyInfo.xcprivacy */,
 			);
 			path = BraintreeCard;
@@ -3300,6 +3306,8 @@
 				BE80C00B29C66F4800793A6C /* BTCardNonce.swift in Sources */,
 				BE80C00D29C8B4B900793A6C /* BTCard.swift in Sources */,
 				BE80C00529C54F2000793A6C /* BTAuthenticationInsight.swift in Sources */,
+				B8F870152D48435D000FCE3C /* CreditCardPOSTBody.swift in Sources */,
+				B8F870162D48435D000FCE3C /* CreditCardGraphQLBody.swift in Sources */,
 				BE80C00729C5516E00793A6C /* BTThreeDSecureInfo.swift in Sources */,
 				BEFE9A3D29C8ECAA00BF69AB /* BTCardError.swift in Sources */,
 				BEFE9A3B29C8EC6B00BF69AB /* BTCardClient.swift in Sources */,

Sources/BraintreeCard/BTCard.swift

@@ -1,5 +1,9 @@
 import Foundation
 
+#if canImport(BraintreeCore)
+import BraintreeCore
+#endif
+
 /// The card tokenization request represents raw credit or debit card data provided by the customer.
 /// Its main purpose is to serve as the input for tokenization.
 @objcMembers public class BTCard: NSObject {
@@ -116,181 +120,14 @@ import Foundation
 
     // MARK: - Internal Methods
 
-    func parameters() -> [String: Any] {
-        var cardDictionary: [String: Any] = buildCardDictionary(isGraphQL: false)
-        let billingAddressDictionary: [String: String] = buildBillingAddressDictionary(isGraphQL: false)
-
-        if !billingAddressDictionary.isEmpty {
-            cardDictionary["billing_address"] = billingAddressDictionary
-        }
-
-        let options: [String: Bool] = ["validate": shouldValidate]
-        cardDictionary["options"] = options
-        return cardDictionary
-    }
-
-    func graphQLParameters() -> [String: Any] {
-        var cardDictionary: [String: Any] = buildCardDictionary(isGraphQL: true)
-        let billingAddressDictionary: [String: String] = buildBillingAddressDictionary(isGraphQL: true)
-
-        if !billingAddressDictionary.isEmpty {
-            cardDictionary["billingAddress"] = billingAddressDictionary
-        }
-
-        let options: [String: Bool] = ["validate": shouldValidate]
-        let inputDictionary: [String: Any] = ["creditCard": cardDictionary, "options": options]
-        var variables: [String: Any] = ["input": inputDictionary]
-
-        if authenticationInsightRequested {
-            if let merchantAccountID {
-                variables["authenticationInsightInput"] = ["merchantAccountId": merchantAccountID]
-            } else {
-                variables["authenticationInsightInput"] = [:]
-            }
-        }
-
-        return [
-            "operationName": "TokenizeCreditCard",
-            "query": cardTokenizationGraphQLMutation(),
-            "variables": variables
-        ]
-    }
-
-    // MARK: - Private Methods
-
-    private func buildCardDictionary(isGraphQL: Bool) -> [String: Any] {
-        var cardDictionary: [String: Any] = [:]
-
-        if !number.isEmpty {
-            cardDictionary["number"] = number
-        }
-
-        if !expirationMonth.isEmpty {
-            cardDictionary[isGraphQL ? "expirationMonth" : "expiration_month"] = expirationMonth
-        }
-
-        if !expirationYear.isEmpty {
-            cardDictionary[isGraphQL ? "expirationYear" : "expiration_year"] = expirationYear
-        }
-
-        cardDictionary["cvv"] = cvv
-
-        if let cardholderName {
-            cardDictionary[isGraphQL ? "cardholderName" : "cardholder_name"] = cardholderName
-        }
-
-        return cardDictionary
-    }
-
-    // swiftlint:disable cyclomatic_complexity
-    private func buildBillingAddressDictionary(isGraphQL: Bool) -> [String: String] {
-        var billingAddressDictionary: [String: String] = [:]
-
-        if let firstName {
-            billingAddressDictionary[isGraphQL ? "firstName" : "first_name"] = firstName
-        }
-
-        if let lastName {
-            billingAddressDictionary[isGraphQL ? "lastName" : "last_name"] = lastName
-        }
-
-        if let company {
-            billingAddressDictionary["company"] = company
-        }
-
-        if let postalCode {
-            billingAddressDictionary[isGraphQL ? "postalCode" : "postal_code"] = postalCode
-        }
-
-        if let streetAddress {
-            billingAddressDictionary[isGraphQL ? "streetAddress" : "street_address"] = streetAddress
-        }
-
-        if let extendedAddress {
-            billingAddressDictionary[isGraphQL ? "extendedAddress" : "extended_address"] = extendedAddress
-        }
-
-        if let locality {
-            billingAddressDictionary["locality"] = locality
-        }
-
-        if let region {
-            billingAddressDictionary["region"] = region
-        }
-
-        if let countryName {
-            billingAddressDictionary[isGraphQL ? "countryName" : "country_name"] = countryName
-        }
-
-        if let countryCodeAlpha2 {
-            billingAddressDictionary[isGraphQL ? "countryCodeAlpha2" : "country_code_alpha2"] = countryCodeAlpha2
-        }
-
-        if let countryCodeAlpha3 {
-            billingAddressDictionary[isGraphQL ? "countryCode" : "country_code_alpha3"] = countryCodeAlpha3
-        }
-
-        if let countryCodeNumeric {
-            billingAddressDictionary[isGraphQL ? "countryCodeNumeric" : "country_code_numeric"] = countryCodeNumeric
-        }
-
-        return billingAddressDictionary
-    }
-    // swiftlint:enable cyclomatic_complexity
-
-    private func cardTokenizationGraphQLMutation() -> String {
-        var mutation = "mutation TokenizeCreditCard($input: TokenizeCreditCardInput!"
-
-        if authenticationInsightRequested {
-            mutation.append(", $authenticationInsightInput: AuthenticationInsightInput!")
-        }
-
-        // swiftlint:disable indentation_width
-        mutation.append(
-            """
-            ) {
-              tokenizeCreditCard(input: $input) {
-                token
-                creditCard {
-                  brand
-                  expirationMonth
-                  expirationYear
-                  cardholderName
-                  last4
-                  bin
-                  binData {
-                    prepaid
-                    healthcare
-                    debit
-                    durbinRegulated
-                    commercial
-                    payroll
-                    issuingBank
-                    countryOfIssuance
-                    productId
-                  }
-                }
-            """
+    func graphQLParameters(apiClient: BTAPIClient) -> CreditCardPOSTBody {
+        CreditCardPOSTBody(
+            card: self,
+            metadata: apiClient.metadata
         )
-
-        if authenticationInsightRequested {
-            mutation.append(
-                """
-                    authenticationInsight(input: $authenticationInsightInput) {
-                      customerAuthenticationRegulationEnvironment
-                    }
-                """
-            )
-        }
-
-        mutation.append(
-            """
-              }
-            }
-            """
-        )
-        // swiftlint:enable indentation_width
-
-        return mutation.replacingOccurrences(of: "\n", with: "")
+    }
+
+    func parameters() -> CreditCardGraphQLBody {
+        CreditCardGraphQLBody(card: self)
     }
 }

Sources/BraintreeCard/BTCardClient.swift

@@ -51,7 +51,7 @@ import BraintreeCore
                     return
                 }
 
-                let parameters = card.graphQLParameters()
+                let parameters = card.parameters()
 
                 self.apiClient.post("", parameters: parameters, httpType: .graphQLAPI) { body, _, error in
                     if let error = error as NSError? {
@@ -79,7 +79,7 @@ import BraintreeCore
                     return
                 }
             } else {
-                let parameters = self.clientAPIParameters(for: card)
+                let parameters = card.graphQLParameters(apiClient: self.apiClient)
 
                 self.apiClient.post("v1/payment_methods/credit_cards", parameters: parameters) {body, _, error in
                     if let error = error as NSError? {
@@ -136,26 +136,6 @@ import BraintreeCore
         return false
     }
 
-    private func clientAPIParameters(for card: BTCard) -> [String: Any] {
-        var parameters: [String: Any] = [:]
-        parameters["credit_card"] = card.parameters()
-
-        let metadata: [String: String] = [
-            "source": apiClient.metadata.source.stringValue,
-            "integration": apiClient.metadata.integration.stringValue,
-            "sessionId": apiClient.metadata.sessionID
-        ]
-
-        parameters["_meta"] = metadata
-
-        if card.authenticationInsightRequested {
-            parameters["authenticationInsight"] = true
-            parameters["merchantAccountId"] = card.merchantAccountID
-        }
-
-        return parameters
-    }
-
     // MARK: - Error Construction Methods
 
     /// Convenience helper method for creating friendlier, more human-readable userInfo dictionaries for 422 HTTP errors