Merge pull request #82 from xendit/feat/add-cardholder-information

add card holder information on createToken and createAuthentication
xendit · Aug 1, 2024 · 414c35c · 414c35c
2 parents cf4f96c + b98f5fa
commit 414c35c
Show file tree

Hide file tree

Showing 14 changed files with 307 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Slack Mentions: `@troops-cards`
 Add this to your Podfile.
 
 ```ruby
-pod 'Xendit', '~> 3.7.0'
+pod 'Xendit', '~> 3.9.0'
 ```
 
 **Important:** Import SDK in Objective-C project with CocoaPods integration, you can do as following

diff --git a/Sources/Xendit/Models/DTOs/XenditAuthenticationRequest.swift b/Sources/Xendit/Models/DTOs/XenditAuthenticationRequest.swift
@@ -17,11 +17,13 @@ import Foundation
     public var midLabel: String?
     public var billingDetails: XenditBillingDetails?
     public var customer: XenditCustomer?
+    public var cardData: XenditCardHolderInformation?
 
-    public init(tokenId: String, amount: NSNumber, currency: String) {
+    public init(tokenId: String, amount: NSNumber, currency: String, cardData: XenditCardHolderInformation?) {
         self.amount = amount
         self.tokenId = tokenId
         self.currency = currency
+        self.cardData = cardData
     }
 
     func toJsonObject() -> [String : Any] {
@@ -47,6 +49,10 @@ import Foundation
         if (customer != nil) {
             json["customer"] = customer!.toJsonObject()
         }
+
+        if (cardData != nil) {
+            json["card_data"] = cardData!.toJsonObject()
+        }
 
         return json
     }

diff --git a/Sources/Xendit/Models/DTOs/XenditCardData.swift b/Sources/Xendit/Models/DTOs/XenditCardData.swift
@@ -21,10 +21,36 @@ import Foundation
     // Card verification number (CVN) value
     open var cardCvn: String?
 
-    public init(cardNumber: String, cardExpMonth: String, cardExpYear: String) {
+    // Card holder first name value
+    open var cardHolderFirstName: String?
+
+    // Card holder first name value
+    open var cardHolderLastName: String?
+
+    // Card holder first name value
+    open var cardHolderEmail: String?
+
+    // Card holder first name value
+    open var cardHolderPhoneNumber: String?
+
+
+
+    public init(
+        cardNumber: String,
+        cardExpMonth: String,
+        cardExpYear: String,
+        cardHolderFirstName: String? = nil,
+        cardHolderLastName: String? = nil,
+        cardHolderEmail: String? = nil,
+        cardHolderPhoneNumber: String? = nil
+        ) {
         self.cardNumber = cardNumber
         self.cardExpMonth = cardExpMonth
         self.cardExpYear = cardExpYear
+        self.cardHolderFirstName = cardHolderFirstName
+        self.cardHolderLastName = cardHolderLastName
+        self.cardHolderEmail = cardHolderEmail
+        self.cardHolderPhoneNumber = cardHolderPhoneNumber
     }
 
 }
diff --git a/Sources/Xendit/Models/DTOs/XenditCardHolderInformation.swift b/Sources/Xendit/Models/DTOs/XenditCardHolderInformation.swift
@@ -0,0 +1,45 @@
+//
+//  XenditCardHolderInformation.swift
+//  Xendit
+//
+//  Created by xendit on 07/07/21.
+//
+
+import Foundation
+@objcMembers
+@objc(XenditCardHolderInformation) open class XenditCardHolderInformation: NSObject {
+
+    // Card holder first name value
+    open var cardHolderFirstName: String?
+
+    // Card holder first name value
+    open var cardHolderLastName: String?
+
+    // Card holder first name value
+    open var cardHolderEmail: String?
+
+    // Card holder first name value
+    open var cardHolderPhoneNumber: String?
+
+    public init(
+        cardHolderFirstName: String? = nil,
+        cardHolderLastName: String? = nil,
+        cardHolderEmail: String? = nil,
+        cardHolderPhoneNumber: String? = nil
+        ) {
+        self.cardHolderFirstName = cardHolderFirstName
+        self.cardHolderLastName = cardHolderLastName
+        self.cardHolderEmail = cardHolderEmail
+        self.cardHolderPhoneNumber = cardHolderPhoneNumber
+    }
+
+    func toJsonObject() -> [String : Any] {
+        var json: [String: Any] = [:]
+        if cardHolderFirstName != nil { json["card_holder_first_name"] = cardHolderFirstName }
+        if cardHolderLastName != nil { json["card_holder_last_name"] = cardHolderLastName }
+        if cardHolderEmail != nil { json["card_holder_email"] = cardHolderEmail }
+        if cardHolderPhoneNumber != nil { json["card_holder_mobile_number"] = cardHolderPhoneNumber }
+        return json
+    }
+
+}
diff --git a/Sources/Xendit/Models/DTOs/XenditTokenizationRequest.swift b/Sources/Xendit/Models/DTOs/XenditTokenizationRequest.swift
@@ -21,15 +21,25 @@ import Foundation
 
     @available(*, deprecated, message: "Use init(cardData: XenditCardData, isSingleUse: Bool, shouldAuthenticate: Bool, amount: NSNumber, currency: String) instead" )
     public init(cardData: CardData, shouldAuthenticate: Bool) {
-        self.cardData = XenditCardData.init(cardNumber: cardData.cardNumber, cardExpMonth: cardData.cardExpMonth, cardExpYear: cardData.cardExpYear)
+        self.cardData = XenditCardData.init(
+            cardNumber: cardData.cardNumber,
+            cardExpMonth: cardData.cardExpMonth,
+            cardExpYear: cardData.cardExpYear
+        )
         self.cardData.cardCvn = cardData.cardCvn
         self.isSingleUse = !cardData.isMultipleUse
         self.shouldAuthenticate = shouldAuthenticate
         self.amount = cardData.amount
         self.currency = cardData.currency
     }
 
-    public init (cardData: XenditCardData, isSingleUse: Bool, shouldAuthenticate: Bool, amount: NSNumber?, currency: String?) {
+    public init (
+        cardData: XenditCardData,
+        isSingleUse: Bool,
+        shouldAuthenticate: Bool,
+        amount: NSNumber?,
+        currency: String?
+    ) {
         self.cardData = cardData
         self.isSingleUse = isSingleUse
         self.shouldAuthenticate = shouldAuthenticate
@@ -45,6 +55,10 @@ import Foundation
             "account_number": cardData.cardNumber,
             "exp_month": cardData.cardExpMonth,
             "exp_year": cardData.cardExpYear,
+            "card_holder_first_name": cardData.cardHolderFirstName ?? "",
+            "card_holder_last_name": cardData.cardHolderLastName ?? "",
+            "card_holder_email": cardData.cardHolderEmail ?? "",
+            "card_holder_phone_number": cardData.cardHolderPhoneNumber ?? ""
         ]
 
         if cardData.cardCvn != nil && cardData.cardCvn != "" {

diff --git a/Sources/Xendit/XDTCards.swift b/Sources/Xendit/XDTCards.swift
@@ -121,24 +121,81 @@ public class XDTCards: CanTokenize, CanAuthenticate {
 
     public static func createAuthentication(fromViewController: UIViewController, tokenId: String, amount: NSNumber, onBehalfOf: String?, customer: XenditCustomer?, completion: @escaping (XenditAuthentication?, XenditError?) -> Void) {
 
-        createAuthentication(fromViewController: fromViewController, tokenId: tokenId, amount: amount, currency: nil, onBehalfOf: onBehalfOf, customer: customer, completion: completion);
+        createAuthentication(
+            fromViewController: fromViewController,
+            tokenId: tokenId,
+            amount: amount,
+            currency: nil,
+            onBehalfOf: onBehalfOf,
+            customer: customer,
+            completion: completion);
     }
 
     public static func createAuthentication(fromViewController: UIViewController, tokenId: String, amount: NSNumber, currency: String?, onBehalfOf: String?, customer: XenditCustomer?, completion: @escaping (XenditAuthentication?, XenditError?) -> Void) {
 
-        createAuthentication(fromViewController: fromViewController, tokenId: tokenId, amount: amount, currency: nil, onBehalfOf: onBehalfOf, customer: customer, cardCvn: nil, completion: completion);
+        createAuthentication(
+            fromViewController: fromViewController,
+            tokenId: tokenId,
+            amount: amount,
+            currency: nil,
+            onBehalfOf: onBehalfOf,
+            customer: customer,
+            cardCvn: nil,
+            completion: completion
+        );
     }
 
-    public static func createAuthentication(fromViewController: UIViewController, tokenId: String, amount: NSNumber, currency: String?, onBehalfOf: String?, customer: XenditCustomer?, cardCvn: String?, completion: @escaping (XenditAuthentication?, XenditError?) -> Void) {
+    public static func createAuthentication(
+        fromViewController: UIViewController,
+        tokenId: String,
+        amount: NSNumber,
+        currency: String?,
+        onBehalfOf: String?,
+        customer: XenditCustomer?,
+        cardCvn: String?,
+        completion: @escaping (XenditAuthentication?, XenditError?) -> Void
+    ) {
+        createAuthentication(
+            fromViewController: fromViewController,
+            tokenId: tokenId,
+            amount: amount,
+            currency: nil,
+            onBehalfOf: onBehalfOf,
+            customer: customer,
+            cardCvn: nil,
+            cardData: nil,
+            completion: completion
+        );
+    }
+
+    public static func createAuthentication(
+        fromViewController: UIViewController,
+        tokenId: String,
+        amount: NSNumber,
+        currency: String?,
+        onBehalfOf: String?,
+        customer: XenditCustomer?,
+        cardCvn: String?,
+        cardData: XenditCardHolderInformation?,
+        completion: @escaping (XenditAuthentication?, XenditError?) -> Void) {
         if publishableKey == nil {
             completion(nil, XenditError(errorCode: "VALIDATION_ERROR", message: "Empty publishable key"))
             return
         }
 
-        create3DS1Authentication(fromViewController: fromViewController, tokenId: tokenId, amount: amount, currency: currency, onBehalfOf: onBehalfOf, cardCvn: cardCvn, completion: completion)
+        create3DS1Authentication(
+            fromViewController: fromViewController,
+            tokenId: tokenId,
+            amount: amount,
+            currency: currency,
+            onBehalfOf: onBehalfOf,
+            cardCvn: cardCvn,
+            cardData:cardData,
+            completion: completion
+        )
     }
 
-    private static func create3DS1Authentication(fromViewController: UIViewController, tokenId: String, amount: NSNumber, currency: String?, onBehalfOf: String?, cardCvn: String?, completion: @escaping (XenditAuthentication?, XenditError?) -> Void) {
+    private static func create3DS1Authentication(fromViewController: UIViewController, tokenId: String, amount: NSNumber, currency: String?, onBehalfOf: String?, cardCvn: String?, cardData: XenditCardHolderInformation?, completion: @escaping (XenditAuthentication?, XenditError?) -> Void) {
         if publishableKey == nil {
             completion(nil, XenditError(errorCode: "VALIDATION_ERROR", message: "Empty publishable key"))
             return
@@ -156,6 +213,10 @@ public class XDTCards: CanTokenize, CanAuthenticate {
             requestBody["card_cvn"] = cardCvn
         }
 
+        if let cardData {
+            requestBody["card_data"] = cardData
+        }
+
         var extraHeaders: [String: String] = [:]
         if onBehalfOf != nil || onBehalfOf != "" {
             extraHeaders["for-user-id"] = onBehalfOf

diff --git a/Xendit.podspec b/Xendit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Xendit'
-  s.version          = '3.8.7'
+  s.version          = '3.9.0'
   s.license          = 'MIT'
   s.homepage         = 'https://www.xendit.co'
   s.author           = { 'Juan Gonzalez’' => '[email protected]' }

diff --git a/Xendit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Xendit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/XenditExample/XenditExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/XenditExample/XenditExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...Example/XenditExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/...Example/XenditExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/...Example/XenditExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...Example/XenditExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,25 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "OHHTTPStubs",
+        "repositoryURL": "https://github.com/AliSoftware/OHHTTPStubs.git",
+        "state": {
+          "branch": null,
+          "revision": "12f19662426d0434d6c330c6974d53e2eb10ecd9",
+          "version": "9.1.0"
+        }
+      },
+      {
+        "package": "Sentry",
+        "repositoryURL": "https://github.com/getsentry/sentry-cocoa.git",
+        "state": {
+          "branch": null,
+          "revision": "5421f94cc859eb65f5ae3866165a053aa634431e",
+          "version": "8.32.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}