Various bug fixes and new features for Android and iOS

android/src/main/kotlin/design/codeux/biometric_storage/BiometricStoragePlugin.kt

@@ -208,16 +208,9 @@ class BiometricStoragePlugin : FlutterPlugin, ActivityAware, MethodCallHandler {
                 "canAuthenticate" -> result.success(canAuthenticate().name)
                 "init" -> {
                     val name = getName()
-                    if (storageFiles.containsKey(name)) {
-                        if (call.argument<Boolean>("forceInit") == true) {
-                            throw MethodCallException(
-                                "AlreadyInitialized",
-                                "A storage file with the name '$name' was already initialized."
-                            )
-                        } else {
-                            result.success(false)
-                            return
-                        }
+                    if (storageFiles.containsKey(name) && call.argument<Boolean>("forceInit") != true) {
+                        result.success(false)
+                        return
                     }
 
                     val options = call.argument<Map<String, Any>>("options")?.let { it ->

macos/Classes/BiometricStorageImpl.swift

@@ -42,6 +42,7 @@ class BiometricStorageImpl {
   }
 
   private lazy var context: LAContext = LAContext()
+  private var contextFirstAuthenticatedAt: Date?
   private var stores: [String: InitOptions] = [:]
   private let storageError: StorageError
   private let storageMethodNotImplemented: Any
@@ -56,6 +57,23 @@ class BiometricStorageImpl {
             kSecAttrAccount as String: name]
   }
 
+  private func currentContext(name: String) -> LAContext {
+    guard let initOptions = stores[name] else {
+      hpdebug("Store not initialised; creating new context.")
+      context = LAContext()
+      contextFirstAuthenticatedAt = nil
+      return context
+    }
+
+    if (initOptions.authenticationValidityDurationSeconds <= 0 || 
+        contextFirstAuthenticatedAt == nil || 
+        contextFirstAuthenticatedAt! < Date(timeIntervalSinceNow: Double(-initOptions.authenticationValidityDurationSeconds))) {
+      context = LAContext()
+      contextFirstAuthenticatedAt = nil
+    }
+    return context;
+  }
+
   public func handle(_ call: StorageMethodCall, result: @escaping StorageCallback) {
 
     func requiredArg<T>(_ name: String, _ cb: (T) -> Void) {
@@ -114,6 +132,7 @@ class BiometricStorageImpl {
 
   private func read(_ name: String, _ result: @escaping StorageCallback, _ promptInfo: IOSPromptInfo) {
 
+    let context = currentContext(name:name)
     var query = baseQuery(name: name)
     query[kSecMatchLimit as String] = kSecMatchLimitOne
     query[kSecUseOperationPrompt as String] = promptInfo.accessTitle
@@ -139,6 +158,9 @@ class BiometricStorageImpl {
         result(storageError(code: "RetrieveError", message: "Unexpected data.", details: nil))
         return
     }
+    if (contextFirstAuthenticatedAt == nil) {
+      contextFirstAuthenticatedAt = Date()
+    }
     result(dataString)
   }
 
@@ -166,6 +188,7 @@ class BiometricStorageImpl {
     }
 
     var query = baseQuery(name: name)
+    let context = currentContext(name:name)
 
     if (initOptions.authenticationRequired) {
       if initOptions.authenticationValidityDurationSeconds > 0 {
@@ -211,6 +234,9 @@ class BiometricStorageImpl {
       handleOSStatusError(status, result, "writing data")
       return
     }
+    if (contextFirstAuthenticatedAt == nil) {
+      contextFirstAuthenticatedAt = Date()
+    }
     result(nil)
   }
 

pubspec.yaml

@@ -2,7 +2,7 @@ name: biometric_storage
 description: |
   Secure Storage: Encrypted data store optionally secured by biometric lock with support
   for iOS, Android, MacOS. Partial support for Linux, Windows and web (localStorage).
-version: 4.1.3
+version: 4.1.4
 homepage: https://github.com/authpass/biometric_storage/
 
 environment: