@onekeyfe/react-native-check-biometric-auth-changed 1.1.19 → 1.1.21

package/ReactNativeCheckBiometricAuthChanged.podspec

@@ -21,6 +21,7 @@ Pod::Spec.new do |s|
 
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
+  s.dependency 'ReactNativeNativeLogger'
 
   load 'nitrogen/generated/ios/ReactNativeCheckBiometricAuthChanged+autolinking.rb'
   add_nitrogen_files(s)

package/ios/ReactNativeCheckBiometricAuthChanged.swift

@@ -1,21 +1,69 @@
 
 import NitroModules
 import LocalAuthentication
+import Security
+import ReactNativeNativeLogger
 
 class ReactNativeCheckBiometricAuthChanged: HybridReactNativeCheckBiometricAuthChangedSpec {
+
+  private static let keychainKey = "com.onekey.biometricAuthState"
+
+  private static func loadDomainState() -> Data? {
+    let query: [String: Any] = [
+      kSecClass as String: kSecClassGenericPassword,
+      kSecAttrAccount as String: keychainKey,
+      kSecReturnData as String: true,
+      kSecMatchLimit as String: kSecMatchLimitOne
+    ]
+    var result: AnyObject?
+    let status = SecItemCopyMatching(query as CFDictionary, &result)
+    if status == errSecSuccess {
+      return result as? Data
+    }
+    return nil
+  }
+
+  private static func saveDomainState(_ data: Data?) {
+    guard let data = data else { return }
+    let query: [String: Any] = [
+      kSecClass as String: kSecClassGenericPassword,
+      kSecAttrAccount as String: keychainKey,
+      kSecAttrAccessible as String: kSecAttrAccessibleWhenUnlockedThisDeviceOnly
+    ]
+    let attrs: [String: Any] = [
+      kSecValueData as String: data
+    ]
+    let status = SecItemUpdate(query as CFDictionary, attrs as CFDictionary)
+    if status == errSecItemNotFound {
+      var addQuery = query
+      addQuery[kSecValueData as String] = data
+      SecItemAdd(addQuery as CFDictionary, nil)
+    }
+  }
+
   func checkChanged() throws -> Promise<Bool> {
     return Promise.async {
       var changed = false
       let context = LAContext()
       _ = context.canEvaluatePolicy(.deviceOwnerAuthentication, error: nil)
       let domainState = context.evaluatedPolicyDomainState
-      let defaults = UserDefaults.standard
-      let oldDomainState = defaults.data(forKey: "biometricAuthState")
+      let oldDomainState = Self.loadDomainState()
       if let oldDomainState = oldDomainState {
           changed = oldDomainState != domainState
+      } else {
+          // Migrate from UserDefaults if exists
+          let defaults = UserDefaults.standard
+          if let legacyState = defaults.data(forKey: "biometricAuthState") {
+              changed = legacyState != domainState
+              defaults.removeObject(forKey: "biometricAuthState")
+          } else {
+              OneKeyLog.info("Biometric", "No previous biometric state stored, saving initial state")
+          }
+      }
+      Self.saveDomainState(domainState)
+      if changed {
+          OneKeyLog.info("Biometric", "Biometric auth change detected")
       }
-      defaults.set(domainState, forKey: "biometricAuthState")
-      defaults.synchronize()
       return changed
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-check-biometric-auth-changed",
-  "version": "1.1.19",
+  "version": "1.1.21",
   "description": "react-native-check-biometric-auth-changed",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",