coder/meetingnotes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

fix: streamline keychain usage (#7)

Browse Source
This commit is contained in:
Owen Gretzinger
2025-07-14 17:44:25 -04:00
committed by GitHub
parent c60c6cfac5
commit 892ecd3201
10 changed files with 126 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meetingnotes/ViewModels/MeetingViewModel.swift
+2 -2
View File
@@ -180,8 +180,8 @@ class MeetingViewModel: ObservableObject {
meeting.generatedNotes = ""
// Load settings for generation
let userBlurb = KeychainHelper.shared.get(forKey: "userBlurb") ?? ""
let systemPrompt = KeychainHelper.shared.get(forKey: "systemPrompt") ?? Settings.defaultSystemPrompt()
let userBlurb = UserDefaultsManager.shared.userBlurb
let systemPrompt = UserDefaultsManager.shared.systemPrompt
// Use streaming generation
let stream = NotesGenerator.shared.generateNotesStream(
meetingnotes/ViewModels/SettingsViewModel.swift
+8 -28
View File
@@ -8,23 +8,13 @@ class SettingsViewModel: ObservableObject {
@Published var templates: [NoteTemplate] = []
init() {
loadSettings()
loadTemplates()
}
func loadSettings() {
settings.openAIKey = KeychainHelper.shared.get(forKey: "openAIKey") ?? ""
settings.userBlurb = KeychainHelper.shared.get(forKey: "userBlurb") ?? ""
settings.systemPrompt = KeychainHelper.shared.get(forKey: "systemPrompt") ?? Settings.defaultSystemPrompt()
// Load onboarding status
settings.hasCompletedOnboarding = KeychainHelper.shared.get(forKey: "hasCompletedOnboarding") == "true"
settings.hasAcceptedTerms = KeychainHelper.shared.get(forKey: "hasAcceptedTerms") == "true"
// Load selected template ID
if let templateIdString = KeychainHelper.shared.get(forKey: "selectedTemplateId"),
let templateId = UUID(uuidString: templateIdString) {
settings.selectedTemplateId = templateId
/// Loads the API key from keychain (only called when actually needed)
func loadAPIKey() {
if settings.openAIKey.isEmpty {
settings.openAIKey = KeychainHelper.shared.getAPIKey() ?? ""
}
}
@@ -62,22 +52,12 @@ class SettingsViewModel: ObservableObject {
return
}
let openAISaved = KeychainHelper.shared.save(settings.openAIKey, forKey: "openAIKey")
let blurbSaved = KeychainHelper.shared.save(settings.userBlurb, forKey: "userBlurb")
let promptSaved = KeychainHelper.shared.save(settings.systemPrompt, forKey: "systemPrompt")
// Save onboarding status
let onboardingSaved = KeychainHelper.shared.save(settings.hasCompletedOnboarding ? "true" : "false", forKey: "hasCompletedOnboarding")
let termsSaved = KeychainHelper.shared.save(settings.hasAcceptedTerms ? "true" : "false", forKey: "hasAcceptedTerms")
// Save selected template ID
var templateIdSaved = true
if let templateId = settings.selectedTemplateId {
templateIdSaved = KeychainHelper.shared.save(templateId.uuidString, forKey: "selectedTemplateId")
}
// Only save API key to keychain - other values are automatically saved to UserDefaults
// via computed properties when they're modified
let openAISaved = KeychainHelper.shared.saveAPIKey(settings.openAIKey)
if showMessage {
if openAISaved && blurbSaved && promptSaved && templateIdSaved && onboardingSaved && termsSaved {
if openAISaved {
saveMessage = "Settings saved successfully!"
} else {
saveMessage = "Error saving settings"