[V7] Update BTCard

CHANGELOG.md

@@ -5,6 +5,8 @@
   * Bump minimum supported deployment target to iOS 16+
 * BraintreeVenmo
   * Update `BTVenmoRequest` to make all properties accessible on the initializer only vs via the dot syntax.
+* BraintreeCard
+  * Update `BTCard` to make all properties accessible on the initializer only vs via the dot syntax.
 * BraintreeSEPADirectDebit
   * Update `BTSEPADirectDebitRequest` to make all properties accessible on the initializer only vs via the dot syntax.
 

Demo/Application/Features/AmexViewController.swift

@@ -39,11 +39,12 @@ class AmexViewController: PaymentButtonBaseViewController {
     }
 
     private func getRewards(for cardNumber: String) {
-        let card = BTCard()
-        card.number = cardNumber
-        card.expirationMonth = "12"
-        card.expirationYear = CardHelpers.generateFuture(.year)
-        card.cvv = "1234"
+        let card = BTCard(
+            number: cardNumber,
+            expirationMonth: "12",
+            expirationYear: CardHelpers.generateFuture(.year),
+            cvv: "1234"
+        )
 
         progressBlock("Tokenizing Card")
 

Demo/Application/Features/CardTokenizationViewController.swift

@@ -20,8 +20,11 @@ class CardTokenizationViewController: PaymentButtonBaseViewController {
     @objc func tappedSubmit() {
         progressBlock("Tokenizing card details!")
 
+        guard let card = CardHelpers.newCard(from: cardFormView) else {
+            progressBlock("Fill in all the card fields.")
+            return
+        }
         let cardClient = BTCardClient(apiClient: apiClient)
-        let card = CardHelpers.newCard(from: cardFormView)
 
         setFieldsEnabled(false)
         cardClient.tokenize(card) { nonce, error in

Demo/Application/Features/Helpers/CardHelpers.swift

@@ -8,26 +8,20 @@ enum Format {
 
 enum CardHelpers {
 
-    static func newCard(from cardFormView: BTCardFormView) -> BTCard {
-        let card = BTCard()
-
-        if let cardNumber = cardFormView.cardNumber {
-            card.number = cardNumber
-        }
-
-        if let expirationYear = cardFormView.expirationYear {
-            card.expirationYear = expirationYear
-        }
-
-        if let expirationMonth = cardFormView.expirationMonth {
-            card.expirationMonth = expirationMonth
-        }
-
-        if let cvv = cardFormView.cvv {
-            card.cvv = cvv
-        }
-
-        return card
+    static func newCard(from cardFormView: BTCardFormView) -> BTCard? {
+        guard
+            let cardNumber = cardFormView.cardNumber,
+            let expirationMonth = cardFormView.expirationMonth,
+            let expirationYear = cardFormView.expirationYear,
+            let cvv = cardFormView.cvv
+        else { return nil}
+
+        return .init(
+            number: cardNumber,
+            expirationMonth: expirationMonth,
+            expirationYear: expirationYear,
+            cvv: cvv
+        )
     }
 
     static func generateFuture(_ format: Format) -> String {

Demo/Application/Features/ThreeDSecureViewController.swift

@@ -43,7 +43,10 @@ class ThreeDSecureViewController: PaymentButtonBaseViewController {
         callbackCount = 0
         updateCallbackCount()
 
-        let card = CardHelpers.newCard(from: cardFormView)
+        guard let card = CardHelpers.newCard(from: cardFormView) else {
+            progressBlock("Fill in all the card fields.")
+            return
+        }
         let cardClient = BTCardClient(apiClient: apiClient)
 
         cardClient.tokenize(card) { tokenizedCard, error in

IntegrationTests/BTCardClient_IntegrationTests.swift

@@ -8,8 +8,14 @@ class BTCardClient_IntegrationTests: XCTestCase {
         let apiClient = BTAPIClient(authorization: BTIntegrationTestsConstants.sandboxTokenizationKey)!
         let cardClient = BTCardClient(apiClient: apiClient)
         let expectation = expectation(description: "Tokenize card")
-
-        cardClient.tokenize(invalidCard()) { tokenizedCard, error in
+        let card = BTCard(
+            number: "123123",
+            expirationMonth: "XX",
+            expirationYear: "XXXX",
+            cvv: "1234"
+        )
+
+        cardClient.tokenize(card) { tokenizedCard, error in
             guard let tokenizedCard else {
                 XCTFail("Expect a nonce to be returned")
                 return
@@ -27,11 +33,13 @@ class BTCardClient_IntegrationTests: XCTestCase {
     func testTokenizeCard_whenCardIsInvalidAndValidationIsEnabled_failsWithExpectedValidationError() {
         let apiClient = BTAPIClient(authorization: BTIntegrationTestsConstants.sandboxClientToken)!
         let cardClient = BTCardClient(apiClient: apiClient)
-        let card = BTCard()
-        card.number = "123"
-        card.expirationMonth = "12"
-        card.expirationYear = Helpers.shared.futureYear()
-        card.shouldValidate = true
+        let card = BTCard(
+            number: "123",
+            expirationMonth: "12",
+            expirationYear: Helpers.shared.futureYear(),
+            cvv: "1234",
+            shouldValidate: true
+        )
 
         let expectation = expectation(description: "Tokenize card")
 
@@ -56,8 +64,15 @@ class BTCardClient_IntegrationTests: XCTestCase {
         let apiClient = BTAPIClient(authorization: BTIntegrationTestsConstants.sandboxTokenizationKey)!
         let cardClient = BTCardClient(apiClient: apiClient)
         let expectation = expectation(description: "Tokenize card")
-
-        cardClient.tokenize(validCard()) { tokenizedCard, error in
+        let card = BTCard(
+            number: "123",
+            expirationMonth: "12",
+            expirationYear: Helpers.shared.futureYear(),
+            cvv: "1234",
+            cardholderName: "Cookie Monster"
+        )
+
+        cardClient.tokenize(card) { tokenizedCard, error in
             guard let tokenizedCard else {
                 XCTFail("Expect a nonce to be returned")
                 return
@@ -89,8 +104,13 @@ class BTCardClient_IntegrationTests: XCTestCase {
     func testTokenizeCard_whenUsingTokenizationKeyAndCardHasValidationEnabled_failsWithAuthorizationError() {
         let apiClient = BTAPIClient(authorization: BTIntegrationTestsConstants.sandboxTokenizationKey)!
         let cardClient = BTCardClient(apiClient: apiClient)
-        let card = invalidCard()
-        card.shouldValidate = true
+        let card = BTCard(
+            number: "123123",
+            expirationMonth: "XX",
+            expirationYear: "XXXX",
+            cvv: "1234",
+            shouldValidate: true
+        )
 
         let expectation = expectation(description: "Tokenize card")
         cardClient.tokenize(card) { tokenizedCard, error in
@@ -114,8 +134,14 @@ class BTCardClient_IntegrationTests: XCTestCase {
     func testTokenizeCard_whenUsingClientTokenAndCardHasValidationEnabledAndCardIsValid_tokenizesSuccessfully() {
         let apiClient = BTAPIClient(authorization: BTIntegrationTestsConstants.sandboxClientToken)!
         let cardClient = BTCardClient(apiClient: apiClient)
-        let card = validCard()
-        card.shouldValidate = true
+        let card = BTCard(
+            number: "4111111111111111",
+            expirationMonth: "12",
+            expirationYear: Helpers.shared.futureYear(),
+            cvv: "123",
+            cardholderName: "Cookie Monster",
+            shouldValidate: true
+        )
 
         let expectation = expectation(description: "Tokenize card")
 
@@ -137,8 +163,13 @@ class BTCardClient_IntegrationTests: XCTestCase {
     func testTokenizeCard_whenUsingVersionThreeClientTokenAndCardHasValidationEnabledAndCardIsValid_tokenizesSuccessfully() {
         let apiClient = BTAPIClient(authorization: BTIntegrationTestsConstants.sandboxClientTokenVersion3)!
         let cardClient = BTCardClient(apiClient: apiClient)
-        let card = validCard()
-        card.shouldValidate = true
+        let card = BTCard(
+            number: "4111111111111111",
+            expirationMonth: "12",
+            expirationYear: Helpers.shared.futureYear(),
+            cvv: "123",
+            shouldValidate: true
+        )
 
         let expectation = expectation(description: "Tokenize card")
 
@@ -156,45 +187,4 @@ class BTCardClient_IntegrationTests: XCTestCase {
 
         waitForExpectations(timeout: 5)
     }
-
-    func testTokenizeCard_withCVVOnly_tokenizesSuccessfully() {
-        let apiClient = BTAPIClient(authorization: BTIntegrationTestsConstants.sandboxClientTokenVersion3)!
-        let cardClient = BTCardClient(apiClient: apiClient)
-        let card = BTCard()
-        card.cvv = "123"
-
-        let expectation = expectation(description: "Tokenize card")
-
-        cardClient.tokenize(card) { tokenizedCard, error in
-            guard let tokenizedCard else {
-                XCTFail("Expect a nonce to be returned")
-                return
-            }
-
-            XCTAssertTrue(tokenizedCard.nonce.isValidNonce)
-            XCTAssertNil(error)
-            expectation.fulfill()
-        }
-
-        waitForExpectations(timeout: 5)
-    }
-
-    // MARK: - Private Helper Methods
-
-    func invalidCard() -> BTCard {
-        let card = BTCard()
-        card.number = "123123"
-        card.expirationMonth = "XX"
-        card.expirationYear = "XXXX"
-        return card
-    }
-
-    func validCard() -> BTCard {
-        let card = BTCard()
-        card.number = "4111111111111111"
-        card.expirationMonth = "12"
-        card.expirationYear = Helpers.shared.futureYear()
-        card.cardholderName = "Cookie Monster"
-        return card
-    }
 }