Merge branch 'main' into bn/ios-version-bump

.cz.toml

@@ -1,6 +1,6 @@
 [tool.commitizen]
 version_scheme = "semver"
-version = "2.1.0"
+version = "2.2.1"
 version_files = [
   "Sources/Primer3DS/Classes/version.swift:let Primer3DSSDKVersion",
   "Primer3DS.podspec:s.version"

.github/workflows/post-release-merge.yml

@@ -24,7 +24,7 @@ jobs:
           git tag $RELEASE_VERSION
           git push origin $RELEASE_VERSION
       - name: Record changelog for current release
-        run: cz changelog $RELEASE_VERSION --file-name="release.md"
+        run: cz changelog $FROM_VERSION..$RELEASE_VERSION --file-name="release.md"
       - name: Create release
         uses: ncipollo/release-action@v1
         with:

CHANGELOG.md

@@ -1,10 +1,22 @@
 # Change Log
 
+## 2.2.1 (2024-02-14)
+
+### Fix
+
+- Updates 3DS SDK to version 2.4.11
+
+## 2.2.0 (2024-02-06)
+
+### Feat
+
+- Updated 3DS SDK to version 2.4.10
+
 ## 2.1.0 (2023-12-14)
 
 ### Feat
 
-- update to latest version of Netcetera SDK (#32)
+- Updated to latest version of Netcetera SDK
 
 ## 2.0.2 (2023-10-25)
 
@@ -28,4 +40,4 @@
 
 ### Patch changes
 
-- Fix Xcode 14.3.1 build problems
+- Fix Xcode 14.3.1 build problems

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
 

Example/Primer3DS.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>

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: ""),

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])
     }
 
 }

Example/Tests/Primer3DSTests.swift

@@ -34,7 +34,7 @@ final class Primer3DSTests: XCTestCase {
         sdkProvider.onInitializeCalled = { config, _, _ in
             XCTAssertEqual(try config.getParamValue(group: nil, paramName: "api-key"), apiKey)
             XCTAssertEqual(try config.getParamValue(group: "schema_ds_ids", paramName: "cardscheme"), Primer3DS.supportedSchemeId)
-            XCTAssertEqual(try config.getParamValue(group: "schema_root_public_key", paramName: "cardscheme"), certificate.rootCertificate)
+            XCTAssertEqual(try config.getParamValue(group: "schema_root_public_keys", paramName: "cardscheme"), certificate.rootCertificate)
             XCTAssertEqual(try config.getParamValue(group: "schema_public_key", paramName: "cardscheme"), certificate.encryptionKey)
             expectation.fulfill()
         }
@@ -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())

Primer3DS.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Primer3DS'
-  s.version          = '2.1.0'
+  s.version          = '2.2.1'
   s.summary          = 'A wrapper for the 3DS SDK.'
 
   s.description      = <<-DESC

Sources/Frameworks/ThreeDS_SDK.xcframework/Info.plist

@@ -5,31 +5,35 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>ThreeDS_SDK.framework/ThreeDS_SDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>ThreeDS_SDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>ThreeDS_SDK.framework/ThreeDS_SDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>ThreeDS_SDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>