fix: hide the spinner after closing brower authorization (#23)

* feat: register/unregister webhooks for tenants

add swtich for each unit to register/unrigister webhooks for tenants
remove APIClient

* chore: set ngrok id as a separate const

add @unknown default: to remove a warning

* fix: hide the spinner after closing brower authorization

rename butterflymxClientId to butterflymxClientIdTest and butterflymxSecret to butterflymxSecretTest to reflect actual environment

remove unnecessary BMXCoreDelegate in AppDelegate
remove didUpdate in LoginViewController

* fix: set authorizationWebViewDelegate

set LoginViewController as the authorizationWebViewDelegate of BMXCoreKit

ButterflyMX Demo/AppDelegate.swift

@@ -37,8 +37,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
  window!.rootViewController = loginViewController
  }
 
- BMXCoreKit.shared.delegate = self
-
  CallsService.shared.setupVoipPush()
  requestAccessMicCamera(callback: { status in
  print("User media permission status \(status.rawValue)")
@@ -82,13 +80,3 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
  // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
  }
 }
-
-extension AppDelegate: BMXCoreDelegate {
- func didUpdate(accessToken: String, refreshToken: String) {
- print(accessToken, refreshToken)
- }
-
- func logging(_ data: String) {
- print("BMXSDK Log: \(data)")
- }
-}

ButterflyMX Demo/Controllers/LoginViewController.swift

@@ -9,6 +9,8 @@
 import UIKit
 import BMXCore
 import SVProgressHUD
+import SafariServices
+
 class LoginViewController: UITableViewController {
 
  @IBOutlet weak var singInButton: UIButton!
@@ -62,6 +64,7 @@ class LoginViewController: UITableViewController {
  super.viewDidLoad()
  UserDefaults.standard.set("development", forKey: "environment")
  BMXCoreKit.shared.delegate = self
+ BMXCoreKit.shared.authorizationWebViewDelegate = self
  authProvider = getBMXAuthProvider(for: environmentType)
  SVProgressHUD.setDefaultStyle(.light)
  }
@@ -71,25 +74,29 @@ class LoginViewController: UITableViewController {
  var clientId = ""
  switch environment {
  case .development:
- secret = Bundle.main.object(forInfoDictionaryKey: "butterflymxSecret") as? String ?? "N/a"
- clientId = Bundle.main.object(forInfoDictionaryKey: "butterflymxClientId") as? String ?? "N/a"
+ secret = Bundle.main.object(forInfoDictionaryKey: "butterflymxSecretTest") as? String ?? "N/a"
+ clientId = Bundle.main.object(forInfoDictionaryKey: "butterflymxClientIdTest") as? String ?? "N/a"
  case .sandbox:
  secret = Bundle.main.object(forInfoDictionaryKey: "butterflymxSecretSandbox") as? String ?? "N/a"
  clientId = Bundle.main.object(forInfoDictionaryKey: "butterflymxClientIdSandbox") as? String ?? "N/a"
  case .production:
  secret = Bundle.main.object(forInfoDictionaryKey: "butterflymxSecretProd") as? String ?? "N/a"
  clientId = Bundle.main.object(forInfoDictionaryKey: "butterflymxClientIdProd") as? String ?? "N/a"
+ @unknown default:
+ fatalError()
  }
  return BMXAuthProvider(secret: secret, clientID: clientId)
  }
 }
 
-extension LoginViewController: BMXCoreDelegate {
- func didUpdate(accessToken: String, refreshToken: String) {
- print(accessToken, refreshToken)
- }
-
+extension LoginViewController: BMXCoreDelegate { 
  func logging(_ data: String) {
  print("BMXSDK Log: \(data)")
  }
 }
+
+extension LoginViewController: SFSafariViewControllerDelegate {
+ func safariViewControllerDidFinish(_ controller: SFSafariViewController) {
+ SVProgressHUD.dismiss()
+ }
+}

ButterflyMX Demo/Controllers/OpenDoorFeature/Cells/UnitTableViewCell.swift

@@ -46,10 +46,11 @@ class UnitTableViewCell: UITableViewCell {
  return
  }
 
- let webhookBaseUrl = "https://a98fb4c79b25.ngrok.io/webhook/"
- let webhookUrl = "\(webhookBaseUrl)?token=\(deviceToken)&platform=ios&type=voip"
-
+ let ngrokId = "6036eb46088a"
+ let webhookUrl = "http:https://\(ngrokId).ngrok.io/webhook/?token=\(deviceToken)&type=voip"
+  
  SVProgressHUD.show()
+
  BMXCoreKit.shared.registerWebhook(withTenantId: tenantModel.id, urlString: webhookUrl) { [weak self] result in
  switch result {
  case .success(let webhookId):

ButterflyMX Demo/Info.plist

@@ -70,9 +70,9 @@
  </array>
  <key>UIUserInterfaceStyle</key>
  <string>Light</string>
- <key>butterflymxClientId</key>
+ <key>butterflymxClientIdTest</key>
  <string></string>
- <key>butterflymxSecret</key>
+ <key>butterflymxSecretTest</key>
  <string></string>
  <key>butterflymxClientIdSandbox</key>
  <string></string>