Merge branch 'main' into fix/update-how-frames-options-are-sent-to-ri…

…sk-sdk

.github/CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 
 #### 4.x Releases
 
+## [4.3.4](https://github.com/checkout/frames-ios/releases/tag/4.3.4)
+
+Released on 2024-04-17
+
+Updates:
+
+- Small internal logging data structure alteration. No public or breaking changes. 
+
+
 ## [4.3.3](https://github.com/checkout/frames-ios/releases/tag/4.3.3)
 
 Released on 2024-04-04

Checkout.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Checkout'
-  s.version = '4.3.3'
+  s.version = '4.3.4'
   s.summary = 'Checkout SDK for iOS'
 
   s.description = <<-DESC

Checkout/Samples/CocoapodsSample/Podfile

@@ -5,6 +5,6 @@ target 'CheckoutCocoapodsSample' do
   use_frameworks!
 
   # Pods for CheckoutSDKCocoapodsSample
-  pod 'Checkout', '4.3.3'
+  pod 'Checkout', '4.3.4'
 
 end

Checkout/Samples/SPMSample/CheckoutSPMSample.xcodeproj/project.pbxproj

@@ -512,7 +512,7 @@
 			repositoryURL = "https://github.com/checkout/frames-ios";
 			requirement = {
 				kind = exactVersion;
-				version = 4.3.3;
+				version = 4.3.4;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

Checkout/Source/Tokenisation/CheckoutAPIService.swift

@@ -136,7 +136,7 @@ final public class CheckoutAPIService: CheckoutAPIProtocol {
         tokenType: tokenRequest.type,
         publicKey: publicKey
       )))
-      createToken(requestParameters: requestParameters, completion: completion)
+      createToken(requestParameters: requestParameters, paymentType: tokenRequest.type, completion: completion)
     case .failure(let error):
       switch error {
       case .baseURLCouldNotBeConvertedToComponents, .couldNotBuildURL:
@@ -145,13 +145,15 @@ final public class CheckoutAPIService: CheckoutAPIProtocol {
     }
   }
 
-  private func createToken(requestParameters: NetworkManager.RequestParameters, completion: @escaping (Result<TokenDetails, TokenisationError.TokenRequest>) -> Void) {
+  private func createToken(requestParameters: NetworkManager.RequestParameters,
+                           paymentType: TokenRequest.TokenType,
+                           completion: @escaping (Result<TokenDetails, TokenisationError.TokenRequest>) -> Void) {
     requestExecutor.execute(
       requestParameters,
       responseType: TokenResponse.self,
       responseErrorType: TokenisationError.ServerError.self
     ) { [weak self, tokenDetailsFactory, logManager, logTokenResponse] tokenResponseResult, httpURLResponse in
-      logTokenResponse(tokenResponseResult, httpURLResponse)
+      logTokenResponse(tokenResponseResult, paymentType, httpURLResponse)
 
       switch tokenResponseResult {
       case .response(let tokenResponse):
@@ -177,10 +179,12 @@ final public class CheckoutAPIService: CheckoutAPIProtocol {
     }
   }
 
-  private func logTokenResponse(tokenResponseResult: NetworkRequestResult<TokenResponse, TokenisationError.ServerError>, httpURLResponse: HTTPURLResponse?) {
+  private func logTokenResponse(tokenResponseResult: NetworkRequestResult<TokenResponse, TokenisationError.ServerError>,
+                                paymentType: TokenRequest.TokenType,
+                                httpURLResponse: HTTPURLResponse?) {
     switch tokenResponseResult {
     case .response(let tokenResponse):
-      let tokenRequestData = CheckoutLogEvent.TokenRequestData(tokenType: tokenResponse.type, publicKey: publicKey)
+      let tokenRequestData = CheckoutLogEvent.TokenRequestData(tokenType: paymentType, publicKey: publicKey)
       let tokenResponseData = CheckoutLogEvent.TokenResponseData(
         tokenID: tokenResponse.token,
         scheme: tokenResponse.scheme,
@@ -190,7 +194,7 @@ final public class CheckoutAPIService: CheckoutAPIProtocol {
 
       logManager.queue(event: .tokenResponse(tokenRequestData, tokenResponseData))
     case .errorResponse(let errorResponse):
-      let tokenRequestData = CheckoutLogEvent.TokenRequestData(tokenType: nil, publicKey: publicKey)
+      let tokenRequestData = CheckoutLogEvent.TokenRequestData(tokenType: paymentType, publicKey: publicKey)
       let tokenResponseData = CheckoutLogEvent.TokenResponseData(
         tokenID: nil,
         scheme: nil,

CheckoutTests/Tokenisation/CheckoutAPIServiceTests.swift

@@ -124,7 +124,7 @@ final class CheckoutAPIServiceTests: XCTestCase {
     XCTAssertEqual(result, .failure(.couldNotBuildURLForRequest))
   }
 
-  func test_createToken_failure_serverError() {
+  func test_createToken_failure_card_payment_serverError() {
     let card = StubProvider.createCard()
     let tokenRequest = StubProvider.createTokenRequest()
     let requestParameters = StubProvider.createRequestParameters()
@@ -148,7 +148,7 @@ final class CheckoutAPIServiceTests: XCTestCase {
     stubRequestExecutor.executeCalledWithCompletion?(.errorResponse(serverError), HTTPURLResponse())
 
     XCTAssertEqual(StubLogManager.queueCalledWith.last, .tokenResponse(
-      .init(tokenType: nil, publicKey: "publicKey"),
+      .init(tokenType: .card, publicKey: "publicKey"),
       .init(
         tokenID: nil,
         scheme: nil,

Frames.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Frames"
-  s.version      = "4.3.3"
+  s.version      = "4.3.4"
   s.summary      = "Checkout API Client, Payment Form UI and Utilities in Swift"
   s.description  = <<-DESC
   Checkout API Client and Payment Form Utilities in Swift.
@@ -21,6 +21,6 @@ Pod::Spec.new do |s|
 
   s.dependency 'PhoneNumberKit'
   s.dependency 'CheckoutEventLoggerKit', '~> 1.2.4'
-  s.dependency 'Checkout', '4.3.3'
+  s.dependency 'Checkout', '4.3.4'
 
 end

iOS Example Frame SPM/iOS Example Frame SPM.xcodeproj/project.pbxproj

@@ -1239,7 +1239,7 @@
 			repositoryURL = "https://github.com/checkout/frames-ios";
 			requirement = {
 				kind = exactVersion;
-				version = 4.3.3;
+				version = 4.3.4;
 			};
 		};
 		16C3F83E2A7927ED00690639 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = {

iOS Example Frame/Podfile

@@ -6,7 +6,7 @@ target 'iOS Example Frame' do
   use_frameworks!
 
   # Pods for iOS Example Custom
-  pod 'Frames', '4.3.3'
+  pod 'Frames', '4.3.4'
 
 end