fix(core): update keychain setter for macOS (#3174)

* fix(core): update keychain setter for macOS

* chore(core): update per review comments

* chore(core): update per review comments

* chore(core): remove code comment

Author: phantumcode

AmplifyPlugins/Core/AWSPluginsCore/Keychain/KeychainStore.swift

@@ -148,14 +148,18 @@ public struct KeychainStore: KeychainStoreBehavior {
         let fetchStatus = SecItemCopyMatching(getQuery as CFDictionary, nil)
         switch fetchStatus {
         case errSecSuccess:
-
+            #if os(macOS)
+            SecItemDelete(getQuery as CFDictionary)
+            fallthrough
+            #else
             var attributesToUpdate = [String: Any]()
             attributesToUpdate[Constants.ValueData] = value
 
             let updateStatus = SecItemUpdate(getQuery as CFDictionary, attributesToUpdate as CFDictionary)
             if updateStatus != errSecSuccess {
                 throw KeychainStoreError.securityError(updateStatus)
             }
+            #endif
         case errSecItemNotFound:
             var attributesToSet = attributes.defaultSetQuery()
             attributesToSet[Constants.AttributeAccount] = key

AmplifyPlugins/Core/AWSPluginsCore/Keychain/KeychainStoreAttributes.swift

@@ -20,8 +20,10 @@ extension KeychainStoreAttributes {
     func defaultGetQuery() -> [String: Any] {
         var query: [String: Any] = [
             KeychainStore.Constants.Class: itemClass,
-            KeychainStore.Constants.AttributeService: service
+            KeychainStore.Constants.AttributeService: service,
+            KeychainStore.Constants.UseDataProtectionKeyChain: kCFBooleanTrue
         ]
+        
         if let accessGroup = accessGroup {
             query[KeychainStore.Constants.AttributeAccessGroup] = accessGroup
         }