Fix changed authentication behavior.

cch1 · Apr 7, 2011 · a409899 · a409899
1 parent d17987c
commit a409899
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/src/clj/http/async/client/util.clj b/src/clj/http/async/client/util.clj
@@ -121,11 +121,17 @@
                        (ProxyServer. (proto-map protocol) host port user password)
                        (ProxyServer. (proto-map protocol) host port))))
 
+(defn- type->auth-scheme [type]
+  (or ({:basic Realm$AuthScheme/BASIC
+        :digest Realm$AuthScheme/DIGEST} type)
+      Realm$AuthScheme/BASIC))
+
 (defn set-realm
   "Sets realm on builder."
   [{:keys [type user password realm preemptive]
     :or {:type :basic}} b]
   (let [rbld (Realm$RealmBuilder.)]
+    (.setScheme rbld (type->auth-scheme type))
     (when (nil? user)
       (if (nil? password)
         (throw (IllegalArgumentException. "For authentication user and password is required"))
@@ -135,8 +141,7 @@
     (when (= :digest type)
       (when (nil? realm) (throw (IllegalArgumentException.
                                  "For DIGEST authentication realm is required")))
-      (.setRealmName rbld realm)
-      (.setScheme rbld Realm$AuthScheme/DIGEST))
+      (.setRealmName rbld realm))
     (when (not (nil? preemptive))
       (.setUsePreemptiveAuth rbld preemptive))
     (doto rbld

diff --git a/test/http/async/client/test.clj b/test/http/async/client/test.clj
@@ -483,18 +483,18 @@
        200)))
 
 ;; breaks with AsyncHttpClient 1.6.3
-;; (deftest preemptive-authentication
-;;   (is (=
-;;        (:code (status (GET "http://localhost:8123/preemptive-auth"
-;;                            :auth {:user "beastie"
-;;                                   :password "boys"})))
-;;        401))
-;;   (is (=
-;;        (:code (status (GET "http://localhost:8123/preemptive-auth"
-;;                            :auth {:user "beastie"
-;;                                   :password "boys"
-;; 				  :preemptive true})))
-;;        200)))
+(deftest preemptive-authentication
+  (is (=
+       (:code (status (GET "http://localhost:8123/preemptive-auth"
+                           :auth {:user "beastie"
+                                  :password "boys"})))
+       401))
+  (is (=
+       (:code (status (GET "http://localhost:8123/preemptive-auth"
+                           :auth {:user "beastie"
+                                  :password "boys"
+				  :preemptive true})))
+       200)))
 
 (deftest canceling-request
   (let [resp (GET "http://localhost:8123/")]