Fixes async functions

vasilenkoigor · Dec 3, 2016 · 436fb73 · 436fb73
1 parent cd5005e
commit 436fb73
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 37 deletions.
diff --git a/...h.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate b/...h.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Example/BiometricAuthExample/BiometricAuthExample.xcodeproj/project.pbxproj b/Example/BiometricAuthExample/BiometricAuthExample.xcodeproj/project.pbxproj
@@ -380,6 +380,7 @@
 				040536341DF01AD400F189BA /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

diff --git a/...e.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate b/...e.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...tricAuthExample.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...tricAuthExample.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "2.0">
+</Bucket>
diff --git a/Example/BiometricAuthExample/BiometricAuthExample/ViewController.swift b/Example/BiometricAuthExample/BiometricAuthExample/ViewController.swift
@@ -25,18 +25,11 @@ class ViewController: UIViewController {
             print("Something went wrong")
         }
 
-        var success = false
-        do {
-            success = try self.biometricAuth.requestAuthentication(forFeature: feature, reason: "For authentication")
-        } catch let error as BiometricAuthError {
-            print(error.localizedDescription)
-        } catch {
-            print("Something went wrong")
-        }
-
-        if success {
-            print("Success biometric authentication")
-        }
+        self.biometricAuth.requestAuthentication(forFeature: feature, reason: "Reason", completion: { (result, error) in
+            if result {
+                print("Success")
+            }
+        })
     }
 }
 
diff --git a/Sources/BiometricAuth.swift b/Sources/BiometricAuth.swift
@@ -38,6 +38,8 @@ public enum BiometricAuthError : Error {
     case domainStateChanged
 }
 
+public typealias BiometricAuthCompletion = (Bool, Error?) -> Void
+
 @available(iOSApplicationExtension 9.0, *)
 @available(OSXApplicationExtension 10.12, *)
 public class BiometricAuth {
@@ -89,47 +91,59 @@ public class BiometricAuth {
         return true
     }
 
-    public func disableAuthentication(forFeature feature: String, reason: String) throws -> Bool {
+    public func disableAuthentication(forFeature feature: String, reason: String, completion: @escaping BiometricAuthCompletion) {
 
-        guard try self.isAvailable() else {
-            return false
-        }
+        self.isAvailable(withCompletion: completion)
 
-        if try self.evaluateAuthentication(withReason: reason) {
-            self.save(feature: feature, enable: false)
-            return true
-        } else {
-            return false
-        }
+        self.evaluateAuthentication(withReason: reason, completion: {(result, error) -> Void in
+            if let error = error {
+                completion(false, error)
+            } else {
+                if result {
+                    self.save(feature: feature, enable: false)
+                    completion(true, nil)
+                } else {
+                    completion(false, nil)
+                }
+            }
+        })
     }
 
-    public func requestAuthentication(forFeature feature: String, reason: String) throws -> Bool {
+    public func requestAuthentication(forFeature feature: String, reason: String, completion: BiometricAuthCompletion!) {
 
-        guard try self.isAvailable() else {
-            return false
-        }
+        self.isAvailable(withCompletion: completion)
 
         if (self.isAuthenticationAvailable(forFeature: feature)) {
-            return try self.evaluateAuthentication(withReason: reason)
+            self.evaluateAuthentication(withReason: reason, completion: completion)
         } else {
-            return false
+            completion(false, nil)
         }
     }
 
-    fileprivate func evaluateAuthentication(withReason reason: String) throws -> Bool {
+    fileprivate func evaluateAuthentication(withReason reason: String, completion: BiometricAuthCompletion!) {
 
-        var success : Bool = false
-        var evaluateError : Error?
         self.authenticationContext.evaluatePolicy(LAPolicy.deviceOwnerAuthenticationWithBiometrics,
                                                   localizedReason: reason,
                                                   reply: { (result, error) in
-                                                    success = result
-                                                    evaluateError = error })
-        if let evaluateError = evaluateError {
-            throw BiometricAuthError.evaluateAuthenticationError(evaluateError.localizedDescription)
-        }
+                                                    if let error = error {
+                                                        completion(false, BiometricAuthError.evaluateAuthenticationError(error.localizedDescription))
+                                                    } else {
+                                                        completion(result, nil)
+                                                    }
+        })
+    }
+
+    fileprivate func isAvailable(withCompletion completion: BiometricAuthCompletion) {
 
-        return success
+        do {
+            if try !self.isAvailable() {
+                completion(false, nil)
+            }
+        } catch let error as BiometricAuthError {
+            completion(false, error)
+        } catch {
+            completion(false, BiometricAuthError.authenticationNotAvailable("Something went wrong"))
+        }
     }
 
     // MARK: Storage