Allow to override Authorization and Content-Type request headers

Author: phmeier-nubank

src/clj_github/httpkit_client.clj

@@ -22,8 +22,9 @@
       (assoc :method method)
       (assoc-some :body (and body (cheshire/generate-string body)))
       (assoc :url (append-url-path github-url path))
-      (assoc-in [:headers "Content-Type"] "application/json")
-      (assoc-in [:headers "Authorization"] (str "Bearer " (token-fn)))))
+      ;; TODO http headers are case insensitive, also this could be keywords
+      (update-in [:headers "Content-Type"] #(or % "application/json"))
+      (update-in [:headers "Authorization"] #(or % (str "Bearer " (token-fn))))))
 
 (defn- parse-body [content-type body]
   (if (and content-type (re-find #"application/json" content-type))
@@ -43,7 +44,8 @@
                       {:response (select-keys response [:status :body])}
                       (:error response))))))
 
-(defn new-client [{:keys [app-id private-key token org] :as opts}]
+(defn new-client [{:keys [app-id private-key token org token-fn] :as opts}]
+  {:pre [(or token app-id token-fn)]}
   (cond
     token
     {:token-fn (constantly token)}

test/clj_github/httpkit_client_test.clj

@@ -47,4 +47,28 @@
         (with-fake-http [{} {:error cause :status nil}]
           (let [e (try (sut/request client {}) (catch Exception e e))]
             (is (re-matches #"(?i)Request to GitHub failed" (.getMessage e)))
-            (is (= cause (.getCause e)))))))))
+            (is (= cause (.getCause e)))))))
+    (testing "request headers"
+      (testing "Can use custom headers"
+        (with-fake-http [(fn [req]
+                           (is (= "test" (get-in req [:headers "Test-Header"]))))
+                         {:status 200}]
+          ;; assertion is in fake http callback
+          (sut/request client {:headers {"Test-Header" "test"}})))
+      (testing "Can override authentication"
+        ;; clj-github sets authorization header unless specified. Beware that the
+        ;; implementation here is case sensitive whereas HTTP headers are not.
+        (with-fake-http [(fn [req]
+                           (is (= "Test SomeValue" (get-in req [:headers "Authorization"]))))
+                         {:status 200}]
+          ;; assertion is in fake http callback
+          (sut/request client {:headers {"Authorization" "Test SomeValue"}})))
+      (testing "Can override content-type"
+        ;; clj-github sets the content-type header unless specified. Beware that the
+        ;; implementation here is case sensitive whereas HTTP headers are not.
+        (with-fake-http [(fn [req]
+                           (is (= "test/test" (get-in req [:headers "Content-Type"]))))
+                         {:status 200}]
+          ;; assertion is in fake http callback
+          (sut/request client {:headers {"Content-Type" "test/test"}}))))))
+