@onekeyfe/react-native-keychain-module 1.1.19 → 1.1.21

package/KeychainModule.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/KeychainModule+autolinking.rb'
   add_nitrogen_files(s)

package/ios/KeychainModule.swift

@@ -1,13 +1,12 @@
 import NitroModules
 
 class KeychainModule: HybridKeychainModuleSpec {
-    
+
     private let moduleCore = KeychainModuleCore()
-    
+
     public func setItem(params: SetItemParams) throws -> Promise<Void> {
-          let typedParams = params
           do {
-            try moduleCore.setItem(params: typedParams)
+            try moduleCore.setItem(params: params)
             return Promise.resolved(withResult: Void())
           } catch let error as KeychainModuleError {
             switch error {
@@ -22,11 +21,10 @@ class KeychainModule: HybridKeychainModuleSpec {
             return Promise.rejected(withError: NSError(domain: "keychain_set_error", code: -1000, userInfo: [NSLocalizedDescriptionKey: "Failed to set keychain item", NSUnderlyingErrorKey: error]))
           }
     }
-    
+
   public func getItem(params : GetItemParams) throws -> Promise<Variant_NullType_GetItemResult> {
-        let typedParams = params
         do {
-            if let result = try moduleCore.getItem(params: typedParams) {
+            if let result = try moduleCore.getItem(params: params) {
                 return Promise.resolved(withResult: Variant_NullType_GetItemResult.second(result))
             } else {
                 return Promise.resolved(withResult: Variant_NullType_GetItemResult.first(NullType.null))
@@ -42,11 +40,10 @@ class KeychainModule: HybridKeychainModuleSpec {
             return Promise.rejected(withError: NSError(domain: "keychain_get_error", code: -1000, userInfo: [NSLocalizedDescriptionKey: "Failed to get keychain item", NSUnderlyingErrorKey: error]))
         }
     }
-    
+
     public func removeItem(params: RemoveItemParams) throws -> Promise<Void> {
-        let typedParams = params
         do {
-            try moduleCore.removeItem(params: typedParams)
+            try moduleCore.removeItem(params: params)
             return Promise.resolved(withResult: Void())
         } catch let error as KeychainModuleError {
         switch error {

package/ios/KeychainModuleCore.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import Security
+import ReactNativeNativeLogger
 
 // MARK: - Constants
 
@@ -33,10 +34,11 @@ class KeychainModuleCore {
 
   func setItem(params: SetItemParams) throws {
     guard let valueData = params.value.data(using: .utf8) else {
+      OneKeyLog.error("Keychain", "setItem: failed to encode value")
       throw KeychainModuleError.encodingFailed
     }
 
-    let enableSync = params.enableSync ?? true  // Default to enabled for iCloud sync
+    let enableSync = params.enableSync ?? true  // Default to disabled; callers must explicitly opt in to iCloud sync
 
     var query: [String: Any] = [
       kSecClass as String: kSecClassGenericPassword,
@@ -57,14 +59,40 @@ class KeychainModuleCore {
       query[kSecAttrDescription as String] = description
     }
 
-    // Delete existing item if it exists
-    SecItemDelete(query as CFDictionary)
-
-    // Add new item
+    // Try to add new item first; if it already exists, update it
     let status = SecItemAdd(query as CFDictionary, nil)
 
-    guard status == errSecSuccess else {
-      throw KeychainModuleError.operationFailed(status)
+    if status == errSecDuplicateItem {
+      // Item exists - update it instead of delete+add (avoids race condition window)
+      let searchQuery: [String: Any] = [
+        kSecClass as String: kSecClassGenericPassword,
+        kSecAttrService as String: KeychainConstants.serviceIdentifier ?? "",
+        kSecAttrAccount as String: params.key,
+        kSecAttrSynchronizable as String: kSecAttrSynchronizableAny
+      ]
+      var updateAttrs: [String: Any] = [
+        kSecValueData as String: valueData,
+        kSecAttrAccessible as String: kSecAttrAccessibleWhenUnlocked,
+        kSecAttrSynchronizable as String: enableSync
+      ]
+      if let label = params.label {
+        updateAttrs[kSecAttrLabel as String] = label
+      }
+      if let description = params.description {
+        updateAttrs[kSecAttrDescription as String] = description
+      }
+      let updateStatus = SecItemUpdate(searchQuery as CFDictionary, updateAttrs as CFDictionary)
+      guard updateStatus == errSecSuccess else {
+        OneKeyLog.error("Keychain", "setItem update: failed, OSStatus: \(updateStatus)")
+        throw KeychainModuleError.operationFailed(updateStatus)
+      }
+      OneKeyLog.info("Keychain", "setItem: updated existing")
+    } else {
+      guard status == errSecSuccess else {
+        OneKeyLog.error("Keychain", "setItem: failed, OSStatus: \(status)")
+        throw KeychainModuleError.operationFailed(status)
+      }
+      OneKeyLog.info("Keychain", "setItem: success")
     }
   }
 
@@ -86,12 +114,15 @@ class KeychainModuleCore {
     if status == errSecSuccess {
       if let valueData = result as? Data,
          let value = String(data: valueData, encoding: .utf8) {
+        OneKeyLog.debug("Keychain", "getItem: found")
         return GetItemResult(key: params.key, value: value)
       }
       return nil
     } else if status == errSecItemNotFound {
+      OneKeyLog.debug("Keychain", "getItem: not found")
       return nil
     } else {
+      OneKeyLog.error("Keychain", "getItem: failed, OSStatus: \(status)")
       throw KeychainModuleError.operationFailed(status)
     }
   }
@@ -110,8 +141,10 @@ class KeychainModuleCore {
 
     // Both success and item not found are acceptable for delete
     guard status == errSecSuccess || status == errSecItemNotFound else {
+      OneKeyLog.error("Keychain", "removeItem: failed, OSStatus: \(status)")
       throw KeychainModuleError.operationFailed(status)
     }
+    OneKeyLog.info("Keychain", "removeItem: success")
   }
 
   // MARK: - Check Item Existence
@@ -126,6 +159,7 @@ class KeychainModuleCore {
     ]
 
     let status = SecItemCopyMatching(query as CFDictionary, nil)
+    OneKeyLog.debug("Keychain", "hasItem: \(status == errSecSuccess)")
     return status == errSecSuccess
   }
 
@@ -169,6 +203,8 @@ class KeychainModuleCore {
     // Common error codes:
     // errSecMissingEntitlement (-34018): Missing iCloud Keychain entitlement
     // errSecNotAvailable (-25291): iCloud Keychain not available/signed out
-    return addStatus == errSecSuccess
+    let enabled = addStatus == errSecSuccess
+    OneKeyLog.info("Keychain", "iCloud sync check result: \(enabled)")
+    return enabled
   }
 }

package/package.json

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