Skip to content

fix(settings): save the API key directly, with feedback at the field #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chris2k20 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(settings): save the API key directly, with feedback at the field #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
710ed72
fix(settings): show API key errors next to the key field, not by the …
chris2k20 Jun 15, 2026
a05ac97
feat(settings): auto-save API key on commit/blur/paste with inline fe…
chris2k20 Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 65 additions & 50 deletions BlitztextMac/Features/Settings/SettingsContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ struct AccessSettingsView: View {
@State private var openAIAPIKey = ""
@State private var editingAPIKey = false
@State private var saved = false
@State private var saveErrorText: String?
@State private var apiKeyErrorText: String?
@State private var installActionErrorText: String?
@State private var showCleanupOptions = false
@State private var deleteLocalDataOnCleanup = true
Expand Down Expand Up @@ -146,6 +146,15 @@ struct AccessSettingsView: View {
.textFieldStyle(.roundedBorder)
.font(.system(size: 11.5))
.focused($focusedField, equals: .openAIAPIKey)
.onSubmit { saveAPIKey() }
.onChange(of: focusedField) { oldValue, newValue in
// Apple-typisch: beim Verlassen des Feldes speichern.
// Leeres Feld still ignorieren, nicht rot meckern.
if oldValue == .openAIAPIKey, newValue != .openAIAPIKey,
!openAIAPIKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
saveAPIKey()
}
}

Button("Einfuegen") {
pasteAPIKeyFromClipboard()
Expand All @@ -154,10 +163,39 @@ struct AccessSettingsView: View {
}
}

if saved {
HStack(spacing: 4) {
Image(systemName: "checkmark.circle.fill")
.font(.system(size: 10, weight: .bold))
Text("Gespeichert")
}
.font(.system(size: 10.5, weight: .medium))
.foregroundStyle(.green)
.transition(.opacity)
}

Text("Dein Key bleibt lokal in dieser App. Audio und Text werden direkt an die OpenAI API gesendet.")
.font(.system(size: 10.5))
.foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)

Link(destination: URL(string: "https://platform.openai.com/api-keys")!) {
HStack(spacing: 3) {
Text("OpenAI API Key erstellen")
Image(systemName: "arrow.up.right")
.font(.system(size: 8, weight: .semibold))
}
.font(.system(size: 10.5, weight: .medium))
}
.buttonStyle(.plain)
.foregroundStyle(.blue)

if let apiKeyErrorText {
Text(apiKeyErrorText)
.font(.system(size: 10.5))
.foregroundStyle(.red)
.fixedSize(horizontal: false, vertical: true)
}
}

VStack(alignment: .leading, spacing: 8) {
Expand Down Expand Up @@ -253,13 +291,6 @@ struct AccessSettingsView: View {
.fixedSize(horizontal: false, vertical: true)
}

if let saveErrorText {
Text(saveErrorText)
.font(.system(size: 10.5))
.foregroundStyle(.red)
.fixedSize(horizontal: false, vertical: true)
}

VStack(alignment: .leading, spacing: 6) {
SectionLabel(text: "Hinweis")

Expand Down Expand Up @@ -330,31 +361,9 @@ struct AccessSettingsView: View {
}
}

// Save button (right-aligned, text only)
HStack {
Spacer()
Button {
save()
} label: {
if saved {
HStack(spacing: 4) {
Image(systemName: "checkmark")
.font(.system(size: 10, weight: .bold))
Text("Gespeichert")
}
.font(.system(size: 12, weight: .medium))
.foregroundStyle(.green)
} else {
Text("Speichern")
.font(.system(size: 12, weight: .medium))
.foregroundStyle(.blue)
}
}
.buttonStyle(SubtleButtonStyle())
.animation(.easeInOut(duration: 0.2), value: saved)
}
}
.padding(16)
.animation(.easeInOut(duration: 0.2), value: saved)
.onAppear {
launchAtLoginService.refresh()
refreshInstallState()
Expand All @@ -370,31 +379,36 @@ struct AccessSettingsView: View {
openAIAPIKey = ""
}

private func save() {
saveErrorText = nil
/// Speichert den Key direkt nach Eingabe/Einfügen — kein separater Button.
private func saveAPIKey() {
apiKeyErrorText = nil
cleanupStatusText = nil
cleanupErrorText = nil
KeychainService.invalidateCache()

let trimmedAPIKey = openAIAPIKey.trimmingCharacters(in: .whitespacesAndNewlines)

if editingAPIKey || !appState.hasValue(for: .openAIAPIKey) {
guard !trimmedAPIKey.isEmpty else {
saveErrorText = "Bitte trage deinen OpenAI API Key ein."
return
}
do {
try KeychainService.save(key: .openAIAPIKey, value: trimmedAPIKey)
openAIAPIKey = ""
editingAPIKey = false
} catch {
saveErrorText = "OpenAI API Key konnte nicht gespeichert werden."
return
}
guard !trimmedAPIKey.isEmpty else {
apiKeyErrorText = "Bitte trage deinen OpenAI API Key ein."
return
}
guard trimmedAPIKey.range(of: Self.openAIAPIKeyPattern, options: .regularExpression) != nil else {
apiKeyErrorText = "Das sieht nicht nach einem OpenAI API Key aus (beginnt mit „sk-“)."
return
}

do {
try KeychainService.save(key: .openAIAPIKey, value: trimmedAPIKey)
openAIAPIKey = ""
editingAPIKey = false
} catch {
apiKeyErrorText = "OpenAI API Key konnte nicht gespeichert werden."
return
}

KeychainService.invalidateCache()
if !appState.hasValue(for: .openAIAPIKey) {
saveErrorText = "OpenAI API Key wurde nicht persistent gespeichert. Bitte App neu starten und erneut versuchen."
apiKeyErrorText = "OpenAI API Key wurde nicht persistent gespeichert. Bitte App neu starten und erneut versuchen."
return
}

Expand All @@ -406,20 +420,21 @@ struct AccessSettingsView: View {

private func pasteAPIKeyFromClipboard() {
guard let rawText = NSPasteboard.general.string(forType: .string) else {
saveErrorText = "Zwischenablage enthält keinen Text."
apiKeyErrorText = "Zwischenablage enthält keinen Text."
return
}

let firstLine = rawText.components(separatedBy: .newlines).first ?? rawText
let trimmedKey = firstLine.trimmingCharacters(in: .whitespacesAndNewlines)
guard trimmedKey.range(of: Self.openAIAPIKeyPattern, options: .regularExpression) != nil else {
saveErrorText = "Zwischenablage enthält keinen plausiblen OpenAI API Key."
apiKeyErrorText = "Zwischenablage enthält keinen plausiblen OpenAI API Key."
return
}

openAIAPIKey = trimmedKey
NSPasteboard.general.clearContents()
saveErrorText = nil
apiKeyErrorText = nil
saveAPIKey()
}

private var installationHeadline: String {
Expand Down