Merge pull request #1 from Tap-Payments/FT_get_view_controller_from_data_source

Get view controller from data source

Author: OsamaRabie

.DS_Store

@@ -182,7 +182,7 @@ class ViewController: UIViewController {
 
     func authorisePayment() {
 
-        tapApplePay.authorizePayment(in: self, for: myTapApplePayRequest) { [weak self] (token) in
+        tapApplePay.authorizePayment(for: myTapApplePayRequest) { [weak self] (token) in
             self?.showTokenizedData(with: token)
         } onErrorOccured: { error in
             let alertControl = UIAlertController(title: "Invalid data passed", message: error.TapApplePayRequestValidationErrorRawValue(), preferredStyle: .alert)

TapApplePayKit-Example/ViewController.swift

@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
   #
 
   spec.name         = "TapApplePayKit-iOS"
-  spec.version      = "1.0.23"
+  spec.version      = "1.0.24"
   spec.summary      = "Provide an interface and an easy wrapper for Apple Pay functionalities."
 
   # This description is used to generate tags and improve search results.

TapApplePayKit-iOS.podspec

@@ -75,7 +75,7 @@ import TapNetworkKit_iOS
      - Parameter tokenized: The block to be called once the user successfully authorize the payment
      - Parameter onErrorOccured: The block to call whenever there's an issue showing apple pay sheet
      */
-    @objc public func authorizePayment(in presenter:UIViewController, for tapApplePayRequest:TapApplePayRequest, tokenized:@escaping ((TapApplePayToken)->()), onErrorOccured: @escaping((TapApplePayRequestValidationError)->())) {
+    @objc public func authorizePayment(for tapApplePayRequest:TapApplePayRequest, tokenized:@escaping ((TapApplePayToken)->()), onErrorOccured: @escaping((TapApplePayRequestValidationError)->())) {
 
         // let us make sure the passed data are valid and allowed as merchant configuration
         guard validate(tapApplePayRequest: tapApplePayRequest) == .Valid else {

TapApplePayKit-iOS.xcworkspace/xcuserdata/osamarabie.xcuserdatad/UserInterfaceState.xcuserstate

@@ -29,6 +29,9 @@ import PassKit
      - Parameter appleToken: The correctly and authorized tokenized payment data from Apple Pay kit
      */
     func tapApplePayValidationError(error:TapApplePayRequestValidationError)->()
+    
+    
+    
 }
 /// Class represents the UIView that has Apple pay button wrapped inside Tap Kit
 @objcMembers public class TapApplePayButton: UIView {
@@ -139,9 +142,8 @@ import PassKit
     internal func startApplePaymentAuthorization() {
         // It is a must to have a data source, henc the payment request itself
         if let nonNullDataSource = dataSource {
-            
             // Initiate the authorization and wait for the feedback from Apple
-            tapApplePay.authorizePayment(in: self.findViewController()!, for: nonNullDataSource.tapApplePayRequest , tokenized: { [weak self] (token) in
+            tapApplePay.authorizePayment(for: nonNullDataSource.tapApplePayRequest , tokenized: { [weak self] (token) in
                 if let nonNullDelegate = self?.delegate {
                     // If there is alistener, let him know that the authorization is done with the provided tokem
                     nonNullDelegate.tapApplePayFinished(with: token)
@@ -162,22 +164,6 @@ extension String: LocalizedError {
 }
 
 
-internal extension UIView {
-    /**
-     An extension method to detect the viewcontroller which the current view is embedded in
-     - Returns: UIViewcontroller that holds the current view or nil if not found for any case
-     **/
-    func findViewController() -> UIViewController? {
-        if let nextResponder = self.next as? UIViewController {
-            return nextResponder
-        } else if let nextResponder = self.next as? UIView {
-            return nextResponder.findViewController()
-        } else {
-            return nil
-        }
-    }
-}
-
 
 
 fileprivate extension UIView {