Merge pull request #23 from AdaSupport/SUP-377-error-callback

SUP-377: Error Callback with Example

Author: michaellazz

AdaEmbedFramework.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
 
   spec.name         = "AdaEmbedFramework"
-  spec.version      = "1.3.4"
+  spec.version      = "1.3.5"
   spec.summary      = "Embed the Ada Support SDK in your app."
   spec.description  = "Use the Ada Support SDK to inject the Ada support experience into your app. Visit https://ada.support to learn more."
   spec.homepage     = "https://github.com/AdaSupport/ios-sdk"

EmbedFramework/AdaWebHost.swift

@@ -12,11 +12,18 @@ import SafariServices
 
 public class AdaWebHost: NSObject {
 
+    public enum AdaWebHostError: Error {
+        case WebViewFailedToLoad
+        case WebViewTimeout
+    }
+    
+    private var hasError = false
     public var handle = ""
     public var cluster = ""
     public var language = ""
     public var styles = ""
     public var greeting = ""
+    public var webViewTimeout = 30.0
 
     /// Metafields can be passed in during init; use `setMetaFields()`
     /// to send values in at runtime
@@ -25,6 +32,8 @@ public class AdaWebHost: NSObject {
     public var openWebLinksInSafari = false
     public var appScheme = ""
 
+    
+    public var webViewLoadingErrorCallback: ((Error) -> Void)? = nil
     public var zdChatterAuthCallback: (((@escaping (_ token: String) -> Void)) -> Void)?
     public var eventCallbacks: [String: (_ event: [String: Any]) -> Void]?
 
@@ -65,7 +74,9 @@ public class AdaWebHost: NSObject {
         openWebLinksInSafari: Bool = false,
         appScheme: String = "",
         zdChatterAuthCallback: (((@escaping (_ token: String) -> Void)) -> Void)? = nil,
-        eventCallbacks: [String: (_ event: [String: Any]) -> Void]? = nil
+        webViewLoadingErrorCallback: ((Error) -> Void)? = nil,
+        eventCallbacks: [String: (_ event: [String: Any]) -> Void]? = nil,
+        webViewTimeout: Double = 30.0
     ) {
         self.handle = handle
         self.cluster = cluster
@@ -76,7 +87,10 @@ public class AdaWebHost: NSObject {
         self.openWebLinksInSafari = openWebLinksInSafari
         self.appScheme = appScheme
         self.zdChatterAuthCallback = zdChatterAuthCallback
+        self.webViewLoadingErrorCallback = webViewLoadingErrorCallback
         self.eventCallbacks = eventCallbacks
+        self.webViewTimeout = webViewTimeout
+        self.hasError = false
 
         self.reachability = Reachability()!
         super.init()
@@ -201,17 +215,30 @@ extension AdaWebHost {
         webView.uiDelegate = self
 
         guard let remoteURL = URL(string: "https://\(handle).\(clusterString)ada.support/mobile-sdk-webview/") else { return }
-        let webRequest = URLRequest(url: remoteURL, cachePolicy: .useProtocolCachePolicy, timeoutInterval: 30)
+        let webRequest = URLRequest(url: remoteURL, cachePolicy: .useProtocolCachePolicy, timeoutInterval: webViewTimeout)
         webView.load(webRequest)
-        
-        // Bind handlers for JS messages
+
         userContentController.add(self, name: "embedReady")
         userContentController.add(self, name: "eventCallbackHandler")
         userContentController.add(self, name: "zdChatterAuthCallbackHandler")
+        
+        DispatchQueue.main.asyncAfter(deadline: .now() + webViewTimeout) {
+            if(!self.hasError && webView.isLoading){
+                webView.stopLoading();
+                self.webViewLoadingErrorCallback?(AdaWebHostError.WebViewTimeout)
+            }
+        }
+
+        
     }
 }
 
 extension AdaWebHost: WKNavigationDelegate, WKUIDelegate {
+    public func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
+            /// Whena  reset method is built - we will need to set this back to false
+            self.hasError = true
+            self.webViewLoadingErrorCallback?(AdaWebHostError.WebViewFailedToLoad)
+    }
     public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Swift.Void) {
         let httpSchemes = ["http", "https"]
 

EmbedFramework/AdaWebHostViewController.swift

@@ -10,7 +10,6 @@ import UIKit
 import WebKit
 
 class AdaWebHostViewController: UIViewController {
-    
     static func createWebController(with webView: WKWebView) -> AdaWebHostViewController {
         let bundle = Bundle(for: AdaWebHostViewController.self)
         let storyboard = UIStoryboard(name: "AdaWebHostViewController", bundle: bundle)

ExampleApp/ViewController.swift

@@ -10,12 +10,20 @@ import UIKit
 import AdaEmbedFramework
 
 class ViewController: UIViewController {
-    
-    lazy var adaFramework = AdaWebHost(handle: "nic", appScheme: "adaexampleapp")
+    lazy var adaFramework = AdaWebHost(handle: "nic", appScheme: "adaexampleapp", webViewLoadingErrorCallback: LoadingErrorCallback, webViewTimeout: 30.0)
 
     @IBOutlet var firstNameField: UITextField!
     @IBOutlet var lastNameField: UITextField!
     @IBOutlet var emailField: UITextField!
+    
+    
+    //Example error callback
+    func LoadingErrorCallback(error: Error){
+        // Handle any error logic here
+        view.window?.rootViewController?.dismiss(animated: true, completion: nil)
+        navigationController?.popToRootViewController(animated: true);
+        print(error)
+    }
 
     @IBAction func submitForm(_ sender: UIButton) {
         guard