Merge pull request #40 from primer-io/jn/dir-ids

feat: Add enum for specifying directory server ID
primer-io · Mar 4, 2024 · 97ce8f9 · 97ce8f9
2 parents 7bcd130 + 1737d64
commit 97ce8f9
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 26 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - Primer3DS (2.0.2)
+  - Primer3DS (2.2.1)
 
 DEPENDENCIES:
   - Primer3DS (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Primer3DS: 9838b509513dcdb41a8b2e5023dfabe3dae761c9
+  Primer3DS: d4e8e60b34b695be117737640f05583513efb17d
 
 PODFILE CHECKSUM: 4f7264ca4fa7ed996327b5aeee4d7cddd56cebe7
 

diff --git a/Example/Primer3DS/ViewController.swift b/Example/Primer3DS/ViewController.swift
@@ -18,7 +18,7 @@ class ViewController: UIViewController {
 
         do {
             try primer3DS.initializeSDK(apiKey: "")
-            _ = try primer3DS.createTransaction(directoryServerId: "", supportedThreeDsProtocolVersions: [""])
+            _ = try primer3DS.createTransaction(directoryServerNetwork: .visa, supportedThreeDsProtocolVersions: [""])
 
             primer3DS.performChallenge(threeDSAuthData: ThreeDSAuth(), 
                                        threeDsAppRequestorUrl: URL(string: ""),

diff --git a/Example/Tests/Primer3DSChallengeTests.swift b/Example/Tests/Primer3DSChallengeTests.swift
@@ -154,15 +154,14 @@ final class Primer3DSChallengeTests: XCTestCase {
     }
 
     private func setupSDK(withTransaction transaction: Transaction? = nil) throws {
-        let directoryServerId = "DirectoryServerId"
         let protocolVersion = "2.2"
 
         if let transaction = transaction {
-            sdkProvider.transactions = ["\(directoryServerId):\(protocolVersion)": transaction]
+            sdkProvider.transactions = ["\(DirectoryServerNetwork.visa.directoryServerId!):\(protocolVersion)": transaction]
         }
 
         try primer3DS.initializeSDK(apiKey: "ApiKey")
-        _ = try primer3DS.createTransaction(directoryServerId: directoryServerId, supportedThreeDsProtocolVersions: [protocolVersion])
+        _ = try primer3DS.createTransaction(directoryServerNetwork: .visa, supportedThreeDsProtocolVersions: [protocolVersion])
     }
 
 }
diff --git a/Example/Tests/Primer3DSTests.swift b/Example/Tests/Primer3DSTests.swift
@@ -71,15 +71,13 @@ final class Primer3DSTests: XCTestCase {
     }
 
     func testSDKCreateTransaction_Success() throws {
-
-        let directoryServerId = "DirectoryServerId"
         let protocolVersion = "2.2"
 
         let transaction = MockTransaction()
-        sdkProvider.transactions = ["\(directoryServerId):\(protocolVersion)": transaction]
-        
+        sdkProvider.transactions = ["\(DirectoryServerNetwork.visa.directoryServerId!):\(protocolVersion)": transaction]
+
         try primer3DS.initializeSDK(apiKey: "ApiKey")
-        let authResult = try primer3DS.createTransaction(directoryServerId: directoryServerId, supportedThreeDsProtocolVersions: [protocolVersion])
+        let authResult = try primer3DS.createTransaction(directoryServerNetwork: .visa, supportedThreeDsProtocolVersions: [protocolVersion])
 
         XCTAssertEqual(authResult.authData.sdkAppId, transaction.mockAuthRequestParameters.getSDKAppID())
         XCTAssertEqual(authResult.authData.sdkTransactionId, transaction.mockAuthRequestParameters.getSDKTransactionId())

diff --git a/Sources/Primer3DS/Classes/Primer3DS.swift b/Sources/Primer3DS/Classes/Primer3DS.swift
@@ -103,13 +103,23 @@ public class Primer3DS: NSObject, Primer3DSProtocol {
         }
     }
 
-    public func createTransaction(directoryServerId: String, 
+    var fallbackDirectoryServerId: String? {
+        guard environment != .production else {
+            return nil
+        }
+        return "A999999999"
+    }
+
+    public func createTransaction(directoryServerNetwork: DirectoryServerNetwork,
                                   supportedThreeDsProtocolVersions: [String]) throws -> SDKAuthResult {
+        guard let directoryServerId = directoryServerNetwork.directoryServerId ?? fallbackDirectoryServerId else {
+            throw Primer3DSError.missingDsRid(cardNetwork: directoryServerNetwork.rawValue)
+        }
         guard let maxSupportedThreeDsProtocolVersion = getMaxValidSupportedThreeDSVersion(supportedThreeDsProtocolVersions) else {
             let err = Primer3DSError.unsupportedProtocolVersion(supportedProtocols: supportedThreeDsProtocolVersions)
             throw err
         }
-        
+
         do {
             transaction = try sdkProvider.createTransaction(
                 directoryServerId: directoryServerId,
@@ -119,8 +129,14 @@ public class Primer3DS: NSObject, Primer3DSProtocol {
                                  maxSupportedThreeDsProtocolVersion: maxSupportedThreeDsProtocolVersion)
 
         } catch let error {
-            let err = Primer3DSError.failedToCreateTransaction(error: error)
-            throw err
+            if let error = error as? Primer3DSError {
+                throw error
+            }
+            if let error = error as? NSError {
+                let err = Primer3DSError.failedToCreateTransaction(error: error)
+                throw err
+            }
+            throw Primer3DSError.unknown(description: "Transaction failed but an invalid error was provided")
         }
     }
 

diff --git a/Sources/Primer3DS/Classes/Primer3DSError.swift b/Sources/Primer3DS/Classes/Primer3DSError.swift
@@ -123,9 +123,8 @@ public enum Primer3DSError: CustomNSError, LocalizedError {
     }
 
     public var errorUserInfo: [String : Any] {
-        guard let underlyingError = underlyingError else { return [:] }
-        let nsErr = underlyingError as NSError
-        return nsErr.userInfo
+        guard let underlyingError = underlyingError as? NSError else { return [:] }
+        return underlyingError.userInfo
     }
 
     public var threeDsErrorCode: Int? {

diff --git a/Sources/Primer3DS/Classes/Primer3DSProtocols.swift b/Sources/Primer3DS/Classes/Primer3DSProtocols.swift
@@ -1,14 +1,15 @@
 import Foundation
 import UIKit
 
-@objc public protocol Primer3DSProtocol {
-    @objc func initializeSDK(apiKey: String, certificates: [Primer3DSCertificate]?) throws
-    @objc func createTransaction(directoryServerId: String, 
-                                 supportedThreeDsProtocolVersions: [String]) throws -> SDKAuthResult
-    @objc func performChallenge(threeDSAuthData: Primer3DSServerAuthData,
-                                threeDsAppRequestorUrl: URL?,
-                                presentOn viewController: UIViewController,
-                                completion: @escaping (Primer3DSCompletion?, Error?) -> Void)
+public protocol Primer3DSProtocol {
+    func initializeSDK(apiKey: String,
+                       certificates: [Primer3DSCertificate]?) throws
+    func createTransaction(directoryServerNetwork: DirectoryServerNetwork,
+                           supportedThreeDsProtocolVersions: [String]) throws -> SDKAuthResult
+    func performChallenge(threeDSAuthData: Primer3DSServerAuthData,
+                          threeDsAppRequestorUrl: URL?,
+                          presentOn viewController: UIViewController,
+                          completion: @escaping (Primer3DSCompletion?, Error?) -> Void)
 }
 
 @objc public protocol Primer3DSCertificate {

diff --git a/Sources/Primer3DS/Classes/Primer3DSStructures.swift b/Sources/Primer3DS/Classes/Primer3DSStructures.swift
@@ -1,5 +1,6 @@
 
 import Foundation
+import ThreeDS_SDK
 
 // Exposed structures
 
@@ -10,6 +11,40 @@ public enum Environment: String, Codable {
     case local = "LOCAL"
 }
 
+public enum DirectoryServerNetwork: String {
+    case masterCard = "MASTERCARD"
+    case visa = "VISA"
+    case amex = "AMEX"
+    case jcb = "JCB"
+    case diners = "DINERS_CLUB"
+    case discover = "DISCOVER"
+    case unionpay = "UNIONPAY"
+    case unknown = "UNKNOWN"
+
+    var directoryServerId: String? {
+        switch self {
+        case .visa:
+            DsRidValues.visa
+        case .masterCard:
+            DsRidValues.mastercard
+        case .amex:
+            DsRidValues.amex
+        case .jcb:
+            DsRidValues.jcb
+        case .diners, .discover:
+            DsRidValues.diners
+        case .unionpay:
+            DsRidValues.union
+        case .unknown:
+            nil
+        }
+    }
+
+    public static func from(cardNetworkIdentifier: String) -> Self {
+        Self(rawValue: cardNetworkIdentifier) ?? .unknown
+    }
+}
+
 @objc internal class SDKAuthData: NSObject, Primer3DSSDKGeneratedAuthData {
 
     var sdkAppId: String