Support FaceID

PasscodeLock/PasscodeLock/ChangePasscodeState.swift

@@ -13,7 +13,7 @@ struct ChangePasscodeState: PasscodeLockStateType {
     let title: String
     let description: String
     let isCancellableAction = true
-    var isTouchIDAllowed = false
+    var isBiometricAuthAllowed: Bool = false
 
     init() {
 

PasscodeLock/PasscodeLock/ConfirmPasscodeState.swift

@@ -13,7 +13,7 @@ struct ConfirmPasscodeState: PasscodeLockStateType {
     let title: String
     let description: String
     let isCancellableAction = true
-    var isTouchIDAllowed = false
+    var isBiometricAuthAllowed: Bool = false
 
     fileprivate var passcodeToConfirm: [String]
 

PasscodeLock/PasscodeLock/EnterPasscodeState.swift

@@ -15,7 +15,7 @@ struct EnterPasscodeState: PasscodeLockStateType {
     let title: String
     let description: String
     let isCancellableAction: Bool
-    var isTouchIDAllowed = true
+    var isBiometricAuthAllowed = true
 
     static let incorrectPasscodeAttemptsKey = "incorrectPasscodeAttempts"
     static var incorrectPasscodeAttempts: Int {

PasscodeLock/PasscodeLock/PasscodeLock.swift

@@ -22,8 +22,8 @@ open class PasscodeLock: PasscodeLockType {
         return lockState
     }
 
-    open var isTouchIDAllowed: Bool {
-        return isTouchIDEnabled() && configuration.isTouchIDAllowed && lockState.isTouchIDAllowed
+    open var isBiometricAuthAllowed: Bool {
+        return isBiometricAuthEnabled() && configuration.isBiometricAuthAllowed && lockState.isBiometricAuthAllowed
     }
 
     fileprivate var lockState: PasscodeLockStateType
@@ -67,26 +67,37 @@ open class PasscodeLock: PasscodeLockType {
 
     open func authenticateWithBiometrics() {
 
-        guard isTouchIDAllowed else { return }
+        guard isBiometricAuthAllowed else { return }
 
         let context = LAContext()
         let reason: String
-        if let configReason = configuration.touchIdReason {
+        if let configReason = configuration.biometricAuthReason {
             reason = configReason
         } else {
-            reason = localizedStringFor("PasscodeLockTouchIDReason", comment: "TouchID authentication reason")
+            if #available(iOS 11, *) {
+                switch(context.biometryType) {
+                case .touchID:
+                    reason = localizedStringFor("PasscodeLockTouchIDReason", comment: "Authentication required to proceed")
+                case .faceID:
+                    reason = localizedStringFor("PasscodeLockFaceIDReason", comment: "Authentication required to proceed")
+                default:
+                    reason = localizedStringFor("PasscodeLockBiometricAuthReason", comment: "Authentication required to proceed")
+                }
+            } else {
+                reason = localizedStringFor("PasscodeLockBiometricAuthReason", comment: "Authentication required to proceed")
+            }
         }
 
-        context.localizedFallbackTitle = localizedStringFor("PasscodeLockTouchIDButton", comment: "TouchID authentication fallback button")
+        context.localizedFallbackTitle = localizedStringFor("PasscodeLockBiometricAuthButton", comment: "Biometric authentication fallback button")
 
         context.evaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, localizedReason: reason) {
             success, error in
 
-            self.handleTouchIDResult(success)
+            self.handleBiometricAuthResult(success)
         }
     }
 
-    fileprivate func handleTouchIDResult(_ success: Bool) {
+    fileprivate func handleBiometricAuthResult(_ success: Bool) {
 
         DispatchQueue.main.async {
 
@@ -97,7 +108,7 @@ open class PasscodeLock: PasscodeLockType {
         }
     }
 
-    fileprivate func isTouchIDEnabled() -> Bool {
+    fileprivate func isBiometricAuthEnabled() -> Bool {
 
         let context = LAContext()
 

PasscodeLock/PasscodeLock/SetPasscodeState.swift

@@ -13,7 +13,7 @@ struct SetPasscodeState: PasscodeLockStateType {
     let title: String
     let description: String
     let isCancellableAction = true
-    var isTouchIDAllowed = false
+    var isBiometricAuthAllowed: Bool = false
 
     init(title: String, description: String) {
 

PasscodeLock/PasscodeLockViewController.swift

@@ -32,14 +32,14 @@ open class PasscodeLockViewController: UIViewController, PasscodeLockTypeDelegat
     @IBOutlet open var placeholders: [PasscodeSignPlaceholderView] = [PasscodeSignPlaceholderView]()
     @IBOutlet open weak var cancelButton: UIButton?
     @IBOutlet open weak var deleteSignButton: UIButton?
-    @IBOutlet open weak var touchIDButton: UIButton?
+    @IBOutlet open weak var biometricAuthButton: UIButton!
     @IBOutlet open weak var placeholdersX: NSLayoutConstraint?
 
     open var successCallback: ((_ lock: PasscodeLockType) -> Void)?
     open var dismissCompletionCallback: (()->Void)?
     open var animateOnDismiss: Bool
     open var notificationCenter: NotificationCenter?
-    
+
     internal let passcodeConfiguration: PasscodeLockConfigurationType
     internal var passcodeLock: PasscodeLockType
     internal var isPlaceholdersAnimationCompleted = true
@@ -48,7 +48,7 @@ open class PasscodeLockViewController: UIViewController, PasscodeLockTypeDelegat
 
     // MARK: - Initializers
 
-	public init(state: PasscodeLockStateType, configuration: PasscodeLockConfigurationType, animateOnDismiss: Bool = true, nibName: String = "PasscodeLockView", bundle: Bundle? = nil) {
+    public init(state: PasscodeLockStateType, configuration: PasscodeLockConfigurationType, animateOnDismiss: Bool = true, nibName: String = "PasscodeLockView", bundle: Bundle? = nil) {
 
         self.animateOnDismiss = animateOnDismiss
 
@@ -96,7 +96,7 @@ open class PasscodeLockViewController: UIViewController, PasscodeLockTypeDelegat
     open override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
-        if shouldTryToAuthenticateWithBiometrics && passcodeConfiguration.shouldRequestTouchIDImmediately {
+        if shouldTryToAuthenticateWithBiometrics && passcodeConfiguration.shouldRequestBiometricAuthImmediately {
 
             authenticateWithBiometrics()
         }
@@ -107,7 +107,7 @@ open class PasscodeLockViewController: UIViewController, PasscodeLockTypeDelegat
         titleLabel?.text = passcodeLock.state.title
         descriptionLabel?.text = passcodeLock.state.description
         cancelButton?.isHidden = !passcodeLock.state.isCancellableAction
-        touchIDButton?.isHidden = !passcodeLock.isTouchIDAllowed
+        biometricAuthButton?.isHidden = !passcodeLock.isBiometricAuthAllowed
     }
 
     // MARK: - Events
@@ -126,7 +126,7 @@ open class PasscodeLockViewController: UIViewController, PasscodeLockTypeDelegat
 
     @objc open func appWillEnterForegroundHandler(_ notification: Notification) {
 
-        if passcodeConfiguration.shouldRequestTouchIDImmediately {
+        if passcodeConfiguration.shouldRequestBiometricAuthImmediately {
             authenticateWithBiometrics()
         }
     }
@@ -155,7 +155,7 @@ open class PasscodeLockViewController: UIViewController, PasscodeLockTypeDelegat
         passcodeLock.removeSign()
     }
 
-    @IBAction func touchIDButtonTap(_ sender: UIButton) {
+    @IBAction func biometricAuthButtonTap(_ sender: UIButton) {
 
         passcodeLock.authenticateWithBiometrics()
     }
@@ -164,7 +164,7 @@ open class PasscodeLockViewController: UIViewController, PasscodeLockTypeDelegat
 
         guard passcodeConfiguration.repository.hasPasscode else { return }
 
-        if passcodeLock.isTouchIDAllowed {
+        if passcodeLock.isBiometricAuthAllowed {
 
             passcodeLock.authenticateWithBiometrics()
         }

PasscodeLock/Protocols/PasscodeLockConfigurationType.swift

@@ -12,9 +12,9 @@ public protocol PasscodeLockConfigurationType {
 
     var repository: PasscodeRepositoryType {get}
     var passcodeLength: Int {get}
-    var isTouchIDAllowed: Bool {get set}
-    var shouldRequestTouchIDImmediately: Bool {get}
-    var touchIdReason: String? {get set}
+    var isBiometricAuthAllowed: Bool {get set}
+    var shouldRequestBiometricAuthImmediately: Bool {get}
+    var biometricAuthReason: String? {get set}
     var maximumInccorectPasscodeAttempts: Int {get}
 }
 

PasscodeLock/Protocols/PasscodeLockStateType.swift

@@ -13,7 +13,7 @@ public protocol PasscodeLockStateType {
     var title: String {get}
     var description: String {get}
     var isCancellableAction: Bool {get}
-    var isTouchIDAllowed: Bool {get}
+    var isBiometricAuthAllowed: Bool {get}
 
     mutating func acceptPasscode(_ passcode: [String], fromLock lock: PasscodeLockType)
 }

PasscodeLock/Protocols/PasscodeLockType.swift

@@ -14,7 +14,7 @@ public protocol PasscodeLockType {
     var configuration: PasscodeLockConfigurationType {get}
     var repository: PasscodeRepositoryType {get}
     var state: PasscodeLockStateType {get}
-    var isTouchIDAllowed: Bool {get}
+    var isBiometricAuthAllowed: Bool {get}
 
     func addSign(_ sign: String)
     func removeSign()