openid works in servlet context

cemerick · Mar 29, 2013 · 26ef881 · 26ef881
1 parent 2bb8807
commit 26ef881
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/cemerick/friend.clj b/src/cemerick/friend.clj
@@ -146,7 +146,7 @@ Equivalent to (complement current-authentication)."}
           resp (response/redirect-after-post
                  (or unauthorized-uri
                      (and (string? redirect) redirect)
-                     (-> request ::auth-config :default-landing-uri)))]
+                      (str (:context request) (-> request ::auth-config :default-landing-uri ))))]
       (if unauthorized-uri
         (-> resp
           (assoc :session (:session request))

diff --git a/src/cemerick/friend/openid.clj b/src/cemerick/friend/openid.clj
@@ -4,6 +4,7 @@
             [cemerick.friend.util :as util]
             clojure.walk
             ring.util.response
+            [ring.util.request :as req]
             [clojure.core.cache :as cache])
   (:use clojure.core.incubator
         [cemerick.friend.util :only (gets)])
@@ -103,8 +104,8 @@
                   (.setAssociations (InMemoryConsumerAssociationStore.))
                   (.setNonceVerifier (InMemoryNonceVerifier. (/ max-nonce-age 1000)))))
         discovery-cache (atom (cache/ttl-cache-factory {} :ttl max-nonce-age))]
-    (fn [{:keys [uri request-method params] :as request}]
-      (when (= uri openid-uri)
+    (fn [{:keys [ request-method params] :as request}]
+      (when (=  (req/path-info request) openid-uri)
         (let [params (clojure.walk/stringify-keys params)
               user-identifier (and (= request-method :post)
                                    (get params (name user-identifier-param)))]