diff --git a/test/metabase/http_client.clj b/test/metabase/http_client.clj
index 9cba88574736bddcb9af15af182bbed85bc05848..697a262a0a7890bb41203a9626f288e71d5e6174 100644
--- a/test/metabase/http_client.clj
+++ b/test/metabase/http_client.clj
@@ -2,7 +2,8 @@
"HTTP client for making API calls against the Metabase API. For test/REPL purposes."
(:require [clojure.data.json :as json]
[clj-http.client :as client]
- [metabase.util :as u]))
+ [metabase.util :as u])
+ (:import com.metabase.corvus.api.ApiException))
(declare authenticate
auto-deserialize-dates
@@ -16,7 +17,7 @@
"http://localhost:3000/api/")
(defn
- ^{:arglists ([credentials-map? method expected-status-code? url http-body-map? & url-kwargs])}
+ ^{:arglists ([credentials? method expected-status-code? url http-body-map? & url-kwargs])}
client
"Perform an API call and return the response (for test purposes).
The first arg after URL will be passed as a JSON-encoded body if it is a map.
@@ -30,14 +31,15 @@
Args:
- * CREDENTIALS-MAP Optional map of `:email` and `:password` of a User whose credentials we should perform the request with.
+ * CREDENTIALS Optional map of `:email` and `:password` or `X-METABASE-SESSION` token of a User who we should perform the request as
* METHOD `:get`, `:post`, `:delete`, or `:put`
* EXPECTED-STATUS-CODE When passed, throw an exception if the response has a different status code.
* URL Base URL of the request, which will be appended to `*url-prefix*`. e.g. `card/1/favorite`
* HTTP-BODY-MAP Optional map to send a the JSON-serialized HTTP body of the request
* URL-KWARGS key-value pairs that will be encoded and added to the URL as GET params"
[& args]
- (let [[credentials [method & args]] (u/optional map? args)
+ (let [[credentials [method & args]] (u/optional #(or (map? %)
+ (string? %)) args)
[expected-status [url & args]] (u/optional integer? args)
[body [& {:as url-param-kwargs}]] (u/optional map? args)]
(-client credentials method expected-status url body url-param-kwargs)))
@@ -48,7 +50,8 @@
(defn- -client [credentials method expected-status url http-body url-param-kwargs]
;; Since the params for this function can get a little complicated make sure we validate them
{:pre [(or (nil? credentials)
- (map? credentials))
+ (map? credentials)
+ (string? credentials))
(contains? #{:get :post :put :delete} method)
(or (nil? expected-status)
(integer? expected-status))
@@ -60,7 +63,8 @@
(let [request-map {:content-type :json
:accept :json
- :headers {"X-METABASE-SESSION" (when credentials (authenticate credentials))}
+ :headers {"X-METABASE-SESSION" (when credentials (if (map? credentials) (authenticate credentials)
+ credentials))}
:body (json/write-str http-body)}
request-fn (case method
:get client/get
@@ -87,7 +91,7 @@
clojure.walk/keywordize-keys)
(catch Exception _ body))]
(clojure.pprint/pprint body)
- (throw (Exception. message)))))
+ (throw (ApiException. status message)))))
;; Deserialize the JSON response or return as-is if that fails
(try (-> body
@@ -97,7 +101,7 @@
(catch Exception _
body))))
-(defn- authenticate [{:keys [email password] :as credentials}]
+(defn authenticate [{:keys [email password] :as credentials}]
{:pre [(string? email)
(string? password)]}
(try
diff --git a/test/metabase/test_data.clj b/test/metabase/test_data.clj
index 6d5b5f9471a063f6cfbc2065e0f55bdc289fd19d..5d89201c26dc4c7e45197084d8525c9c3ced780c 100644
--- a/test/metabase/test_data.clj
+++ b/test/metabase/test_data.clj
@@ -8,7 +8,8 @@
[org-perm :refer [OrgPerm]]
[table :refer [Table]]
[user :refer [User]])
- [metabase.test-data.load :as load]))
+ [metabase.test-data.load :as load])
+ (:import com.metabase.corvus.api.ApiException))
(declare fetch-or-create-user
tables
@@ -122,17 +123,28 @@
{:pre [(contains? usernames username)]}
(:id (fetch-user username)))))
-(def user->client
- "Returns a `metabase.http-client/client` partially bound with the credentials for User with USERNAME.
- In addition, it forces lazy creation of the User if needed.
-
- ((user->client) :get 200 \"meta/table\")"
- (memoize
- (fn [username]
- {:pre [(contains? usernames username)]}
- ;; Force lazy creation of User if need be
- (user->id username)
- (partial http/client (user->credentials username)))))
+(let [tokens (atom {})
+ user->token (fn [user]
+ (or (@tokens user)
+ (let [token (http/authenticate (user->credentials user))]
+ (swap! tokens assoc user token)
+ token)))]
+ (defn user->client
+ "Returns a `metabase.http-client/client` partially bound with the credentials for User with USERNAME.
+ In addition, it forces lazy creation of the User if needed.
+
+ ((user->client) :get 200 \"meta/table\")"
+ [username]
+ ;; Force lazy creation of User if need be
+ (user->id username)
+ (fn call-client [& args]
+ (try
+ (apply http/client (user->token username) args)
+ (catch ApiException e
+ (if-not (= (.getStatusCode e) 401) (throw e)
+ ;; If we got a 401 unauthenticated clear the tokens cache + recur
+ (do (reset! tokens {})
+ (apply call-client args))))))))
(defn user->org-perm
"Return the `OrgPerm` for User with USERNAME for the Test Org."