Merge pull request #16 from DutchCodingCompany/feature/change_retries_to_tries

Change maxRetries to maxTries

Author: Guldem

lib/pin_lock.dart

@@ -48,14 +48,14 @@ class PinLock {
     required UserId userId,
     Duration? lockedOutDuration,
     Duration? lockAfterDuration,
-    int? maxRetries,
+    int? maxTries,
     int? pinLength,
   }) =>
       AuthenticatorImpl(
         repository,
         biometricAuthenticator,
         lockController,
-        maxRetries ?? 5,
+        maxTries ?? 5,
         lockedOutDuration ?? const Duration(minutes: 1),
         lockAfterDuration ?? const Duration(seconds: 5),
         pinLength ?? 4,

lib/src/entities/authenticator.dart

@@ -17,10 +17,10 @@ abstract class Authenticator with WidgetsBindingObserver {
 
   /// The number of times that a pin can be entered incorrectly, before the app
   /// stops accepting unlock attempts for [lockedOutDuration]
-  int get maxRetries;
+  int get maxTries;
 
   /// A duration for which the app will be locked after the number of times the pin is
-  /// entered incorrectly exceeds [maxRetries]
+  /// entered incorrectly exceeds [maxTries]
   Duration get lockedOutDuration;
 
   /// The expected lenght of the pin, used to draw the [PinInputWidget]

lib/src/entities/authenticator_impl.dart

@@ -10,7 +10,7 @@ class AuthenticatorImpl with WidgetsBindingObserver implements Authenticator {
   @override
   final Duration lockedOutDuration;
   @override
-  final int maxRetries;
+  final int maxTries;
   @override
   final int pinLength;
   @override
@@ -30,7 +30,7 @@ class AuthenticatorImpl with WidgetsBindingObserver implements Authenticator {
     this._repository,
     this._biometricAuth,
     this._lockController,
-    this.maxRetries,
+    this.maxTries,
     this.lockedOutDuration,
     this.lockAfterDuration,
     this.pinLength,
@@ -255,6 +255,9 @@ class AuthenticatorImpl with WidgetsBindingObserver implements Authenticator {
     final userPin = await _repository.getPin(forUser: userId);
     if (userPin?.value != pin.value) {
       await _repository.addFailedAttempt(DateTime.now(), forUser: userId);
+      if (await _isLockedDueToTooManyAttempts()) {
+        return const Left(LocalAuthFailure.tooManyAttempts);
+      }
       return const Left(LocalAuthFailure.wrongPin);
     }
     await _repository.resetFailedAttempts(ofUser: userId);
@@ -313,6 +316,9 @@ class AuthenticatorImpl with WidgetsBindingObserver implements Authenticator {
     final userPin = await _repository.getPin(forUser: userId);
     if (userPin?.value != pin.value) {
       await _repository.addFailedAttempt(DateTime.now(), forUser: userId);
+      if (await _isLockedDueToTooManyAttempts()) {
+        return false;
+      }
       return false;
     }
     await _repository.resetFailedAttempts(ofUser: userId);
@@ -328,7 +334,7 @@ class AuthenticatorImpl with WidgetsBindingObserver implements Authenticator {
 
   Future<bool> _isLockedDueToTooManyAttempts() async {
     final failedAttemptsList = await _repository.getListOfFailedAttempts(userId: userId);
-    if (failedAttemptsList.length > maxRetries) {
+    if (failedAttemptsList.length >= maxTries) {
       if (DateTime.now().difference(failedAttemptsList.last) < lockedOutDuration) {
         return true;
       }