Rewrite mastodon-auth

- Remove client functions
- Use mastodon-http--post
- No more callback spaghetti

3 files changed, 37 insertions, 129 deletions

diff --git a/test/mastodon-auth-tests.el b/test/mastodon-auth-tests.el
index b3edea8..e46f1a6 100644
--- a/test/mastodon-auth-tests.el
+++ b/test/mastodon-auth-tests.el
@@ -1,132 +1,40 @@
 (require 'el-mock)
 
-(ert-deftest mastodon-auth:token-file ()
-  "Should return `mastodon-token-file' value."
-  (should (string= (mastodon-auth--token-file) "~/.emacs.d/mastodon.plstore")))
-
-(ert-deftest mastodon-auth:registration-success ()
-  "Should set `mastodon--client-app-plist' on succesful registration."
-  (let ((hash (make-hash-table :test 'equal))
-        (client-plist '(:client_id "client-id" :client_secret "client-secret")))
-    (puthash "client_id" "client-id" hash)
-    (puthash "client_secret" "client-secret" hash)
-    (with-mock
-      (stub mastodon--json-hash-table => hash)
-      (mastodon-auth--registration-success)
-      (should (equal client-plist mastodon--client-app-plist)))))
-
-(ert-deftest mastodon-auth:register-client-app ()
-  "Should POST client data to /apps endpoint and return client plist."
-  (let ((app-plist '("id" "id-val" "secret" "secret-val")))
-    (with-mock
-      (mock (mastodon--api-for "apps") => "https://instance/api/v1/apps")
-      (mock (mastodon--register-client-app-triage "status") => app-plist)
-      (mock (mastodon--http-post "https://instance/api/v1/apps"
-                                 'mastodon--register-client-app-triage
-                                 '(("client_name" . "mastodon.el")
-                                   ("redirect_uris" . "urn:ietf:wg:oauth:2.0:oob")
-                                   ("scopes" . "read write follow")
-                                   ("website" . "https://github.com/jdenen/mastodon.el")))
-            => (funcall 'mastodon--register-client-app-triage "status"))
-      (should (eq app-plist (mastodon--register-client-app))))))
-
-(ert-deftest mastodon-auth:register-client-app-triage ()
-  "Should wrap `mastodon--http-response-triage' call and return client plist."
-  (let ((app-plist '("id" "id-val" "secret" "secret-val")))
-    (with-mock
-      (mock (mastodon-auth--registration-success) => app-plist)
-      (mock (mastodon--http-response-triage "status" 'mastodon-auth--registration-success)
-            => (funcall 'mastodon-auth--registration-success))
-      (should (eq app-plist (mastodon--register-client-app-triage "status"))))))
-
-(ert-deftest mastodon-auth:register-and-return-client-app:with-p ()
-  "Should return a plist of client_id and client_secret without registration."
-  (let ((app-plist '(:client_id "id-val" :client_secret "secret-val")))
-    (with-mock
-      (mock (mastodon-auth--client-app-secret-p) => t)
-      (mock (mastodon-auth--client) => app-plist)
-      (stub mastodon-auth--registration-success => mastodon--client-app-plist)
-      (not-called sleep-for)
-      (should (equal app-plist (mastodon--register-and-return-client-app))))))
-
-(defun helper:read-plstore (file key)
-  (let* ((plstore (plstore-open file))
-         (masto (delete "mastodon" (plstore-get plstore "mastodon"))))
-    (progn
-      (plstore-close plstore)
-      (plist-get masto key))))
-
-(ert-deftest mastodon-auth:store-client-id-and-secret ()
-  "Should create plstore from client plist. Should return plist."
-  (let ((app-plist '(:client_id "id-val" :client_secret "secret-val")))
-    (with-mock
-      (mock (mastodon--register-and-return-client-app) => app-plist)
-      (mock (mastodon-auth--token-file) => "stubfile.plstore")
-      (should (eq app-plist (mastodon--store-client-id-and-secret)))
-      (should (string= (helper:read-plstore (mastodon-auth--token-file) :client_id) "id-val"))
-      (should (string= (helper:read-plstore (mastodon-auth--token-file) :client_secret) "secret-val")))))
-
-(ert-deftest mastodon-auth:client-app:memoized ()
-  "Should return `mastodon--client-app-plist' if it has a :client_secret."
-  (with-mock
-    (mock (plist-get mastodon--client-app-plist :client_secret) => t)
-    (should (eq (mastodon--client-app) mastodon--client-app-plist))))
-
-(ert-deftest mastodon-auth:client-app:stored ()
-  "Should retrieve from `mastodon-token-file' if not memoized."
+(ert-deftest generate-token ()
+  ""
   (with-mock
-    (stub plist-get)
-    (mock (mastodon-auth--token-file) => "fixture/client.plstore")
-    (should (equal (mastodon--client-app) '(:client_id "id" :client_secret "secret")))))
-
-(ert-deftest mastodon-auth:client-app:generated ()
-  "Should generate `mastodon--client-app-plist' if not memoized or stored."
-  (with-mock
-    (stub plist-get)
-    (mock (mastodon-auth--token-file) => "fixture/empty.plstore")
-    (mock (mastodon--store-client-id-and-secret))
-    (mastodon--client-app)))
-
-(ert-deftest mastodon-auth:get-token-success ()
-  "Should return access token from `url-retrieve' response JSON."
-  (let ((hash (make-hash-table :test 'equal)))
-    (puthash "access_token" "token-value" hash)
-    (with-mock
-      (mock (mastodon--json-hash-table) => hash)
-      (should (string= (mastodon-auth--get-token-success) "token-value")))))
-
-(ert-deftest mastodon-auth:get-access-token-triage ()
-  "Should wrap `mastodon--http-response-triage'."
-  (with-mock
-    (mock (mastodon--http-response-triage "status" 'mastodon-auth--get-token-success))
-    (mastodon--get-access-token-triage "status")))
-
-(ert-deftest mastodon-auth:get-access-token ()
-  "Should POST auth data to retrieve access token."
-  (let ((client-app '(:client_id "id" :client_secret "secret")))
-    (with-mock
-      (mock (mastodon-auth--user-and-passwd) => (cons "email" "password"))
-      (mock (mastodon--client-app) => client-app)
-      (mock (mastodon--http-post "https://mastodon.social/oauth/token"
-                                 'mastodon--get-access-token-triage
+    (let ((mastodon-instance-url "https://instance.url"))
+      (mock (mastodon-client) => '(:client_id "id" :client_secret "secret"))
+      (mock (read-string "Email: ") => "foo@bar.com")
+      (mock (read-passwd "Password: ") => "password")
+      (mock (mastodon-http--post "https://instance.url/oauth/token"
                                  '(("client_id" . "id")
                                    ("client_secret" . "secret")
-                                   ("grant_type" . "password")
-                                   ("username" . "email")
-                                   ("password" . "password")
-                                   ("scope" . "read write follow"))))
-      (mastodon--get-access-token))))
-
-(ert-deftest mastodon-auth:access-token:memoized ()
-  "Should return `mastodon--api-token-string' if set."
-  (with-mock
-    (mock (mastodon-auth--token) => "foobar")
-    (should (string= (mastodon--access-token) "foobar"))))
-
-(ert-deftest mastodon-auth:access-token:generated ()
-  "Should generate `mastodon--api-token-string' if not memoized."
-  (with-mock
-    (mock (mastodon-auth--token) => nil)
-    (mock (mastodon--get-access-token)
-          => (mock (mastodon-auth--token) => "foobar"))
-    (should (string= (mastodon--access-token) "foobar"))))
+                                    ("grant_type" . "password")
+                                    ("username" . "foo@bar.com")
+                                    ("password" . "password")
+                                    ("scope" . "read write follow"))
+                                 nil))
+      (mastodon-auth--generate-token))))
+
+(ert-deftest get-token ()
+  ""
+  (with-temp-buffer
+    (with-mock
+      (mock (mastodon-auth--generate-token) => (progn
+                                                  (insert "\n\n{\"access_token\":\"abcdefg\"}")
+                                                  (current-buffer)))
+      (should (equal (mastodon-auth--get-token) '(:access_token "abcdefg"))))))
+
+(ert-deftest access-token-1 ()
+  ""
+  (let ((mastodon-auth--token "foobar"))
+    (should (string= (mastodon-auth--access-token) "foobar"))))
+
+(ert-deftest access-token-2 ()
+  ""
+  (let ((mastodon-auth--token nil))
+    (with-mock
+      (mock (mastodon-auth--get-token) => '(:access_token "foobaz"))
+      (should (string= (mastodon-auth--access-token) "foobaz"))
+      (should (string= mastodon-auth--token "foobaz")))))
diff --git a/test/mastodon-http-tests.el b/test/mastodon-http-tests.el
index 06b92d5..972cedb 100644
--- a/test/mastodon-http-tests.el
+++ b/test/mastodon-http-tests.el
@@ -5,5 +5,5 @@
   (let ((callback-double (lambda () "double")))
     (with-mock
       (mock (url-retrieve-synchronously "https://foo.bar/baz"))
-      (mock (mastodon--access-token) => "test-token")
+      (mock (mastodon-auth--access-token) => "test-token")
       (mastodon-http--get "https://foo.bar/baz"))))
diff --git a/test/mastodon-toot-tests.el b/test/mastodon-toot-tests.el
index eae9e89..ca04ae8 100644
--- a/test/mastodon-toot-tests.el
+++ b/test/mastodon-toot-tests.el
@@ -10,7 +10,7 @@
     (stub mastodon--api-for => "https://instance/api/v/statuses")
     (stub buffer-string => "This is a test toot")
     (stub kill-buffer-and-window)
-    (stub mastodon--access-token => "access-token-string")
+    (stub mastodon-auth--access-token => "access-token-string")
     (mock (mastodon--http-post "https://instance/api/v/statuses"
                                'mastodon-toot--send-triage
                                '(("status" . "This is a test toot"))