Merge pull request #101 from verloop/dev_master

Dev master

Author: raghav39

VerloopSDK/VLConfig.swift

@@ -43,6 +43,7 @@ public typealias LiveChatUrlClickListener = (_ url : String?)  -> Void
         case openWidget
         case openMenuWidget
         case closeWidget
+        case logout
         case close
         case widgetColor
         case showDownloadButton

VerloopSDK/VLWebViewManager.swift

@@ -34,6 +34,14 @@ class VLWebViewManager: NSObject,WKUIDelegate, WKNavigationDelegate {
     var _eventDelegate:VLEventDelegate?
     private var configParams:[VLConfig.APIMethods] = []
     var onMessageReceived:(() -> Void)?
+
+    func getRoomReadyConfigurations() -> [VLConfig.APIMethods] {
+        return roomReadyConfigurations
+    }
+
+    func setRoomReadyConfigurations(_ configs: [VLConfig.APIMethods]) {
+        roomReadyConfigurations = configs
+    }
 
     init(config: VLConfig) {
 
@@ -163,6 +171,14 @@ class VLWebViewManager: NSObject,WKUIDelegate, WKNavigationDelegate {
     }
 
     func logoutSession() {
+        // If webview not ready, queue logout to execute when room is ready
+        if !isRoomReady {
+            if !roomReadyConfigurations.contains(.logout) {
+                roomReadyConfigurations.append(.logout)
+            }
+            return
+        }
+
         webView.evaluateJavaScript(String.getLogoutEvaluationJS()) {[weak self] _, error in
             print("logout error \(error?.localizedDescription ?? "NA")")
             if error == nil {// when user is logged out, clear the local cookies
@@ -303,6 +319,15 @@ extension VLWebViewManager {
             case .close :
                 webView.evaluateJavaScript(String.getCloseEvaluateJS()) { _, error in
                     print("getCloseEvaluateJS error \(error?.localizedDescription ?? "NA")")
+                    self.loadWebView()
+                }
+            case .logout:
+                webView.evaluateJavaScript(String.getLogoutEvaluationJS()) {[weak self] _, error in
+                    print("processRoomReadyConfigurations logout error \(error?.localizedDescription ?? "NA")")
+                    if error == nil {
+                        self?.clearLocalStorageVistorToken()
+                        self?.loadWebView()
+                    }
                 }
             case .closeWidget:
                 webView.evaluateJavaScript(String.getWidgetClosedEvaluationJS()) {[weak self] _, error in
@@ -496,6 +521,7 @@ extension VLWebViewManager:ScriptMessageDelegate {
                 case .FunctionCloseComplete:
                     clearLocalStorageVistorToken()
                     self.didReceiveCallbackEventsOnLivechat(message: bodyString, data: bodyData)
+                    self.loadWebView()
                 case .FunctionChatMinimized:
                     _eventDelegate?.onChatMinimized?()
                     //                            _eventDelegate?.didEventOccurOnLiveChat(.onChatMinimized)
@@ -548,6 +574,7 @@ extension VLWebViewManager:ScriptMessageDelegate {
                     _eventDelegate?.onChatStarted?()
                 case FunctionType.FunctionLogOutCompleted.rawValue:
                     _eventDelegate?.onLogoutComplete?()
+                    self.loadWebView()
                 default:break
                 }
             }

VerloopSDK/VerloopSDK.swift

@@ -57,10 +57,42 @@ import Foundation
             }
         }
     }
+
+    @objc private func recreateWebView() {
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+
+            // extract old configurations and delegates
+            let oldManager = self.manager
+            let queued = oldManager?.getRoomReadyConfigurations() ?? []
+            let eventDelegate = oldManager?._eventDelegate
+
+            // kill old webview
+            oldManager?.webView = nil
+
+            // create new webview
+            self.manager = VLWebViewManager(config: self.config)
+            self.manager.jsDelegate(delegate: self)
+            self.manager.setRoomReadyConfigurations(queued)
+            if let ed = eventDelegate {
+                self.manager.addEventChangeDelegate(ed)
+            }
+
+            // If controller already exists, attach the new webview into its view
+            if let controller = self.verloopController {
+                controller.setWebView(webView: self.manager)
+                controller.setSDK(verloopSDK: self)
+            }
+        }
+    }
 
     @objc public func close() {
         self.manager.close()
     }
+
+    @objc public func closeChat() {
+        self.manager.close()
+    }
 
     @objc public func observeLiveChatEventsOn(vlEventDelegate delegate:VLEventDelegate) {
         if manager != nil {
@@ -87,8 +119,10 @@ import Foundation
 
     @objc public func logout() {
         manager.logoutSession()
-        clearConfig()
+        config.clear()
         config.clearUserDetails()
+        self.clearLocalStorage()
+        self.recreateWebView()
     }
 
     @objc public func clearConfig(){

VerloopSDKiOS.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
   #
 
   spec.name         = "VerloopSDKiOS"
-  spec.version      = "0.2.18"
+  spec.version      = "0.2.19"
   spec.summary      = "VerloopSDKiOS - client side iOS livechat"
 
   # This description is used to generate tags and improve search results.