diff --git a/Sources/VGSCollectSDK/Core/Collector/VGSCollect+network.swift b/Sources/VGSCollectSDK/Core/Collector/VGSCollect+network.swift index 05fe3acc..eef165d7 100644 --- a/Sources/VGSCollectSDK/Core/Collector/VGSCollect+network.swift +++ b/Sources/VGSCollectSDK/Core/Collector/VGSCollect+network.swift @@ -286,9 +286,9 @@ extension VGSCollect { */ public func tokenizeData(routeId: String? = nil) async -> VGSTokenizationResponse { return await withCheckedContinuation { continuation in - //NOTE: We need to use main thread since data will be collected from UI elements + // NOTE: We need to use main thread since data will be collected from UI elements DispatchQueue.main.async { - self.tokenizeData {response in + self.tokenizeData(routeId: routeId) {response in continuation.resume(returning: response) } } diff --git a/Sources/VGSCollectSDK/Utils/Extensions/Utils.swift b/Sources/VGSCollectSDK/Utils/Extensions/Utils.swift index 0840db82..b647d966 100644 --- a/Sources/VGSCollectSDK/Utils/Extensions/Utils.swift +++ b/Sources/VGSCollectSDK/Utils/Extensions/Utils.swift @@ -46,7 +46,7 @@ internal class Utils { /// VGS Collect SDK Version. /// Necessary since SPM doesn't track info plist correctly: https://forums.swift.org/t/add-info-plist-on-spm-bundle/40274/5 - static let vgsCollectVersion: String = "1.15.2" + static let vgsCollectVersion: String = "1.15.3" } extension Dictionary { diff --git a/Tests/FrameworkTests/APIClient Tests/TokenizationApiTests.swift b/Tests/FrameworkTests/APIClient Tests/TokenizationApiTests.swift index d86f1d2a..4ebaa9d5 100644 --- a/Tests/FrameworkTests/APIClient Tests/TokenizationApiTests.swift +++ b/Tests/FrameworkTests/APIClient Tests/TokenizationApiTests.swift @@ -67,6 +67,31 @@ class TokenizationApiTests: VGSCollectBaseTestCase { } wait(for: [expectation], timeout: 60) } + + func testAsyncTokenizeCardURL() { + let vaultId = MockedDataProvider.shared.tokenizationVaultId + let routeId = UUID().uuidString.lowercased() + let environment = "sandbox" + let proxy = "verygoodproxy.com" + let path = "tokens" + let expectedUrl = URL(string: "https://\(vaultId)-\(routeId).\(environment).\(proxy)/\(path)")?.absoluteString + + self.configureCardTextFields() + let expectation = XCTestExpectation(description: "Sending data...") + Task { + let result = await collector.tokenizeData(routeId: routeId) + let responeURL: String? + switch result { + case .success(_, _, let response): + responeURL = response?.url?.absoluteString + case .failure(_, _, let response, _): + responeURL = response?.url?.absoluteString + } + XCTAssertTrue(expectedUrl == responeURL, "-testAsyncTokenizeCardURL error: wrong resopnseURL \(responeURL)") + expectation.fulfill() + } + wait(for: [expectation], timeout: 60) + } func testCardSendPublisherToEchoServer() { self.configureCardTextFields() diff --git a/Tests/FrameworkTests/VGSCollectTest+Validation.swift b/Tests/FrameworkTests/VGSCollectTest+Validation.swift index 3b9d6724..f24a9dab 100644 --- a/Tests/FrameworkTests/VGSCollectTest+Validation.swift +++ b/Tests/FrameworkTests/VGSCollectTest+Validation.swift @@ -61,7 +61,7 @@ class VGSCollectValidationTests: XCTestCase { let expDateField = VGSTextField() expDateField.configuration = expDateConfiguration - expDateField.textField.secureText = "1123" + expDateField.textField.secureText = "1128" let cvcConfiguration = VGSConfiguration(collector: collector, fieldName: "cvc") cvcConfiguration.type = .cvc diff --git a/VGSCollectSDK.podspec b/VGSCollectSDK.podspec index 9015b132..00c2632c 100644 --- a/VGSCollectSDK.podspec +++ b/VGSCollectSDK.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'VGSCollectSDK' - spec.version = '1.15.2' + spec.version = '1.15.3' spec.summary = 'VGS Collect - is a product suite that allows customers to collect information securely without possession of it.' spec.swift_version = '5.0' spec.description = <<-DESC diff --git a/VGSCollectSDK.xcodeproj/project.pbxproj b/VGSCollectSDK.xcodeproj/project.pbxproj index 49bf7bac..d8bc56b2 100644 --- a/VGSCollectSDK.xcodeproj/project.pbxproj +++ b/VGSCollectSDK.xcodeproj/project.pbxproj @@ -1948,7 +1948,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 1.14.0; + MARKETING_VERSION = 1.15.3; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -2010,7 +2010,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 1.14.0; + MARKETING_VERSION = 1.15.3; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -2043,7 +2043,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.15.2; + MARKETING_VERSION = 1.15.3; PRODUCT_BUNDLE_IDENTIFIER = com.vgs.framework; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2075,7 +2075,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.15.2; + MARKETING_VERSION = 1.15.3; PRODUCT_BUNDLE_IDENTIFIER = com.vgs.framework; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = "";