branch: elpa/mastodon
commit 97a317da50c914863365bc92753d415e21baff71
Author: marty hiatt <martianhia...@disroot.org>
Commit: marty hiatt <martianhia...@disroot.org>
auth: amend auth source/plstore check error message #671.
---
lisp/mastodon-auth.el | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 9f9ab3b828..c54f5e9c4b 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -199,6 +199,9 @@ Generate/save token if none known yet."
mastodon-auth--token-alist nil nil #'string=))
;; if auth source enabled, but we have an access token in plstore,
;; error out, tell user to remove plstore and start over:
+ ;; FIXME: is it poss to move this plstore read to have one less read?
+ ;; e.g. inside of `mastodon-client--active-user'? the poss issue then
+ ;; would be having a have completed activate user process.
((and mastodon-auth-use-auth-source
(let ((entry (mastodon-client--general-read
(concat "user-"
@@ -206,8 +209,10 @@ Generate/save token if none known yet."
(plist-get entry :access_token)))
(user-error "Auth source storage of tokens is enabled,\
but there is also an access token in your plstore.\
- Either set `mastodon-auth-use-auth-source' to nil or call\
- `mastodon-forget-all-logins', and try again.\
+ If you're seeing this message after updating,\
+ call `mastodon-forget-all-logins', and try again.
+ If you don want to use auth sources,\
+ also set `mastodon-auth-use-auth-source' to nil.\
If this message is in error, contact us on the\ mastodon.el repo"))
((plist-get (mastodon-client--active-user) :access_token)
;; user variables need to be read from plstore active-user entry.
