Merge remote-tracking branch 'pelle/oauth'

Author: dakrone

Readme.md

@@ -117,6 +117,9 @@ More example requests:
 (client/get "http://site.com/protected" {:basic-auth ["user" "pass"]})
 (client/get "http://site.com/protected" {:basic-auth "user:pass"})
 
+;; OAuth 2
+(client/get "http://site.com/protected" {:oauth-token "secret-token" })
+
 ;; Query parameters
 (client/get "http://site.com/search" {:query-params {"q" "foo, bar"}})
 

src/clj_http/client.clj

@@ -306,6 +306,15 @@
                             (basic-auth-value basic-auth))))
       (client req))))
 
+(defn wrap-oauth [client]
+  (fn [req]
+    (if-let [oauth-token (:oauth-token req)]
+      (client (-> req (dissoc :oauth-token)
+                  (assoc-in [:headers "Authorization"]
+                            (str "Bearer " oauth-token))))
+      (client req))))
+
+
 (defn parse-user-info [user-info]
   (when user-info
     (str/split user-info #":")))
@@ -380,6 +389,7 @@
   (-> request
       wrap-query-params
       wrap-basic-auth
+      wrap-oauth
       wrap-user-info
       wrap-url
       wrap-redirects

test/clj_http/test/client.clj

@@ -279,6 +279,17 @@
   (is-passed client/wrap-basic-auth
              {:uri "/foo"}))
 
+(deftest apply-on-oauth
+  (is-applied client/wrap-oauth
+              {:oauth-token "my-token"}
+              {:headers {"Authorization"
+                         "Bearer my-token"}}))
+
+(deftest pass-on-no-oauth
+  (is-passed client/wrap-oauth
+             {:uri "/foo"}))
+
+
 (deftest apply-on-method
   (let [m-client (client/wrap-method identity)
         echo (m-client {:key :val :method :post})]