fix(auth): fix loading when non authenticated

fix(FAB): fix icon loading
fix(webview): fix loading indicator

Author: HHK1

WeLoop/Classes/Extensions/UIImage+base64.swift

@@ -17,7 +17,7 @@ extension UIImage {
     }
 
     static func weLoopIcon() -> UIImage?  {
-        let bundle = Bundle(for: WeLoop.self)
+        let bundle = Bundle.weLoop
         return UIImage(named: "WeLoopIcon", in: bundle, compatibleWith: nil)
     }
 }

WeLoop/Classes/WeLoopButton.swift

@@ -87,7 +87,8 @@ class WeLoopButton: UIButton {
     func configureButton(settings: Settings) {
         guard let urlString = settings.iconUrl, let url = URL(string: urlString) else {
             color = settings.primaryColor
-            setImage(UIImage.weLoopIcon(), for: .normal)
+            let icon = UIImage.weLoopIcon()
+            setImage(icon, for: .normal)
             return
         }
 

WeLoop/Classes/WeLoopError.swift

@@ -9,28 +9,19 @@ import Foundation
 
 @objc public enum WeLoopError: Int, Error {
     case missingAPIKey
-    case missingUserIdentification
     case configurationDataMissing
-    case notificationDataMissing
     case windowMissing
-    case authenticationInProgress
 }
 
 extension WeLoopError: CustomStringConvertible {
     public var description: String {
         switch self {
         case .missingAPIKey:
             return "API key is missing. Make sure to call the `initialize` function first"
-        case .missingUserIdentification:
-            return "User info is missing. Make sure to call the `identifyUser` function first"
-        case .notificationDataMissing:
-            return "We could not parse the response of the notification refresh call because the data is missing"
         case .configurationDataMissing:
             return "We could not parse the response of the configuration call because the data is missing"
         case .windowMissing:
             return "Failed to acquire a ref to the window"
-        case .authenticationInProgress:
-            return "Authentication is still in progress"
         }
     }
 }

WeLoop/Classes/WeLoopViewController.swift

@@ -14,6 +14,7 @@ enum WeLoopWebAction: String, CaseIterable {
     case getCapture = "WeloopGetCapture"
     case getCurrentUser = "GetCurrentUser"
     case setNotificationCount = "SetNotificationCount"
+    case isLoaded = "IsLoaded"
 }
 
 class WeLoopViewController: UIViewController {
@@ -113,8 +114,12 @@ class WeLoopViewController: UIViewController {
     }
 
     func sendCurrentUser() {
-        guard let uuid = WeLoop.shared.apiKey, let token = WeLoop.shared.authenticationToken else { return }
-        webView?.evaluateJavaScript("GetCurrentUser({ appGuid: '\(uuid)', token: '\(token)'})")
+        guard let uuid = WeLoop.shared.apiKey else { return }
+        if let token = WeLoop.shared.authenticationToken {
+            webView?.evaluateJavaScript("GetCurrentUser({ appGuid: '\(uuid)', token: '\(token)'})")
+        } else {
+            webView?.evaluateJavaScript("GetCurrentUser({ appGuid: '\(uuid)'})")
+        }
     }
 }
 
@@ -131,6 +136,9 @@ extension WeLoopViewController: WKScriptMessageHandler {
         case .setNotificationCount:
             guard let body = message.body as? [String: Any], let count = body["number"] as? Int else { return }
             WeLoop.shared.setNotificationBadge(count: count)
+        case .isLoaded:
+            indicator.stopAnimating()
+            webView.backgroundColor = .clear
         }
     }
 }
@@ -152,11 +160,4 @@ extension WeLoopViewController: WKNavigationDelegate {
             }
         }
     }
-    
-    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-       indicator.stopAnimating()
-        //TODO: commented out for now, but at this point the load is finished (files have been loaded) and the spa should render
-        // a loader. This is not done immediately so there is a little lag, but I can't do anything more on the native side.
-        //webView.backgroundColor = .clear
-    }
 }