mirrors/metatext
1
0
Fork 0
mirror of https://github.com/metabolist/metatext.git synced 2024-11-25 09:41:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix push issues

Browse source
This commit is contained in:
Justin Mazzocchi 2020-11-21 15:21:04 -08:00
parent 2397758456
commit ad4e699ce1
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Keychain/Sources/Keychain/Keychain.swift
View file

@ -19,7 +19,13 @@ extension LiveKeychain: Keychain {
query[kSecValueData as String] = data query[kSecValueData as String] = data
let status = SecItemAdd(query as CFDictionary, nil) var status = SecItemAdd(query as CFDictionary, nil)
if status == errSecDuplicateItem {
status = SecItemUpdate(
genericPasswordQueryDictionary(account: account, service: service) as CFDictionary,
[kSecValueData as String: data] as CFDictionary)
}
if status != errSecSuccess { if status != errSecSuccess {
throw NSError(status: status) throw NSError(status: status)
@ -54,6 +60,8 @@ extension LiveKeychain: Keychain {
} }
public static func generateKeyAndReturnPublicKey(applicationTag: String, attributes: [String: Any]) throws -> Data { public static func generateKeyAndReturnPublicKey(applicationTag: String, attributes: [String: Any]) throws -> Data {
try? deleteKey(applicationTag: applicationTag)
var attributes = attributes var attributes = attributes
var error: Unmanaged<CFError>? var error: Unmanaged<CFError>?

1
ServiceLayer/Sources/ServiceLayer/Services/AllIdentitiesService.swift
View file

@ -124,6 +124,7 @@ public extension AllIdentitiesService {
} }
} }
.map(Publishers.MergeMany.init) .map(Publishers.MergeMany.init)
.flatMap { $0 }
.ignoreOutput() .ignoreOutput()
.eraseToAnyPublisher() .eraseToAnyPublisher()
} }