SDK-1561 Fix issue with Biometrics registration (#216)

* kSecAttrAccessible and kSecAttrAccessControl are mutually exclusive. Prefer kSecAttrAccessControl if both are requested * Lint
stytchauth · Apr 3, 2024 · 0f2c133 · 0f2c133
1 parent a5f550a
commit 0f2c133
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Sources/StytchCore/Extensions/Dictionary+Stytch.swift b/Sources/StytchCore/Extensions/Dictionary+Stytch.swift
@@ -1,7 +1,17 @@
 import CoreFoundation
+import Foundation
 
 extension Dictionary where Key == CFString, Value == Any {
     func merging(_ other: Self) -> CFDictionary {
         merging(other) { $1 } as CFDictionary
     }
+
+    func accessibilityAwareMerging(_ other: Self) -> CFDictionary {
+        var combined = merging(other) { $1 } as [CFString: Any]
+        if combined[kSecAttrAccessible] != nil, combined[kSecAttrAccessControl] != nil {
+            // we can't have both, so prefer kSecAttrAccessControl
+            combined.removeValue(forKey: kSecAttrAccessible)
+        }
+        return combined as CFDictionary
+    }
 }
diff --git a/Sources/StytchCore/KeychainClient/KeychainClient+Item.swift b/Sources/StytchCore/KeychainClient/KeychainClient+Item.swift
@@ -31,7 +31,7 @@ extension KeychainClient {
         }
 
         func insertQuery(value: Value) -> CFDictionary {
-            baseQuery.merging(updateQuerySegment(for: value))
+            baseQuery.accessibilityAwareMerging(updateQuerySegment(for: value))
         }
 
         func updateQuerySegment(for value: Value) -> [CFString: Any] {