Merge pull request #14 from minhdanh/dev

Various fixes and improvements

Author: Guldem

lib/src/entities/authenticator.dart

@@ -83,4 +83,7 @@ abstract class Authenticator with WidgetsBindingObserver {
   /// Make an attempt to unlock the app using provided [pin]. If the [pin] is correct,
   /// [lockState] will be changed and lock screen dismissed
   Future<Either<LocalAuthFailure, Unit>> unlockWithPin({required Pin pin});
+
+  /// Check if provided [pin] is correct.
+  Future<bool> isCorrectPin({required Pin pin});
 }

lib/src/entities/authenticator_impl.dart

@@ -70,10 +70,9 @@ class AuthenticatorImpl with WidgetsBindingObserver implements Authenticator {
         final lastActive = await _repository.getPausedTimestamp();
         if (lastActive != null) {
           final now = DateTime.now();
-          if (now.millisecondsSinceEpoch - lastActive.millisecondsSinceEpoch > lockAfterDuration.inMilliseconds) {
-            _lockController.lock(
-              availableMethods: await getAvailableBiometricMethods(),
-            );
+          if (now.millisecondsSinceEpoch - lastActive.millisecondsSinceEpoch >
+              lockAfterDuration.inMilliseconds) {
+            _lockWithBiometricMethods();
           }
         }
         break;
@@ -209,6 +208,12 @@ class AuthenticatorImpl with WidgetsBindingObserver implements Authenticator {
         case BiometricType.iris:
           methods.add(BiometricMethod.iris);
           break;
+        case BiometricType.weak:
+          methods.add(BiometricMethod.weak);
+          break;
+        case BiometricType.strong:
+          methods.add(BiometricMethod.strong);
+          break;
         default:
           break;
       }
@@ -295,6 +300,26 @@ class AuthenticatorImpl with WidgetsBindingObserver implements Authenticator {
     return const Left(LocalAuthFailure.unknown);
   }
 
+  @override
+  Future<bool> isCorrectPin({required Pin pin}) async {
+    final isEnabled = await isPinAuthenticationEnabled();
+    if (!isEnabled) {
+      return true;
+    }
+    if (await _isLockedDueToTooManyAttempts()) {
+      return false;
+    }
+
+    final userPin = await _repository.getPin(forUser: userId);
+    if (userPin?.value != pin.value) {
+      await _repository.addFailedAttempt(DateTime.now(), forUser: userId);
+      return false;
+    }
+    await _repository.resetFailedAttempts(ofUser: userId);
+    _repository.clearLastPausedTimestamp();
+    return true;
+  }
+
   /// -- Helpers --
 
   Future<bool> _supportsBiometricAuthentication() {
@@ -316,15 +341,21 @@ class AuthenticatorImpl with WidgetsBindingObserver implements Authenticator {
     if (!isEnabled) {
       _lockController.unlock();
     } else {
-      final biometric = await getBiometricAuthenticationAvailability();
-      if (biometric is Available) {
-        _lockController.lock(
-          availableMethods: biometric.isEnabled ? await getAvailableBiometricMethods() : const [],
-        );
-      }
-      if (biometric is Unavailable) {
-        _lockController.lock(availableMethods: const []);
-      }
+      _lockWithBiometricMethods();
+    }
+  }
+
+  Future<void> _lockWithBiometricMethods() async {
+    final biometric = await getBiometricAuthenticationAvailability();
+    if (biometric is Available) {
+      _lockController.lock(
+        availableMethods: biometric.isEnabled
+            ? await getAvailableBiometricMethods()
+            : const [],
+      );
+    }
+    if (biometric is Unavailable) {
+      _lockController.lock(availableMethods: const []);
     }
   }
 }

lib/src/entities/biometric_method.dart

@@ -1 +1 @@
-enum BiometricMethod { fingerprint, face, iris }
+enum BiometricMethod { fingerprint, face, iris, weak, strong }

lib/src/presentation/authenticator_widget.dart

@@ -70,15 +70,17 @@ class _AuthenticatorWidgetState extends State<AuthenticatorWidget> {
   late final StreamSubscription lockSubscription;
   OverlayEntry? overlayEntry;
   bool _isShowingSplashScreen = true;
+  late final Stream<LockState> lockState ;
 
   @override
   void initState() {
     super.initState();
+    lockState = widget.authenticator.lockState;
     PinLock.setHideAppContent(
       preference: widget.hideAppContent,
       iosAssetImage: widget.iosImageAsset,
     );
-    lockSubscription = widget.authenticator.lockState.listen((event) {
+    lockSubscription = lockState.listen((event) {
       if (event is Unlocked) {
         overlayEntry?.remove();
         overlayEntry = null;
@@ -122,7 +124,7 @@ class _AuthenticatorWidgetState extends State<AuthenticatorWidget> {
   @override
   Widget build(BuildContext context) {
     return StreamBuilder<LockState>(
-      stream: widget.authenticator.lockState,
+      stream: lockState,
       builder: (context, snapshot) {
         if (snapshot.hasData && !_isShowingSplashScreen) {
           return widget.child;