Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass params submitted to launch-uri to authorization-uri #42

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Pass params submitted to launch-uri to authorization-uri #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
08d5180
Pass params submitted to launch-uri to authorization-uri
sbauch Feb 10, 2021
c7379b4
test cleanup from self review
sbauch Feb 10, 2021
93daf8e
concat query string instead of reading out params
sbauch Feb 17, 2021
6c3b405
Update src/ring/middleware/oauth2.clj
sbauch Feb 18, 2021
4e4d67a
improve test to ensure ampersand between query string and form encode…
sbauch Feb 24, 2021
3195404
merge upstream
sbauch Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/ring/middleware/oauth2.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
(defn- authorize-uri [profile request state]
(str (:authorize-uri profile)
(if (.contains ^String (:authorize-uri profile) "?") "&" "?")
(if (:query-string request) (str (:query-string request) "&"))
(codec/form-encode {:response_type "code"
:client_id (:client-id profile)
:redirect_uri (redirect-uri profile request)
Expand Down
7 changes: 7 additions & 0 deletions test/ring/middleware/oauth2_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@
location (get-in response [:headers "Location"])]
(is (.startsWith ^String location "https://example.com/oauth2/authorize?business_partner_id=XXXX&"))))

(deftest test-location-uri-with-dynamic-query
(let [profile test-profile
handler (wrap-oauth2 token-handler {:test profile})
response (handler (mock/request :post "/oauth2/test?hd=tenant.com"))
location (get-in response [:headers "Location"])]
(is (.contains ^String location "?hd=tenant.com&"))))

(def token-response
{:status 200
:headers {"Content-Type" "application/json"}
Expand Down