Skip to content

Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more

Store api keys in keychain

grohith327c121525c539a
diff --git a/Fluid.xcodeproj/project.pbxproj b/Fluid.xcodeproj/project.pbxproj
index 97a0e6cd..88e66426 100644
--- a/Fluid.xcodeproj/project.pbxproj
+++ b/Fluid.xcodeproj/project.pbxproj
@@ -14,7 +14,7 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
- 7C078D8F2E3B339200FB7CAC /* FluidVoice.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = FluidVoice.app; path = "FluidVoice Debug.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 7C078D8F2E3B339200FB7CAC /* FluidVoice Debug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FluidVoice Debug.app"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFileSystemSynchronizedRootGroup section */
@@ -50,7 +50,7 @@
7C078D902E3B339200FB7CAC /* Products */ = {
isa = PBXGroup;
children = (
- 7C078D8F2E3B339200FB7CAC /* FluidVoice.app */,
+ 7C078D8F2E3B339200FB7CAC /* FluidVoice Debug.app */,
);
name = Products;
sourceTree = "<group>";
@@ -81,7 +81,7 @@
7CE006BC2E80EBE600DDCCD6 /* AppUpdater */,
);
productName = FluidVoice;
- productReference = 7C078D8F2E3B339200FB7CAC /* FluidVoice.app */;
+ productReference = 7C078D8F2E3B339200FB7CAC /* FluidVoice Debug.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@@ -283,7 +283,7 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
- DEVELOPMENT_TEAM = V4J43B279J;
+ DEVELOPMENT_TEAM = J67LH9U7BN;
ENABLE_APP_SANDBOX = NO;
ENABLE_CODE_COVERAGE = NO;
ENABLE_FILE_ACCESS_DOWNLOADS_FOLDER = readwrite;
@@ -334,11 +334,12 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Fluid.entitlements;
CODE_SIGN_IDENTITY = "Developer ID Application: Barathwaj Anandan (V4J43B279J)";
- "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application: Barathwaj Anandan (V4J43B279J)";
+ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = V4J43B279J;
+ "DEVELOPMENT_TEAM[sdk=macosx*]" = J67LH9U7BN;
ENABLE_APP_SANDBOX = NO;
ENABLE_CODE_COVERAGE = NO;
ENABLE_FILE_ACCESS_DOWNLOADS_FOLDER = readwrite;
diff --git a/README.md b/README.md
index ec43de7d..6feabef0 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ https://github.com/user-attachments/assets/c57ef6d5-f0a1-4a3f-a121-637533442c24
2. Move to Applications folder
3. Grant microphone and accessibility permissions when prompted
4. Set your preferred hotkey in settings
-5. Optionally add an AI provider API key for enhanced transcription
+5. Optionally add an AI provider API key for enhanced transcription (keys are stored securely in your macOS Keychain)
## Requirements
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swift
index aff7b834..23f8fb00 100644
--- a/Sources/Fluid/ContentView.swift
+++ b/Sources/Fluid/ContentView.swift
@@ -277,7 +277,6 @@ struct ContentView: View {
// Use models from saved provider
availableModels = saved.models
openAIBaseURL = saved.baseURL
- providerAPIKeys[currentProvider] = saved.apiKey
} else if let stored = availableModelsByProvider[currentProvider], !stored.isEmpty {
// Use provider-specific stored list if present
availableModels = stored
@@ -1288,8 +1287,6 @@ struct ContentView: View {
if let provider = savedProviders.first(where: { $0.id == newValue }) {
openAIBaseURL = provider.baseURL
updateCurrentProvider()
- providerAPIKeys[currentProvider] = provider.apiKey
- saveProviderAPIKeys()
let key = providerKey(for: newValue)
availableModels = provider.models.isEmpty ? (availableModelsByProvider[key] ?? defaultModels(for: key)) : provider.models
if let sel = selectedModelByProvider[key], availableModels.contains(sel) { selectedModel = sel }
@@ -1495,7 +1492,6 @@ struct ContentView: View {
id: savedProviders[providerIndex].id,
name: savedProviders[providerIndex].name,
baseURL: savedProviders[providerIndex].baseURL,
- apiKey: savedProviders[providerIndex].apiKey,
models: list
)
savedProviders[providerIndex] = updatedProvider
@@ -1718,7 +1714,6 @@ struct ContentView: View {
let newProvider = SettingsStore.SavedProvider(
name: name,
baseURL: base,
- apiKey: api,
models: models
)
@@ -2745,7 +2740,6 @@ struct ContentView: View {
id: savedProviders[providerIndex].id,
name: savedProviders[providerIndex].name,
baseURL: savedProviders[providerIndex].baseURL,
- apiKey: savedProviders[providerIndex].apiKey,
models: list
)
savedProviders[providerIndex] = updatedProvider
@@ -3305,7 +3299,6 @@ struct ContentView: View {
id: savedProviders[providerIndex].id,
name: savedProviders[providerIndex].name,
baseURL: savedProviders[providerIndex].baseURL,
- apiKey: savedProviders[providerIndex].apiKey,
models: availableModels
)
savedProviders[providerIndex] = updatedProvider
diff --git a/Sources/Fluid/Persistence/KeychainService.swift b/Sources/Fluid/Persistence/KeychainService.swift
new file mode 100644
index 00000000..bc5f20a3
--- /dev/null
+++ b/Sources/Fluid/Persistence/KeychainService.swift
@@ -0,0 +1,123 @@
+import Foundation
+import Security
+
+enum KeychainServiceError: Error, LocalizedError {
+ case invalidData
+ case unhandled(OSStatus)
+
+ var errorDescription: String? {
+ switch self {
+ case .invalidData:
+ return "Failed to convert key data."
+ case .unhandled(let status):
+ if let message = SecCopyErrorMessageString(status, nil) as String? {
+ return message
+ }
+ return "Unhandled Keychain status: \(status)"
+ }
+ }
+}
+
+/// Lightweight helper for storing provider API keys in the system Keychain.
+/// Keys are stored as generic passwords scoped to the FluidVoice service.
+final class KeychainService {
+ static let shared = KeychainService()
+
+ private let service = "com.fluidvoice.provider-api-keys"
+
+ private init() {}
+
+ func storeKey(_ key: String, for providerID: String) throws {
+ let trimmed = key.trimmingCharacters(in: .whitespacesAndNewlines)
+ guard let data = trimmed.data(using: .utf8) else {
+ throw KeychainServiceError.invalidData
+ }
+
+ var attributes = baseQuery(for: providerID)
+ attributes[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock
+ attributes[kSecValueData as String] = data
+
+ let status = SecItemAdd(attributes as CFDictionary, nil)
+
+ switch status {
+ case errSecSuccess:
+ return
+ case errSecDuplicateItem:
+ let updateStatus = SecItemUpdate(baseQuery(for: providerID) as CFDictionary,
+ [kSecValueData as String: data] as CFDictionary)
+ guard updateStatus == errSecSuccess else {
+ throw KeychainServiceError.unhandled(updateStatus)
+ }
+ default:
+ throw KeychainServiceError.unhandled(status)
+ }
+ }
+
+ func fetchKey(for providerID: String) throws -> String? {
+ var query = baseQuery(for: providerID)
+ query[kSecReturnData as String] = kCFBooleanTrue
+ query[kSecMatchLimit as String] = kSecMatchLimitOne
+
+ var item: CFTypeRef?
+ let status = SecItemCopyMatching(query as CFDictionary, &item)
+
+ switch status {
+ case errSecSuccess:
+ guard let data = item as? Data,
+ let key = String(data: data, encoding: .utf8) else {
+ throw KeychainServiceError.invalidData
+ }
+ return key
+ case errSecItemNotFound:
+ return nil
+ default:
+ throw KeychainServiceError.unhandled(status)
+ }
+ }
+
+ func deleteKey(for providerID: String) throws {
+ let status = SecItemDelete(baseQuery(for: providerID) as CFDictionary)
+ guard status == errSecSuccess || status == errSecItemNotFound else {
+ throw KeychainServiceError.unhandled(status)
+ }
+ }
+
+ func containsKey(for providerID: String) -> Bool {
+ var query = baseQuery(for: providerID)
+ query[kSecReturnData as String] = kCFBooleanFalse
+ query[kSecMatchLimit as String] = kSecMatchLimitOne
+ let status = SecItemCopyMatching(query as CFDictionary, nil)
+ return status == errSecSuccess
+ }
+
+ func allProviderIDs() throws -> [String] {
+ let query: [String: Any] = [
+ kSecClass as String: kSecClassGenericPassword,
+ kSecAttrService as String: service,
+ kSecReturnAttributes as String: true,
+ kSecMatchLimit as String: kSecMatchLimitAll
+ ]
+
+ var items: CFTypeRef?
+ let status = SecItemCopyMatching(query as CFDictionary, &items)
+
+ switch status {
+ case errSecSuccess:
+ guard let attributesArray = items as? [[String: Any]] else { return [] }
+ return attributesArray.compactMap { $0[kSecAttrAccount as String] as? String }
+ case errSecItemNotFound:
+ return []
+ default:
+ throw KeychainServiceError.unhandled(status)
+ }
+ }
+
+ private func baseQuery(for providerID: String) -> [String: Any] {
+ [
+ kSecClass as String: kSecClassGenericPassword,
+ kSecAttrService as String: service,
+ kSecAttrAccount as String: providerID
+ ]
+ }
+}
+
diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swift
index 21732338..3706a00e 100644
--- a/Sources/Fluid/Persistence/SettingsStore.swift
+++ b/Sources/Fluid/Persistence/SettingsStore.swift
@@ -8,8 +8,12 @@ final class SettingsStore: ObservableObject
{
static let shared = SettingsStore()
private let defaults = UserDefaults.standard
+ private let keychain = KeychainService.shared
- private init() {}
+ private init() {
+ migrateProviderAPIKeysIfNeeded()
+ scrubSavedProviderAPIKeys()
+ }
// Keys
private enum Keys
@@ -22,6 +26,7 @@ final class SettingsStore: ObservableObject
static let selectedModelByProvider = "SelectedModelByProvider"
static let selectedProviderID = "SelectedProviderID"
static let providerAPIKeys = "ProviderAPIKeys"
+ static let providerAPIKeyIdentifiers = "ProviderAPIKeyIdentifiers"
static let savedProviders = "SavedProviders"
static let hotkeyShortcutKey = "HotkeyShortcutKey"
static let preferredInputDeviceUID = "PreferredInputDeviceUID"
@@ -62,7 +67,7 @@ final class SettingsStore: ObservableObject
let apiKey: String
let models: [String]
- init(id: String = UUID().uuidString, name: String, baseURL: String, apiKey: String, models: [String] = [])
+ init(id: String = UUID().uuidString, name: String, baseURL: String, apiKey: String = "", models: [String] = [])
{
self.id = id
self.name = name
@@ -126,12 +131,20 @@ final class SettingsStore: ObservableObject
}
}
- var providerAPIKeys: [String: String]
- {
- get { (defaults.dictionary(forKey: Keys.providerAPIKeys) as? [String: String]) ?? [:] }
+ var providerAPIKeys: [String: String] {
+ get {
+ var result: [String: String] = [:]
+ for providerID in storedProviderKeyIDs {
+ if let value = try? keychain.fetchKey(for: providerID),
+ value.isEmpty == false {
+ result[providerID] = value
+ }
+ }
+ return result
+ }
set {
objectWillChange.send()
- defaults.set(newValue, forKey: Keys.providerAPIKeys)
+ persistProviderAPIKeys(newValue)
}
}
@@ -144,19 +157,23 @@ final class SettingsStore: ObservableObject
}
}
- var savedProviders: [SavedProvider]
- {
- get
- {
+ var savedProviders: [SavedProvider] {
+ get {
guard let data = defaults.data(forKey: Keys.savedProviders),
let decoded = try? JSONDecoder().decode([SavedProvider].self, from: data) else { return [] }
return decoded
}
- set
- {
+ set {
objectWillChange.send()
- if let encoded = try? JSONEncoder().encode(newValue)
- {
+ let sanitized = newValue.map { provider -> SavedProvider in
+ if provider.apiKey.isEmpty { return provider }
+ return SavedProvider(id: provider.id,
+ name: provider.name,
+ baseURL: provider.baseURL,
+ apiKey: "",
+ models: provider.models)
+ }
+ if let encoded = try? JSONEncoder().encode(sanitized) {
defaults.set(encoded, forKey: Keys.savedProviders)
}
}
@@ -459,6 +476,102 @@ final class SettingsStore: ObservableObject
// MARK: - Private Methods
+ private var storedProviderKeyIDs: [String] {
+ get { defaults.stringArray(forKey: Keys.providerAPIKeyIdentifiers) ?? [] }
+ set {
+ let unique = Array(Set(newValue)).sorted()
+ defaults.set(unique, forKey: Keys.providerAPIKeyIdentifiers)
+ }
+ }
+
+ private func persistProviderAPIKeys(_ values: [String: String]) {
+ let trimmed = values.reduce(into: [String: String]()) { partialResult, pair in
+ let sanitizedValue = pair.value.trimmingCharacters(in: .whitespacesAndNewlines)
+ guard sanitizedValue.isEmpty == false else { return }
+ partialResult[pair.key] = sanitizedValue
+ }
+
+ let existingIDs = Set(storedProviderKeyIDs)
+ let incomingIDs = Set(trimmed.keys)
+
+ for (providerID, apiKey) in trimmed {
+ do {
+ try keychain.storeKey(apiKey, for: providerID)
+ } catch {
+ DebugLogger.shared.error("Failed to store API key for \(providerID): \(error.localizedDescription)", source: "SettingsStore")
+ }
+ }
+
+ for providerID in existingIDs.subtracting(incomingIDs) {
+ do {
+ try keychain.deleteKey(for: providerID)
+ } catch {
+ DebugLogger.shared.error("Failed to delete API key for \(providerID): \(error.localizedDescription)", source: "SettingsStore")
+ }
+ }
+
+ storedProviderKeyIDs = Array(incomingIDs)
+ }
+
+ private func migrateProviderAPIKeysIfNeeded() {
+ if let legacy = defaults.dictionary(forKey: Keys.providerAPIKeys) as? [String: String],
+ legacy.isEmpty == false {
+ persistProviderAPIKeys(legacy)
+ defaults.removeObject(forKey: Keys.providerAPIKeys)
+ } else if storedProviderKeyIDs.isEmpty,
+ let existing = try? keychain.allProviderIDs(),
+ existing.isEmpty == false {
+ storedProviderKeyIDs = existing
+ }
+ }
+
+ private func scrubSavedProviderAPIKeys() {
+ guard let data = defaults.data(forKey: Keys.savedProviders),
+ var decoded = try? JSONDecoder().decode([SavedProvider].self, from: data) else { return }
+
+ var didModify = false
+ var migratedIDs: [String] = []
+ for index in decoded.indices {
+ let provider = decoded[index]
+ let trimmed = provider.apiKey.trimmingCharacters(in: .whitespacesAndNewlines)
+ guard trimmed.isEmpty == false else { continue }
+
+ let keyID = canonicalProviderKey(for: provider.id)
+ do {
+ try keychain.storeKey(trimmed, for: keyID)
+ migratedIDs.append(keyID)
+ didModify = true
+ } catch {
+ DebugLogger.shared.error("Failed to migrate API key for \(provider.name): \(error.localizedDescription)", source: "SettingsStore")
+ }
+
+ decoded[index] = SavedProvider(id: provider.id,
+ name: provider.name,
+ baseURL: provider.baseURL,
+ apiKey: "",
+ models: provider.models)
+ }
+
+ if didModify,
+ let encoded = try? JSONEncoder().encode(decoded) {
+ defaults.set(encoded, forKey: Keys.savedProviders)
+ }
+
+ if didModify {
+ storedProviderKeyIDs = storedProviderKeyIDs + migratedIDs
+ }
+ }
+
+ private func canonicalProviderKey(for providerID: String) -> String {
+ if providerID == "openai" || providerID == "groq" {
+ return providerID
+ }
+ if providerID.hasPrefix("custom:") {
+ return providerID
+ }
+ return "custom:\(providerID)"
+ }
+
private func updateLaunchAtStartup(_ enabled: Bool) {
#if os(macOS)
// Note: SMAppService.mainApp requires the app to be signed with Developer ID