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/system-lib.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/system-lib.el')
| -rw-r--r-- | modules/system-lib.el | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/modules/system-lib.el b/modules/system-lib.el index 96159179..80175958 100644 --- a/modules/system-lib.el +++ b/modules/system-lib.el @@ -106,5 +106,19 @@ This does so without echoing in the minibuffer." (insert (apply #'format format-string args)) (unless (bolp) (insert "\n"))))) +;; ------------------------------ Auth Source ---------------------------------- + +(declare-function auth-source-search "auth-source") + +(defun cj/auth-source-secret-value (host &optional user) + "Return the auth-source secret for HOST, or nil when none is found. +With USER, also match on the login. Resolves a function-valued secret +\(the netrc backend returns the secret as a function\) by calling it. +Callers that must have a secret layer their own error on top." + (let* ((spec (append (list :host host :require '(:secret) :max 1) + (when user (list :user user)))) + (secret (plist-get (car (apply #'auth-source-search spec)) :secret))) + (if (functionp secret) (funcall secret) secret))) + (provide 'system-lib) ;;; system-lib.el ends here |