Make avandu use auth-source

* avandu.el (avandu--clear-data): Only use `clear-string' if
  `avandu-password' is a string, otherwise just set it to nil.

  (avandu--get-credentials):
  (avandu--password): New functions.

  (avandu-login): If either `avandu-user' or `avandu-password' is nil,
  call `avandu--get-credentials' to fill them.  Just pass along
  `avandu-user' and use `avandu--password' to get the password.
This commit is contained in:
Tom Willemsen 2012-08-06 21:07:33 +02:00
parent 0516b22b9a
commit 32f394cbfa

View file

@ -227,7 +227,24 @@ with their char value or with the value in
"Clean up login data. This makes for a clean slate next time." "Clean up login data. This makes for a clean slate next time."
(setq avandu-user nil (setq avandu-user nil
avandu--session-id nil) avandu--session-id nil)
(clear-string avandu-password))
(if (stringp avandu-password)
(clear-string avandu-password)
(setq avandu-password nil)))
(defun avandu--get-credentials ()
"Get a username and password for Tiny Tiny RSS. Try it first
with `auth-source-search' and then by asking the user."
(let ((credentials (auth-source-search :max 1
:host avandu-tt-rss-api-url
:type 'netrc
:require '(:user :secret)
:user avandu-user)))
(if credentials
(setq avandu-user (plist-get (car credentials) :user)
avandu-password (plist-get (car credentials) :secret))
(avandu-getset avandu-user "Username: ")
(avandu-getset avandu-password "Password: " t))))
(defun avandu--get-session-id (results) (defun avandu--get-session-id (results)
"Get the session id from RESULTS." "Get the session id from RESULTS."
@ -278,6 +295,13 @@ feed-id property."
(message "%s" (button-label button)))) (message "%s" (button-label button))))
(insert-char ?\n 2)) (insert-char ?\n 2))
(defun avandu--password ()
"Get the password. This means either return `avandu-password'
as-is, or if it's a function return the result of that function."
(if (functionp avandu-password)
(funcall avandu-password)
avandu-password))
(defun avandu--send-command (data) (defun avandu--send-command (data)
"Send a command with parameters DATA to tt-rss. The current "Send a command with parameters DATA to tt-rss. The current
session-id is added to the request and then DATA is passed on to session-id is added to the request and then DATA is passed on to
@ -451,11 +475,13 @@ in. This function returns t if we are, or nil if we're not."
and saved in memory. This function returns t on succes, nil and saved in memory. This function returns t on succes, nil
otherwise." otherwise."
(interactive) (interactive)
(unless (and avandu-user avandu-password)
(avandu--get-credentials))
(let ((result (avandu--send-command (let ((result (avandu--send-command
`((op . "login") `((op . "login")
(user . ,(avandu-getset avandu-user "Username: ")) (user . ,avandu-user)
(password (password . ,(avandu--password))))))
. ,(avandu-getset avandu-password "Password: " t))))))
(if (eq (avandu--get-status-id result) 0) (if (eq (avandu--get-status-id result) 0)
(progn (progn
(setq avandu--session-id (avandu--get-session-id result)) (setq avandu--session-id (avandu--get-session-id result))