3.4.1

Adyen · Apr 2, 2020 · 0a9abc1 · 0a9abc1
1 parent acbb924
commit 0a9abc1
Show file tree

Hide file tree

Showing 238 changed files with 3,246 additions and 394 deletions.
diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -25,6 +25,8 @@ custom_categories:
       - CardTypeDetector
       - CardExpiryDateFormatter
       - CardExpiryDateValidator
+      - CardSecurityCodeFormatter
+      - CardSecurityCodeValidator
       - CardNumberFormatter
       - CardNumberValidator
   - name: Qiwi Wallet Component

diff --git a/Adyen.podspec b/Adyen.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Adyen'
-  s.version = '3.4.0'
+  s.version = '3.4.1'
   s.summary = "Adyen Components for iOS"
   s.description = <<-DESC
     Adyen Components for iOS allows you to accept in-app payments by providing you with the building blocks you need to create a checkout experience.

diff --git a/Adyen.xcodeproj/project.pbxproj b/Adyen.xcodeproj/project.pbxproj
@@ -2619,7 +2619,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 3.4.0;
+				CURRENT_PROJECT_VERSION = 3.4.1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -2683,7 +2683,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 3.4.0;
+				CURRENT_PROJECT_VERSION = 3.4.1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2714,7 +2714,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B2NYSS5932;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3.4.0;
+				DYLIB_CURRENT_VERSION = 3.4.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Adyen/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -2737,7 +2737,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B2NYSS5932;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3.4.0;
+				DYLIB_CURRENT_VERSION = 3.4.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Adyen/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -2800,7 +2800,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B2NYSS5932;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3.4.0;
+				DYLIB_CURRENT_VERSION = 3.4.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = AdyenCard/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -2821,7 +2821,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B2NYSS5932;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3.4.0;
+				DYLIB_CURRENT_VERSION = 3.4.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = AdyenCard/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -2882,7 +2882,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B2NYSS5932;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3.4.0;
+				DYLIB_CURRENT_VERSION = 3.4.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = AdyenDropIn/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -2905,7 +2905,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B2NYSS5932;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3.4.0;
+				DYLIB_CURRENT_VERSION = 3.4.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = AdyenDropIn/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -2925,11 +2925,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3.4.0;
+				CURRENT_PROJECT_VERSION = 3.4.1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B2NYSS5932;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3.4.0;
+				DYLIB_CURRENT_VERSION = 3.4.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = AdyenWeChatPay/Info.plist;
@@ -2968,11 +2968,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3.4.0;
+				CURRENT_PROJECT_VERSION = 3.4.1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B2NYSS5932;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3.4.0;
+				DYLIB_CURRENT_VERSION = 3.4.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = AdyenWeChatPay/Info.plist;

diff --git a/Adyen/Info.plist b/Adyen/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.0</string>
+	<string>3.4.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

diff --git a/Adyen/UI/Form/Items/Text/FormTextItemView.swift b/Adyen/UI/Form/Items/Text/FormTextItemView.swift
@@ -263,6 +263,9 @@ public extension FormTextItemView {
 /// So in order to prevent this behaviour,
 /// accessibilityValue is overriden to return an empty string in case the text var is nil or empty string.
 private final class TextField: UITextField {
+
+    private var heightConstraint: NSLayoutConstraint?
+
     var disablePlaceHolderAccessibility: Bool = true
 
     /// Executed when the view resigns as first responder.
@@ -286,6 +289,17 @@ private final class TextField: UITextField {
         }
     }
 
+    override var font: UIFont? {
+        didSet {
+            heightConstraint = heightConstraint ?? heightAnchor.constraint(equalToConstant: 0)
+            let sizeToFit = sizeThatFits(CGSize(width: bounds.width,
+                                                height: UIView.layoutFittingExpandedSize.height))
+            heightConstraint?.constant = sizeToFit.height + 1
+            heightConstraint?.priority = .defaultHigh
+            heightConstraint?.isActive = true
+        }
+    }
+
     override func resignFirstResponder() -> Bool {
         let result = super.resignFirstResponder()
         onDidResignFirstResponder?()

diff --git a/Adyen/UI/Form/Items/Value/FormValueItemView.swift b/Adyen/UI/Form/Items/Value/FormValueItemView.swift
@@ -57,7 +57,7 @@ open class FormValueItemView<ItemType: FormValueItem>: FormItemView<ItemType>, A
             }
 
             if isEditing != oldValue {
-                FormPhoneNumberItemView.cancelPreviousPerformRequests(withTarget: self)
+                Self.cancelPreviousPerformRequests(withTarget: self)
                 perform(#selector(didChangeEditingStatus), with: nil, afterDelay: 0.1)
             }
         }

diff --git a/Adyen/Utilities/LengthValidator.swift b/Adyen/Utilities/LengthValidator.swift
@@ -10,10 +10,10 @@ import Foundation
 open class LengthValidator: Validator {
 
     /// The minimum length of the string.
-    public let minimumLength: Int?
+    open var minimumLength: Int?
 
     /// The maximum length of the string.
-    public let maximumLength: Int?
+    open var maximumLength: Int?
 
     /// Initializes the length validator.
     ///

diff --git a/Adyen/Validators/NumericStringValidator.swift b/Adyen/Validators/NumericStringValidator.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 /// Validates a phone number.
-public final class NumericStringValidator: LengthValidator {
+open class NumericStringValidator: LengthValidator {
 
     /// :nodoc:
     public override func isValid(_ value: String) -> Bool {

diff --git a/AdyenCard/Formatters/CardSecurityCodeFormatter.swift b/AdyenCard/Formatters/CardSecurityCodeFormatter.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 /// Formats a card's security code (CVC/CVV).
-internal final class CardSecurityCodeFormatter: NumericFormatter, Observer {
+public final class CardSecurityCodeFormatter: NumericFormatter, Observer {
 
     /// Indicate is validating CVV belong to a Amex card
     private var cardType: CardType?
@@ -24,7 +24,7 @@ internal final class CardSecurityCodeFormatter: NumericFormatter, Observer {
 
     /// :nodoc:
     public override func formattedValue(for value: String) -> String {
-        let value = sanitizedValue(for: value)
+        let value = super.formattedValue(for: value)
 
         if value.count > expectedLength {
             return String(value.prefix(expectedLength))

diff --git a/AdyenCard/Info.plist b/AdyenCard/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.0</string>
+	<string>3.4.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

diff --git a/AdyenCard/Validators/CardSecurityCodeValidator.swift b/AdyenCard/Validators/CardSecurityCodeValidator.swift
@@ -7,25 +7,25 @@
 import Foundation
 
 /// Validates a card's security code.
-internal final class CardSecurityCodeValidator: Validator, Observer {
-
-    /// Indicate is validating CVV belong to a Amex card
-    private var cardType: CardType?
-    private var expectedLength: Int { cardType == CardType.americanExpress ? 4 : 3 }
+public final class CardSecurityCodeValidator: NumericStringValidator, Observer {
 
     /// Initiate new instance of CardSecurityCodeValidator
-    /// - Parameter publisher: observer of a card type
+    /// - Parameter publisher: Observable of a card type
     public init(publisher: Observable<CardType?>? = nil) {
+        super.init(minimumLength: 3, maximumLength: 4)
         guard let publisher = publisher else { return }
 
-        bind(publisher, to: self, at: \.cardType)
+        updateExpectedLength(from: publisher.value)
+
+        observe(publisher) { [weak self] cardType in
+            self?.updateExpectedLength(from: cardType)
+        }
     }
 
-    /// :nodoc:
-    public func isValid(_ string: String) -> Bool {
-        return string.count == expectedLength
+    private func updateExpectedLength(from cardType: CardType?) {
+        let length = cardType == .americanExpress ? 4 : 3
+        maximumLength = length
+        minimumLength = length
     }
 
-    /// :nodoc:
-    public func maximumLength(for value: String) -> Int { expectedLength }
 }
diff --git a/AdyenDropIn/Info.plist b/AdyenDropIn/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.0</string>
+	<string>3.4.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

diff --git a/AdyenTests/Card Tests/Form/FormCardNumberItemTests.swift b/AdyenTests/Card Tests/Form/FormCardNumberItemTests.swift
@@ -99,7 +99,7 @@ class FormCardNumberItemTests: XCTestCase {
         XCTAssertEqual(amex.isHidden.value, false)
         XCTAssertEqual(cup.isHidden.value, true)
         XCTAssertEqual(maestro.isHidden.value, true)
-
+        
         // When typing common pattern, all matching cards should be visible.
         item.value = "62"
         XCTAssertEqual(visa.isHidden.value, true)

diff --git a/AdyenTests/Info.plist b/AdyenTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.0</string>
+	<string>3.4.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/AdyenUIHost/Resources/Info.plist b/AdyenUIHost/Resources/Info.plist
@@ -35,7 +35,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.0</string>
+	<string>3.4.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

diff --git a/AdyenWeChatPay/Info.plist b/AdyenWeChatPay/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.0</string>
+	<string>3.4.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

diff --git a/Docs/3D Secure 2 Component.html b/Docs/3D Secure 2 Component.html
@@ -103,6 +103,12 @@
               <li class="nav-group-task">
                 <a class="nav-group-task-link" href="Card%20Component.html#/s:5Adyen23CardExpiryDateValidatorC">CardExpiryDateValidator</a>
               </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/CardSecurityCodeFormatter.html">CardSecurityCodeFormatter</a>
+              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/CardSecurityCodeValidator.html">CardSecurityCodeValidator</a>
+              </li>
               <li class="nav-group-task">
                 <a class="nav-group-task-link" href="Classes/CardNumberFormatter.html">CardNumberFormatter</a>
               </li>
@@ -580,7 +586,7 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2020 <a class="link" href="https://adyen.com" target="_blank" rel="external">Adyen</a>. All rights reserved. (Last updated: 2020-03-26)</p>
+      <p>&copy; 2020 <a class="link" href="https://adyen.com" target="_blank" rel="external">Adyen</a>. All rights reserved. (Last updated: 2020-04-02)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.0</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>

diff --git a/Docs/Apple Pay Component.html b/Docs/Apple Pay Component.html
@@ -103,6 +103,12 @@
               <li class="nav-group-task">
                 <a class="nav-group-task-link" href="Card%20Component.html#/s:5Adyen23CardExpiryDateValidatorC">CardExpiryDateValidator</a>
               </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/CardSecurityCodeFormatter.html">CardSecurityCodeFormatter</a>
+              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/CardSecurityCodeValidator.html">CardSecurityCodeValidator</a>
+              </li>
               <li class="nav-group-task">
                 <a class="nav-group-task-link" href="Classes/CardNumberFormatter.html">CardNumberFormatter</a>
               </li>
@@ -553,7 +559,7 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2020 <a class="link" href="https://adyen.com" target="_blank" rel="external">Adyen</a>. All rights reserved. (Last updated: 2020-03-26)</p>
+      <p>&copy; 2020 <a class="link" href="https://adyen.com" target="_blank" rel="external">Adyen</a>. All rights reserved. (Last updated: 2020-04-02)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.0</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>

diff --git a/Docs/BCMC Component.html b/Docs/BCMC Component.html
@@ -103,6 +103,12 @@
               <li class="nav-group-task">
                 <a class="nav-group-task-link" href="Card%20Component.html#/s:5Adyen23CardExpiryDateValidatorC">CardExpiryDateValidator</a>
               </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/CardSecurityCodeFormatter.html">CardSecurityCodeFormatter</a>
+              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/CardSecurityCodeValidator.html">CardSecurityCodeValidator</a>
+              </li>
               <li class="nav-group-task">
                 <a class="nav-group-task-link" href="Classes/CardNumberFormatter.html">CardNumberFormatter</a>
               </li>
@@ -524,7 +530,7 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2020 <a class="link" href="https://adyen.com" target="_blank" rel="external">Adyen</a>. All rights reserved. (Last updated: 2020-03-26)</p>
+      <p>&copy; 2020 <a class="link" href="https://adyen.com" target="_blank" rel="external">Adyen</a>. All rights reserved. (Last updated: 2020-04-02)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.0</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>

diff --git a/Docs/Base Component.html b/Docs/Base Component.html
@@ -103,6 +103,12 @@
               <li class="nav-group-task">
                 <a class="nav-group-task-link" href="Card%20Component.html#/s:5Adyen23CardExpiryDateValidatorC">CardExpiryDateValidator</a>
               </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/CardSecurityCodeFormatter.html">CardSecurityCodeFormatter</a>
+              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/CardSecurityCodeValidator.html">CardSecurityCodeValidator</a>
+              </li>
               <li class="nav-group-task">
                 <a class="nav-group-task-link" href="Classes/CardNumberFormatter.html">CardNumberFormatter</a>
               </li>
@@ -830,7 +836,7 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2020 <a class="link" href="https://adyen.com" target="_blank" rel="external">Adyen</a>. All rights reserved. (Last updated: 2020-03-26)</p>
+      <p>&copy; 2020 <a class="link" href="https://adyen.com" target="_blank" rel="external">Adyen</a>. All rights reserved. (Last updated: 2020-04-02)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.0</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>