Merge pull request #348 from verygoodsecurity/canary

Public release 1.13.0

.circleci/config.yml

@@ -3,31 +3,31 @@ version: 2
 jobs:
   build-and-test-sdk:
     macos:
-      xcode: "14.0"
+      xcode: "14.2"
     steps:
       - checkout
       - run:
           name: Run Tests iOS 16
           command: >
-            cd Tests/FrameworkTests/Resources && plutil -insert tokenization_vaultId -string ${tokenization_vaultId} MockedData.plist && cd .. && cd .. && cd .. && xcodebuild test -project VGSCollectSDK.xcodeproj -scheme FrameworkTests -destination 'platform=iOS Simulator,name=iPhone 14,OS=16.0' -testPlan FrameworkTests
+            cd Tests/FrameworkTests/Resources && plutil -insert tokenization_vaultId -string ${tokenization_vaultId} MockedData.plist && plutil -insert vaultID -string ${vaultID} MockedData.plist && cd .. && cd .. && cd .. && xcodebuild test -project VGSCollectSDK.xcodeproj -scheme FrameworkTests -destination 'platform=iOS Simulator,name=iPhone 14,OS=16.2' -testPlan FrameworkTests
   build-and-ui-test-demo-app-ios-16-iphone14:
     macos:
-      xcode: "14.0"
+      xcode: "14.2"
     steps:
       - checkout
       - run:
-          name: Run UI Tests on iPhone 14 iOS 16.0
+          name: Run UI Tests on iPhone 14 iOS 16.2
           command: >
             cd demoapp &&
             cd demoapp &&
             plutil -insert vaultID -string ${vaultID} UITestsMockedData.plist &&
             cd .. &&
             pod install &&
-            xcrun instruments -w "iPhone 14 (16.0) [" || true &&
+            xcrun instruments -w "iPhone 14 (16.2) [" || true &&
             xcodebuild test -workspace demoapp.xcworkspace
             -scheme demoappUITests
             -sdk iphonesimulator
-            -destination 'platform=iOS Simulator,name=iPhone 14,OS=16.0'
+            -destination 'platform=iOS Simulator,name=iPhone 14,OS=16.2'
 
 workflows:
   version: 2

.jazzy.yaml

@@ -30,11 +30,37 @@ custom_categories:
   - VGSTextField
   - VGSCardTextField
   - VGSExpDateTextField
+  - VGSDateTextField
   - VGSCVCTextField
   - VGSTextFieldDelegate
   - VGSConfiguration
   - VGSExpDateConfiguration
+  - VGSDateConfiguration
+  - VGSCardHolderNameTokenizationConfiguration
+  - VGSCardNumberTokenizationConfiguration
+  - VGSCVCTokenizationConfiguration
+  - VGSDateTokenizationConfiguration
+  - VGSExpDateTokenizationConfiguration
+  - VGSSSNTokenizationConfiguration
+  - VGSTokenizationConfiguration
+  - VGSDateConfigurationProtocol
+  - VGSExpDateConfigurationProtocol
   - FieldType
+  - VGSDateFormat
+  - VGSDate
+  - VGSTextFieldInputSource
+- name: Tokenization Parameters
+  children:
+  - VGSTokenizationParametersProtocol
+  - VGSCVCTokenizationParameters
+  - VGSCardHolderNameTokenizationParameters
+  - VGSCardNumberTokenizationParameters
+  - VGSDateTokenizationParameters
+  - VGSExpDateTokenizationParameters
+  - VGSSSNTokenizationParameters
+  - VGSTokenizationParameters
+  - VGSVaultAliasFormat
+  - VGSVaultStorageType
 - name: Card Scan
   children:
   - VGSCardIOScanController
@@ -54,10 +80,12 @@ custom_categories:
   - State
   - SSNState
   - CardState
+  - VGSTextFieldStatePublisher
   - VGSResponse
+  - VGSTokenizationResponse
   - VGSCollectRequestOptions
   - JsonData
-  - HTTPMethod
+  - VGSCollectHTTPMethod
   - HTTPHeaders
 - name: Payment Cards
   children:
@@ -78,6 +106,7 @@ custom_categories:
   - VGSValidationRulePaymentCard
   - VGSValidationRuleLuhnCheck
   - VGSValidationRuleCardExpirationDate
+  - VGSValidationRuleDateRange
   - CheckSumAlgorithmType
   - CardExpDateFormat
 - name: Errors

README.md

@@ -434,7 +434,6 @@ Use vgsCollect.cleanFiles() to unassign file from associated VGSCollect instance
 ## Demo Application
 Demo application for collecting card data on iOS is <a href="https://github.com/vgs-samples/very-spacy-food-iOS">here</a>.
 
-Also you can check our [payment optimization demo](./demoapp/demoapp/UseCases/PayOptIntegration/) with Payment Orchestration integration.
 
 ### Documentation
 -  SDK Documentation: https://www.verygoodsecurity.com/docs/vgs-collect/ios-sdk
@@ -451,7 +450,7 @@ VGSAnalyticsClient.shared.shouldCollectAnalytics = false
 ```
 
 ## Dependencies
-- iOS 10+
+- iOS 12+
 - Swift 5
 - Optional 3rd party libraries:
   - [CardIO](https://github.com/card-io/card.io-iOS-SDK)

Sources/VGSBlinkCardCollector/CardDataMappers/VGSBlinkCardExpirationDate.swift

@@ -1,4 +1,3 @@
-
 import Foundation
 #if !COCOAPODS
 import VGSCollectSDK

Sources/VGSBlinkCardCollector/VGSBlinkCardController.swift

@@ -22,12 +22,12 @@ public class VGSBlinkCardController {
 
     /// `VGSBlinkCardControllerDelegate` - handle user interaction with `BlinkCard` scanner.
     public var delegate: VGSBlinkCardControllerDelegate? {
-      set {
-        scanHandler?.delegate = newValue
-      }
       get {
         return scanHandler?.delegate
       }
+      set {
+        scanHandler?.delegate = newValue
+      }
     }
 
     // MARK: - Initialization

Sources/VGSBlinkCardCollector/VGSBlinkCardHandler.swift

@@ -3,15 +3,16 @@
 //  VGSBlinkCardCollector
 //
 
-
 import Foundation
+#if os(iOS)
+import UIKit
+#endif
+
+#if canImport(BlinkCard)
 import BlinkCard
 #if !COCOAPODS
 import VGSCollectSDK
 #endif
-#if os(iOS)
-import UIKit
-#endif
 
 /// BlinkCard wrapper, manages communication between public API and BlinkCard.
 @available(iOS 13.0, *)
@@ -40,15 +41,15 @@ internal class VGSBlinkCardHandler: NSObject, VGSScanHandlerProtocol {
     /// Setup BlinlCard params and present scanner.
     func presentScanVC(on viewController: UIViewController, animated: Bool, modalPresentationStyle: UIModalPresentationStyle, completion: (() -> Void)?) {
        // Create BlinkCard settings
-       let settings : MBCBlinkCardOverlaySettings = MBCBlinkCardOverlaySettings()
+       let settings: MBCBlinkCardOverlaySettings = MBCBlinkCardOverlaySettings()
        settings.enableEditScreen = false
        // Crate recognizer collection
        let recognizerList = [cardRecognizer]
-       let recognizerCollection : MBCRecognizerCollection = MBCRecognizerCollection(recognizers: recognizerList)
+       let recognizerCollection: MBCRecognizerCollection = MBCRecognizerCollection(recognizers: recognizerList)
         // Create  overlay view controller
        let blinkCardOverlayViewController = MBCBlinkCardOverlayViewController(settings: settings, recognizerCollection: recognizerCollection, delegate: self)
         // Create recognizer view controller with wanted overlay view controller
-       let recognizerRunneViewController : UIViewController = MBCViewControllerFactory.recognizerRunnerViewController(withOverlayViewController: blinkCardOverlayViewController)!
+       let recognizerRunneViewController: UIViewController = MBCViewControllerFactory.recognizerRunnerViewController(withOverlayViewController: blinkCardOverlayViewController)!
         recognizerRunneViewController.modalPresentationStyle = modalPresentationStyle
         self.view = recognizerRunneViewController
         // Present the recognizer runner view controller
@@ -135,3 +136,4 @@ extension VGSBlinkCardHandler: MBCBlinkCardOverlayViewControllerDelegate {
     delegate?.userDidCancelScan()
   }
 }
+#endif

Sources/VGSCardIOCollector/CardIODataMapper/VGSCardIODataMapUtils.swift

@@ -22,24 +22,24 @@ internal final class VGSCardIODataMapUtils {
 	///   - scannedDataType: `CradIODataType` object, CardIO data type.
 	/// - Returns: `String?`, formatted string or `nil`.
 	internal static func mapCardExpirationData(_ data: VGSCardIOExpirationDate, scannedDataType: CradIODataType) -> String? {
-		switch scannedDataType {
-		case .cardNumber, .cvc:
-			return nil
-		case  .expirationDate:
-			return mapDefaultExpirationDate(data.month, scannedExpYear: data.year)
-		case .expirationDateLong:
-			return mapLongExpirationDate(data.month, scannedExpYear: data.year)
-		case .expirationMonth:
-			return mapMonth(data.month)
-		case .expirationYear:
-			return mapYear(data.year)
-		case .expirationYearLong:
-			return mapYearLong(data.year)
+    switch scannedDataType {
+    case .cardNumber, .cvc:
+      return nil
+    case  .expirationDate:
+      return mapDefaultExpirationDate(data.month, scannedExpYear: data.year)
+    case .expirationDateLong:
+      return mapLongExpirationDate(data.month, scannedExpYear: data.year)
+    case .expirationMonth:
+      return mapMonth(data.month)
+    case .expirationYear:
+      return mapYear(data.year)
+    case .expirationYearLong:
+      return mapYearLong(data.year)
     case .expirationDateShortYearThenMonth:
       return mapExpirationDateWithShortYearFirst(data.month, scannedExpYear: data.year)
     case .expirationDateLongYearThenMonth:
       return mapLongExpirationDateWithLongYearFirst(data.month, scannedExpYear: data.year)
-		}
+    }
 	}
 
 	// MARK: - Helpers

Sources/VGSCardIOCollector/VGSCardIOScanController.swift

@@ -25,12 +25,12 @@ public class VGSCardIOScanController {
 
     /// `VGSCardIOScanControllerDelegate` - handle user interaction with `Card.io` scanner
     public var delegate: VGSCardIOScanControllerDelegate? {
-        set {
-          scanHandler?.delegate = newValue
-        }
         get {
           return scanHandler?.delegate
         }
+        set {
+          scanHandler?.delegate = newValue
+        }
     }
 
     /// Defines preferred `AVCaptureDevice.Position`. Deault is `AVCaptureDevice.Position.unspecified`
@@ -50,7 +50,7 @@ public class VGSCardIOScanController {
 
     /// Defines preferred language for all strings appearing in the CardIO user interface.
     /// If not set, or if set to nil, defaults to the device's current language setting.
-    public var languageOrLocale: String? = nil {
+    public var languageOrLocale: String? {
         didSet {
             scanHandler?.languageOrLocale = languageOrLocale
         }

Sources/VGSCollectSDK/Core/API/APIClient.swift

@@ -136,7 +136,7 @@ class APIClient {
 			}
 
       // Check if routeId is set and should be attached to request url
-      if case .vaultURL(_) = self.hostURLPolicy,
+      if case .vaultURL = self.hostURLPolicy,
          let routeId = routeId {
 
         guard let newUrl = APIClient.buildVaultURL(tenantId: self.vaultId, regionalEnvironment: self.environment, routeId: routeId) else {

Sources/VGSCollectSDK/Core/Analytics/VGSFormAnanlyticsDetails.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-///:nodoc:  VGSCollect Form Analytics Details
+/// :nodoc:  VGSCollect Form Analytics Details
 public struct VGSFormAnanlyticsDetails {
   public let formId: String
   public let tenantId: String