No cancel after success

OsamaRabie · OsamaRabie · commit 588fc9f3c129 · 2024-05-30T11:32:05.000+03:00
diff --git a/BenefitPay-iOS.podspec b/BenefitPay-iOS.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'BenefitPay-iOS'
-  s.version          = '0.0.2'
+  s.version          = '0.0.3'
   s.summary          = 'From the shelf pay with benefit pay button by Tap Payments'
   s.homepage         = 'https://github.com/Tap-Payments/BenefitPay-iOS'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
diff --git a/BenefitPayExampleApp/BenefitPayExampleApp.xcodeproj/project.xcworkspace/xcuserdata/osamarabie.xcuserdatad/UserInterfaceState.xcuserstate b/BenefitPayExampleApp/BenefitPayExampleApp.xcodeproj/project.xcworkspace/xcuserdata/osamarabie.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/BenefitPayExampleApp/BenefitPayExampleApp.xcodeproj/xcuserdata/osamarabie.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/BenefitPayExampleApp/BenefitPayExampleApp.xcodeproj/xcuserdata/osamarabie.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -3,22 +3,4 @@
    uuid = "2B99122E-2F1D-4D14-938C-E8DB4CC2F500"
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F0CFC2C5-30F8-45D1-AD73-6ACAD81611A5"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "BenefitPayExampleApp/BenefitPayButtonExample.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "101"
-            endingLineNumber = "101"
-            landmarkName = "generateTapHashString(publicKey:secretKey:amount:currency:postUrl:transactionReference:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>
diff --git a/BenefitPayExampleApp/BenefitPayExampleApp/Info.plist b/BenefitPayExampleApp/BenefitPayExampleApp/Info.plist
@@ -28,5 +28,9 @@
 		<string>fetch</string>
 		<string>processing</string>
 	</array>
+    <key>BGTaskSchedulerPermittedIdentifiers</key>
+    <array>
+        <string>tap.BenefitPayExampleApp</string>
+    </array>
 </dict>
 </plist>
diff --git a/Sources/BenefitPay-iOS/Logic/SdkBasedButtons/BenefitPay/private/extensions/TapBenefitPay + SwiftEntry.swift b/Sources/BenefitPay-iOS/Logic/SdkBasedButtons/BenefitPay/private/extensions/TapBenefitPay + SwiftEntry.swift
@@ -68,8 +68,7 @@ internal extension BenefitPayButton {
     func createBenefitPayPopUpView() -> UIViewController {
         // The container iew
         let view:UIView = .init()
-        view.backgroundColor = .clear
-        
+        view.backgroundColor = .black
         //webView.isHidden = true
         webView.removeFromSuperview()
         view.addSubview(webView)
@@ -86,7 +85,7 @@ internal extension BenefitPayButton {
         let left = webView.leftAnchor.constraint(equalTo: view.leftAnchor)
         let right = webView.rightAnchor.constraint(equalTo: view.rightAnchor)
         let bottom = webView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
-        
+       
         // Define the constraints of the loader to be centered
         let loaderCenterY  = benefitGifLoader!.centerYAnchor.constraint(equalTo: view.centerYAnchor)
         let loaderCenterX = benefitGifLoader!.centerXAnchor.constraint(equalTo: view.centerXAnchor)
@@ -101,8 +100,8 @@ internal extension BenefitPayButton {
         
         
         let ctr:UIViewController = .init()
-        ctr.view.backgroundColor = .clear
-        ctr.modalPresentationStyle = .overCurrentContext
+        ctr.view.backgroundColor = .red
+        ctr.modalPresentationStyle = .fullScreen
         ctr.view.addSubview(view)
         ctr.restorationIdentifier = "BenefitQRVC"
         view.translatesAutoresizingMaskIntoConstraints = false
@@ -201,7 +200,7 @@ internal extension BenefitPayButton {
         return nil
     }
     
-    func showGifLoader(show:Bool) {
+    /*func showGifLoader(show:Bool) {
         if(show) {
             self.webView.isUserInteractionEnabled = false
             self.benefitGifLoader?.isHidden = false
@@ -217,5 +216,5 @@ internal extension BenefitPayButton {
             self.benefitGifLoader?.isHidden = true
             self.webView.isUserInteractionEnabled = true
         }
-    }
+    }*/
 }
diff --git a/Sources/BenefitPay-iOS/Logic/SdkBasedButtons/BenefitPay/private/extensions/TapBenefitPay+WebDelegate.swift b/Sources/BenefitPay-iOS/Logic/SdkBasedButtons/BenefitPay/private/extensions/TapBenefitPay+WebDelegate.swift
@@ -25,19 +25,19 @@ extension BenefitPayButton:WKNavigationDelegate {
         
         guard let url = navigationAction.request.url else { return }
         
-        if url.absoluteString.hasPrefix(payButtonType.webSdkScheme()) {
-            print("navigationAction", url.absoluteString)
+        if url.absoluteString.lowercased().hasPrefix(payButtonType.webSdkScheme()) {
+            print("navigationAction1", url.absoluteString)
             action = .cancel
         }else{
-            print("navigationAction", url.absoluteString)
+            print("navigationAction2", url.absoluteString)
         }
         // In all cases when we get a feedback from the web view we will need to hide the loader if it is being displayed
-        self.loadingView.isHidden = true
         // Let us see if the web sdk is telling us something
-        if( url.absoluteString.contains(payButtonType.webSdkScheme())) {
+        if( url.absoluteString.lowercased().contains(payButtonType.webSdkScheme())) {
             switch url.absoluteString {
             case _ where url.absoluteString.contains(CallBackSchemeEnum.onError.rawValue):
                 self.handleOnError(data: tap_extractDataFromUrl(url, for: "data", shouldBase64Decode: true))
+                self.loadingView.isHidden = true
                 break
             case _ where url.absoluteString.contains(CallBackSchemeEnum.onOrderCreated.rawValue):
                 delegate?.onOrderCreated?(data: tap_extractDataFromUrl(url, for: "data", shouldBase64Decode: false))
@@ -46,38 +46,23 @@ extension BenefitPayButton:WKNavigationDelegate {
                 delegate?.onChargeCreated?(data: tap_extractDataFromUrl(url, for: "data", shouldBase64Decode: true))
                 break
             case _ where url.absoluteString.contains(CallBackSchemeEnum.onSuccess.rawValue):
-                
-                let notificationContent = UNMutableNotificationContent()
-                   notificationContent.title = "Payment updated"
-                   notificationContent.body = "Return to \(Bundle.main.infoDictionary?[kCFBundleNameKey as String] as? String ?? "the app") to complete your transaction."
-                let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 0.5,
-                                                                    repeats: false)
-                    let request = UNNotificationRequest(identifier: "testNotification",
-                                                        content: notificationContent,
-                                                        trigger: trigger)
-                
-                UNUserNotificationCenter.current().add(request) { (error) in
-                        if let error = error {
-                            print("Notification Error: ", error)
-                        }
-                    }
-                // If app is in background we will not do anything and will save the data onSuccess so when he focuses again, we dispatch the event
-                if UIApplication.shared.applicationState == .active {
-                    self.handleOnSuccess(url:url)
-                }else{
-                    self.webView.isHidden = true
-                    self.onSuccessURL = url
-                }
+                self.handleOnSuccess(url:url)
                 break
             case _ where url.absoluteString.contains(CallBackSchemeEnum.onReady.rawValue):
+                self.loadingView.isHidden = true
                 delegate?.onReady?()
                 break
             case _ where url.absoluteString.contains(CallBackSchemeEnum.onClick.rawValue):
                 self.handleOnClick()
                 break
             case _ where url.absoluteString.contains(CallBackSchemeEnum.onCancel.rawValue):
-                if self.onSuccessURL == nil {
-                    self.removeBenefitPayPopupEntry(handleOnCancel: true) {
+                self.loadingView.isHidden = true
+                self.removeBenefitPayPopupEntry(handleOnCancel: true) {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(3)) {
+                        guard !BenefitPayButton.onSuccessCalled else {
+                            BenefitPayButton.onSuccessCalled = false
+                            return
+                        }
                         self.delegate?.onCanceled?()
                     }
                 }
@@ -105,19 +90,21 @@ extension BenefitPayButton:WKNavigationDelegate {
         self.loadingView.isHidden = false
         // Handle the on cancel and inform the consumer app that on click is triggered
         self.handleOnCancel = true
+        BenefitPayButton.onSuccessCalled = false
         delegate?.onClick?()
     }
     
     func handleOnSuccess(url:URL) {
+        BenefitPayButton.onSuccessCalled = true
         self.webView.isHidden = false
         if !self.removeBenefitPayAppEntry(onDismiss: {
             self.removeBenefitPayPopupEntry(handleOnCancel: false) {
                 self.delegate?.onSuccess?(data: tap_extractDataFromUrl(url, for: "data", shouldBase64Decode: true))
                 //self.openUrl(url: self.currentlyLoadedConfigurations)
             }
         }) {
+            self.delegate?.onSuccess?(data: tap_extractDataFromUrl(url, for: "data", shouldBase64Decode: true))
             self.removeBenefitPayPopupEntry(handleOnCancel: false) {
-                self.delegate?.onSuccess?(data: tap_extractDataFromUrl(url, for: "data", shouldBase64Decode: true))
                 //self.openUrl(url: self.currentlyLoadedConfigurations)
             }
         }
@@ -130,19 +117,43 @@ extension BenefitPayButton:WKNavigationDelegate {
         
         if !self.removeBenefitPayAppEntry(onDismiss: {
             if (self.removeBenefitPayPopupEntry(handleOnCancel: false, onDismiss: {
-                self.delegate?.onError?(data:data)
+                DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(3)) {
+                    guard !BenefitPayButton.onSuccessCalled else {
+                        BenefitPayButton.onSuccessCalled = false
+                        return
+                    }
+                    self.delegate?.onError?(data:data)
+                }
                 self.webView.isUserInteractionEnabled = true
             })){} else{
-                self.delegate?.onError?(data:data)
+                DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(3)) {
+                    guard !BenefitPayButton.onSuccessCalled else {
+                        BenefitPayButton.onSuccessCalled = false
+                        return
+                    }
+                    self.delegate?.onError?(data:data)
+                }
                 self.webView.isUserInteractionEnabled = true
             }
         }) {
             if (self.removeBenefitPayPopupEntry(handleOnCancel: false) {
-                self.delegate?.onError?(data: data)
+                DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(3)) {
+                    guard !BenefitPayButton.onSuccessCalled else {
+                        BenefitPayButton.onSuccessCalled = false
+                        return
+                    }
+                    self.delegate?.onError?(data:data)
+                }
                 self.webView.isUserInteractionEnabled = true
                 //self.openUrl(url: self.currentlyLoadedConfigurations)
             }){}else{
-                self.delegate?.onError?(data: data)
+                DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(3)) {
+                    guard !BenefitPayButton.onSuccessCalled else {
+                        BenefitPayButton.onSuccessCalled = false
+                        return
+                    }
+                    self.delegate?.onError?(data:data)
+                }
                 self.webView.isUserInteractionEnabled = true
             }
         }
diff --git a/Sources/BenefitPay-iOS/Logic/SdkBasedButtons/BenefitPay/views/private/TapBenefitPayView.swift b/Sources/BenefitPay-iOS/Logic/SdkBasedButtons/BenefitPay/views/private/TapBenefitPayView.swift
@@ -23,10 +23,10 @@ internal class BenefitPayButton: PayButtonBaseView {
     internal var handleOnCancel:Bool = true
     /// Keeps a reference to the gif loader we will display when coming back from pay with benefit pay app
     internal var benefitGifLoader:UIImageView?
-    /// Holds the latest onSuccess url called when the app is in background. Will be used to call when the user focuses the app agian
-    internal var onSuccessURL:URL? = nil
     /// Holds a reference to a loader to display on top of the button when clicked until charge api responds
     internal var loadingView:UIActivityIndicatorView = .init(style: .large)
+    /// Declares if we recieved an onSuccess
+    internal static var onSuccessCalled:Bool = false
     
     //MARK: - Init methods
     override public init(frame: CGRect) {
@@ -45,7 +45,7 @@ internal class BenefitPayButton: PayButtonBaseView {
         // Set the button type
         payButtonType = .BenefitPay
         // Set the loader color
-        loadingView.color = .white
+        loadingView.color = .gray
         loadingView.startAnimating()
         // Setuo the web view contais the web sdk
         setupWebView()
@@ -62,7 +62,7 @@ internal class BenefitPayButton: PayButtonBaseView {
         // First, check if the current screen is the paywithebenefitpayapp popup, then we remove it and show the loader on the pay qith benefit qr popup
         if !removeBenefitPayAppEntry() {
             // This means, we are already in the pay with benefit qr ode and we only need to how the loader maybe the chrge will be updated
-            showGifLoader(show: true)
+            //showGifLoader(show: true)
         }
         /*
          // SWIPE Now let us check if the benefitpay app popup is displayed
@@ -95,7 +95,8 @@ internal class BenefitPayButton: PayButtonBaseView {
         preferences.javaScriptCanOpenWindowsAutomatically = true
         let configuration = WKWebViewConfiguration()
         configuration.defaultWebpagePreferences.preferredContentMode = .desktop
-        
+        configuration.setURLSchemeHandler(self, forURLScheme: "tapBenefitPayWebSDK");
+
         webView = WKWebView(frame: .zero, configuration: configuration)
         // Let us make sure it is of a clear background and opaque, not to interfer with the merchant's app background
         webView.isOpaque = false
@@ -160,7 +161,7 @@ internal class BenefitPayButton: PayButtonBaseView {
         
         // If this is the pay with benefitpayapp popup page, we need to go back to the benefitPay page and show the loader
         topMostVC.dismiss(animated: true) {
-            self.showGifLoader(show: true)
+            //self.showGifLoader(show: true)
             onDismiss()
         }
         return true
@@ -236,3 +237,27 @@ internal class BenefitPayButton: PayButtonBaseView {
         }
     }
 }
+
+
+extension BenefitPayButton:WKURLSchemeHandler {
+    func webView(_ webView: WKWebView, start urlSchemeTask: WKURLSchemeTask) {
+           print("Function: \(#function), line: \(#line)")
+           print("==> \(urlSchemeTask.request.url?.absoluteString ?? "")\n")
+
+       // You can find the url pattern by using urlSchemeTask.request.url. and create NSData from your local resource and send the data using 3 delegate method like done below.
+       // You can also call server api from this native code and return the data to the task.
+       // You can also cache the data coming from server and use it during offline access of this html.
+       // When you are returning html the the mime type should be 'text/html'. When you are trying to return Json data then we should change the mime type to 'application/json'.
+       // For returning json data you need to return NSHTTPURLResponse which has base classs of NSURLResponse with status code 200.
+
+       // Handle WKURLSchemeTask delegate methods
+          
+       }
+
+       func webView(_ webView: WKWebView, stop urlSchemeTask: WKURLSchemeTask) {
+           print("Function: \(#function), line: \(#line)")
+           print("==> \(urlSchemeTask.request.url?.absoluteString ?? "")\n")
+       }
+    
+    
+}
