Merge branch 'develop' into feature/add_privacy_manifest

Adyen · Mar 18, 2024 · f445595 · f445595
2 parents 5613b6d + 598f333
commit f445595
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/Adyen.podspec b/Adyen.podspec
@@ -68,7 +68,7 @@ Pod::Spec.new do |s|
 
   s.subspec 'Actions' do |plugin|
     plugin.dependency 'Adyen/Core'
-    plugin.dependency 'Adyen3DS2', '2.3.3'
+    plugin.dependency 'Adyen3DS2', '2.4.1'
     plugin.source_files = 'AdyenActions/**/*.swift'
     plugin.exclude_files = 'AdyenActions/**/BundleSPMExtension.swift'
     plugin.resource_bundles = {

diff --git a/Adyen.xcodeproj/project.pbxproj b/Adyen.xcodeproj/project.pbxproj
@@ -8950,7 +8950,7 @@
 			repositoryURL = "https://github.com/Adyen/adyen-3ds2-ios";
 			requirement = {
 				kind = exactVersion;
-				version = 2.3.3;
+				version = 2.4.1;
 			};
 		};
 		F94D65E42B0365C30095D61E /* XCRemoteSwiftPackageReference "adyen-authentication-ios" */ = {

diff --git a/Adyen/Utilities/PublicKeyProvider/PublicKeyProvider.swift b/Adyen/Utilities/PublicKeyProvider/PublicKeyProvider.swift
@@ -75,7 +75,19 @@ public final class PublicKeyProvider: AnyPublicKeyProvider {
             cachedPublicKey = response.cardPublicKey
             completion(.success(response.cardPublicKey))
         case let .failure(error):
+            if error is DecodingError {
+                // Disclaimer: This error check is not 100% reliable. Need to improve the endpoint. 
+                return completion(.failure(Error.invalidClientKey))
+            }
             completion(.failure(error))
         }
     }
+
+    public enum Error: Swift.Error, LocalizedError {
+        case invalidClientKey
+
+        public var errorDescription: String? {
+            return "Client key not found on the selected environment."
+        }
+    }
 }
diff --git a/AdyenCard/Components/Card/ThreeDS2SdkVersion.swift b/AdyenCard/Components/Card/ThreeDS2SdkVersion.swift
@@ -7,4 +7,4 @@
 import Foundation
 
 /// The 3DS2 SDK version.
-public let threeDS2SdkVersion: String = "2.3.3"
+public let threeDS2SdkVersion: String = "2.4.1"
diff --git a/Cartfile b/Cartfile
@@ -1,4 +1,4 @@
-github "adyen/adyen-3ds2-ios" == 2.3.3
+github "adyen/adyen-3ds2-ios" == 2.4.1
 github "adyen/adyen-networking-ios" == 2.0.0
 github "adyen/adyen-wechatpay-ios" == 2.1.0
 github "adyen/adyen-authentication-ios" == 2.0.0
diff --git a/Package.swift b/Package.swift
@@ -59,7 +59,7 @@ let package = Package(
         .package(
             name: "Adyen3DS2",
             url: "https://github.com/Adyen/adyen-3ds2-ios",
-            .exact(Version(2, 3, 3))
+            .exact(Version(2, 4, 1))
         ),
         .package(
             name: "AdyenAuthentication",