Page MenuHomeMusing Studio
Files F10670047

No OneTemporary
Actions

View Options

diff --git a/Shared/Extensions/WriteFreelyModel+Keychain.swift b/Shared/Extensions/WriteFreelyModel+Keychain.swift
index fd37506..f039e31 100644
--- a/Shared/Extensions/WriteFreelyModel+Keychain.swift
+++ b/Shared/Extensions/WriteFreelyModel+Keychain.swift
@@ -1,53 +1,61 @@
import Foundation
extension WriteFreelyModel {
- func saveTokenToKeychain(_ token: String, username: String?, server: String) {
+
+ enum WFKeychainError: Error {
+ case saveToKeychainFailed
+ case purgeFromKeychainFailed
+ case fetchFromKeychainFailed
+ }
+
+ func saveTokenToKeychain(_ token: String, username: String?, server: String) throws {
let query: [String: Any] = [
kSecClass as String: kSecClassGenericPassword,
kSecValueData as String: token.data(using: .utf8)!,
kSecAttrAccount as String: username ?? "anonymous",
kSecAttrService as String: server
]
let status = SecItemAdd(query as CFDictionary, nil)
guard status == errSecDuplicateItem || status == errSecSuccess else {
- fatalError("Error storing in Keychain with OSStatus: \(status)")
+ throw WFKeychainError.saveToKeychainFailed
}
}
func purgeTokenFromKeychain(username: String?, server: String) throws {
let query: [String: Any] = [
kSecClass as String: kSecClassGenericPassword,
kSecAttrAccount as String: username ?? "anonymous",
kSecAttrService as String: server
]
let status = SecItemDelete(query as CFDictionary)
guard status == errSecSuccess || status == errSecItemNotFound else {
- fatalError("Error deleting from Keychain with OSStatus: \(status)")
+ throw WFKeychainError.purgeFromKeychainFailed
}
}
- func fetchTokenFromKeychain(username: String?, server: String) -> String? {
+ func fetchTokenFromKeychain(username: String?, server: String) throws -> String? {
let query: [String: Any] = [
kSecClass as String: kSecClassGenericPassword,
kSecAttrAccount as String: username ?? "anonymous",
kSecAttrService as String: server,
kSecMatchLimit as String: kSecMatchLimitOne,
kSecReturnAttributes as String: true,
kSecReturnData as String: true
]
var secItem: CFTypeRef?
let status = SecItemCopyMatching(query as CFDictionary, &secItem)
guard status != errSecItemNotFound else {
return nil
}
guard status == errSecSuccess else {
- fatalError("Error fetching from Keychain with OSStatus: \(status)")
+ throw WFKeychainError.fetchFromKeychainFailed
}
guard let existingSecItem = secItem as? [String: Any],
let tokenData = existingSecItem[kSecValueData as String] as? Data,
let token = String(data: tokenData, encoding: .utf8) else {
return nil
}
return token
}
+
}

File Metadata

Mime Type
text/x-diff
Expires
Fri, May 16, 8:21 PM (9 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3240445

Event Timeline

musing studio · developers