diff options
| author | Craig Jennings <c@cjennings.net> | 2026-05-22 19:32:32 -0500 |
|---|---|---|
| committer | Craig Jennings <c@cjennings.net> | 2026-05-22 19:32:32 -0500 |
| commit | f6e5885b47e3ab244b293f4e478af7e520180710 (patch) | |
| tree | e6d3dd67a89fb7eeb90d203b7bc0291f3fcdec0f /modules/transcription-config.el | |
| parent | f9d484aec5aad43608f3a03435c4e57a5b5c68c1 (diff) | |
| download | dotemacs-f6e5885b47e3ab244b293f4e478af7e520180710.tar.gz dotemacs-f6e5885b47e3ab244b293f4e478af7e520180710.zip | |
refactor(auth): consolidate the auth-source secret lookup into one helper
The auth-source-search + funcall-the-secret block was copied four times: calendar-sync--calendar-url, cj/auth-source-secret (ai-config), cj/--auth-source-password (transcription), and cj/slack--get-credential. Each searched authinfo, pulled :secret, and called it when the netrc backend returned a function.
I pulled that into cj/auth-source-secret-value in system-lib (a leaf, so calendar-sync doesn't have to depend on ai-config and drag in the gptel stack). It takes an optional user and returns the secret or nil. The four callers now delegate to it: ai-config layers its required-secret error on top, and the others keep their nil-on-miss behavior. With the direct auth-source-search calls gone, I dropped the now-unused (require 'auth-source) from transcription, slack, and calendar-sync. The helper's autoload covers it.
The transcription tests that exercise the delegated path stay green, and the primitive and the error wrapper get their own tests.
Diffstat (limited to 'modules/transcription-config.el')
| -rw-r--r-- | modules/transcription-config.el | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/modules/transcription-config.el b/modules/transcription-config.el index d81ccba0..344ec473 100644 --- a/modules/transcription-config.el +++ b/modules/transcription-config.el @@ -38,7 +38,7 @@ (require 'dired) (require 'notifications) -(require 'auth-source) +(require 'system-lib) ; provides cj/auth-source-secret-value (require 'user-constants) ; For cj/audio-file-extensions ;; Declare keymap defined in keybindings.el @@ -121,14 +121,10 @@ SUCCESS-P indicates whether transcription succeeded." (expand-file-name (concat "scripts/" script-name) user-emacs-directory))) (defun cj/--auth-source-password (host) - "Retrieve password for HOST from authinfo.gpg. -Expects entry like: machine HOST login api password <key>. + "Retrieve the auth-source secret for HOST from authinfo.gpg. +Expects an entry like: machine HOST login api password <key>. Returns the password string, or nil if no matching entry exists." - (when-let* ((auth-info (car (auth-source-search :host host :require '(:secret)))) - (secret (plist-get auth-info :secret))) - (if (functionp secret) - (funcall secret) - secret))) + (cj/auth-source-secret-value host)) (defun cj/--build-process-environment (backend) "Return `process-environment' augmented with BACKEND's API-key env var. |