Error handling and removed debug print.

Author: jensutbult

Authenticator/Model/TokenRequestViewModel.swift

@@ -182,39 +182,29 @@ class TokenRequestViewModel: NSObject {
 extension TokenRequestViewModel {
 
     func isYubiOTPEnabledOverUSBC(completion: @escaping (Bool) -> Void) {
-        print(#function)
         connection.smartCardConnection { connection in
-            print("got \(connection)")
             connection?.managementSession { session, error in
-                print("got \(session)")
-                guard let session else { return }
+                guard let session else { completion(false); return }
                 session.getDeviceInfo { deviceInfo, error in
-                    print("got \(deviceInfo)")
-                    guard let deviceInfo, let configuration = deviceInfo.configuration else { return }
-                    guard !configuration.isEnabled(.OTP, overTransport: .USB) || SettingsConfig.isOTPOverUSBIgnored(deviceId: deviceInfo.serialNumber + 1) else {
-                        print("yubiotp enabled")
+                    guard let deviceInfo, let configuration = deviceInfo.configuration else { completion(false); return }
+                    guard !configuration.isEnabled(.OTP, overTransport: .USB) || SettingsConfig.isOTPOverUSBIgnored(deviceId: deviceInfo.serialNumber) else {
                         completion(true)
                         return
                     }
-                    print("yubiotp disabled")
                     completion(false)
                 }
             }
         }
     }
 
     func disableOTP(completion: @escaping (Error?) -> Void) {
-        print(#function)
         connection.smartCardConnection { connection in
             connection?.managementSession { session, error in
-                print(session)
-                guard let session else { return }
+                guard let session else { completion(error); return }
                 session.getDeviceInfo { deviceInfo, error in
-                    print(deviceInfo)
-                    guard let deviceInfo, let configuration = deviceInfo.configuration else { return }
+                    guard let deviceInfo, let configuration = deviceInfo.configuration else { completion(error); return }
                     configuration.setEnabled(false, application: .OTP, overTransport: .USB)
                     session.write(configuration, reboot: true) { error in
-                        print(error)
                         completion(error)
                     }
                 }
@@ -223,30 +213,23 @@ extension TokenRequestViewModel {
     }
 
     func waitForKeyRemoval(completion: @escaping () -> Void) {
-        print(#function)
         connection.didDisconnect { _, _ in
-            print("")
             completion()
         }
     }
 
-    func ignoreThisKey(handler: @escaping (Error?) -> Void) {
-        print(#function)
+    func ignoreThisKey(completion: @escaping (Error?) -> Void) {
         connection.smartCardConnection { connection in
-            print(connection)
             connection?.managementSession { session, error in
-                print(session)
-                guard let session else { handler(error); return }
+                guard let session else { completion(error); return }
                 session.getDeviceInfo { deviceInfo, error in
-                    print(deviceInfo)
-                    guard let deviceInfo else { handler(error); return }
+                    guard let deviceInfo else { completion(error); return }
                     SettingsConfig.registerUSBCDeviceToIgnore(deviceId: deviceInfo.serialNumber)
-                    handler(nil)
+                    completion(nil)
                 }
             }
         }
     }
-
 }
 
 @available(iOS 14.0, *)

Authenticator/UI/TokenSession/TokenRequestYubiOTPViewController.swift

@@ -18,9 +18,12 @@ class TokenRequestYubiOTPViewController: UIViewController {
 
     @IBAction func disableOTP() {
         viewModel?.disableOTP { error in
-            guard error == nil else { return }
-            UIView.animate(withDuration: 0.5) {
-                DispatchQueue.main.async {
+            guard error == nil else {
+                self.presentError(error)
+                return
+            }
+            DispatchQueue.main.async {
+                UIView.animate(withDuration: 0.5) {
                     self.optionsView.alpha = 0
                     self.completedView.alpha = 1
                     self.viewModel?.waitForKeyRemoval {
@@ -33,10 +36,19 @@ class TokenRequestYubiOTPViewController: UIViewController {
 
     @IBAction func ignoreThisKey() {
         viewModel?.ignoreThisKey { error in
-            guard error == nil else { return }
+            guard error == nil else {
+                self.presentError(error)
+                return
+            }
             DispatchQueue.main.async {
                 self.dismiss(animated: true)
             }
         }
     }
+    
+    private func presentError(_ error: Error?) {
+        guard let error else { return }
+        let alert = UIAlertController(title: "Error reading YubiKey", message: "\(error.localizedDescription)\n\nRemove and reinsert your YubiKey.") { self.dismiss(animated: true) }
+        self.present(alert, animated: true, completion: nil)
+    }
 }