Permalink
Browse files

fixes #3, removes unnecessary login-uri config and adjusts test setup…

… accordingly
  • Loading branch information...
1 parent b485560 commit 54a8cb8128061576d87b6e10e99f1dda28a67495 @ddellacosta ddellacosta committed Mar 31, 2013
Showing with 4 additions and 4 deletions.
  1. +1 −2 src/friend_oauth2/workflow.clj
  2. +3 −2 test/friend_oauth2/workflow_facts.clj
@@ -48,8 +48,7 @@
;; or a login URL in the request, process it.
(if (or (= (:uri request)
(:path (:callback (:client-config config))))
- (= (:uri request)
- (or (config :login-uri) "/login")))
+ (= (:uri request) (config :login-uri)))
;; Steps 2 and 3:
;; accept auth code callback, get access_token (via POST)
@@ -34,8 +34,9 @@
;; Default workflow function with above config
(defn default-workflow-function [request-or-response]
((friend-oauth2/workflow {:client-config client-config-fixture
- :uri-config uri-config-fixture})
- request-or-response))
+ :uri-config uri-config-fixture
+ :login-uri "/login"}) ;; Friend provides this normally.
+ request-or-response))
(def identity-fixture
{:identity "my-access-token", :access_token "my-access-token"})

0 comments on commit 54a8cb8

Please sign in to comment.