use commons-codec for base64 to ensure Clojure 1.2.0-compat

cemerick · Mar 27, 2012 · f20990a · f20990a
1 parent 73d9282
commit f20990a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/project.clj b/project.clj
@@ -11,7 +11,7 @@
                  [org.mindrot/jbcrypt "0.3m"]
 
                  ;; http-basic
-                 [org.clojure/data.codec "0.1.0"]]
+                 [commons-codec "1.6"]]
   :dev-dependencies [[ring-mock "0.1.1"]]
   :profiles {:dev {:dependencies [[ring-mock "0.1.1"]]}
              :1.4 {:dependencies [[org.clojure/clojure "1.4.0-alpha1"]]}})

diff --git a/src/cemerick/friend/workflows.clj b/src/cemerick/friend/workflows.clj
@@ -1,7 +1,7 @@
 (ns cemerick.friend.workflows
-  (:require [cemerick.friend :as friend]
-            [clojure.data.codec.base64 :as base64])
-  (:use [clojure.string :only (trim)]))
+  (:require [cemerick.friend :as friend])
+  (:use [clojure.string :only (trim)])
+  (:import org.apache.commons.codec.binary.Base64))
 
 (defn find-credential-fn
   [local-credential-fn request workflow]
@@ -22,7 +22,7 @@
     (if-let [[[_ username password]] (try (-> (subs authorization 6)  ; trimming "Basic "
                                               trim
                                               (.getBytes "UTF-8")
-                                              base64/decode
+                                              Base64/decodeBase64
                                               (String. "UTF-8")
                                               (#(re-seq #"([^:]+):(.*)" %)))
                                          (catch Exception e
@@ -48,8 +48,7 @@
 
 (defn interactive-form
   [& {:keys [login-uri credential-fn login-failure-handler]
-      :or {login-uri "/login"
-           login-failure-handler #'interactive-form-deny}}]
+      :or {login-uri "/login"}}]
   (fn [{:keys [uri request-method params] :as request}]
     (when (and (= login-uri uri)
                (= :post request-method))
@@ -58,5 +57,6 @@
                                   ((find-credential-fn credential-fn request :interactive-form)
                                     (assoc creds ::friend/workflow :interactive-form)))]
           (assoc user-record ::friend/workflow :interactive-form)
-          (interactive-form-deny login-uri request))))))
+          ((or login-failure-handler
+               (partial #'interactive-form-deny login-uri)) request))))))