aboutsummaryrefslogtreecommitdiff
path: root/lisp/mastodon-auth.el
diff options
context:
space:
mode:
authorJohnson Denen <johnson.denen@gmail.com>2017-04-12 13:55:23 -0400
committerJohnson Denen <johnson.denen@gmail.com>2017-04-12 18:11:48 -0400
commite20f074de9927451a8f3f496632a39e4937b78b8 (patch)
tree87c93cae7ca7013cbcfc8fcb2bd379b00797206f /lisp/mastodon-auth.el
parent525235938369dd035c3e2bd073186266c7815af9 (diff)
Add tests for `mastodon--access-token'
Diffstat (limited to 'lisp/mastodon-auth.el')
-rw-r--r--lisp/mastodon-auth.el19
1 files changed, 11 insertions, 8 deletions
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 1f4adaf..a35dc5a 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -135,18 +135,21 @@ Authenticates with email address and password. Neither are not stored."
("password" . ,passwd)
("scope" . "read write follow")))))
+(defun mastodon-auth--token ()
+ "Return `mastodon--api-token-string'."
+ mastodon--api-token-string)
+
(defun mastodon--access-token ()
"Return `mastodon--api-token-string'.
If not set, retrieves token with `mastodon--get-access-token'."
- (if mastodon--api-token-string
- mastodon--api-token-string
- (progn
- (mastodon--get-access-token)
- (while (not mastodon--api-token-string)
- (sleep-for 1)
- (mastodon--access-token))
- mastodon--api-token-string)))
+ (or (mastodon-auth--token)
+ (progn
+ (mastodon--get-access-token)
+ (or (mastodon-auth--token)
+ (progn
+ (sleep-for 2)
+ (mastodon--access-token))))))
(provide 'mastodon-auth)
;;; mastodon-auth.el ends here