diff options
author | James Moger <james.moger@gitblit.com> | 2014-09-04 11:48:22 -0400 |
---|---|---|
committer | James Moger <james.moger@gitblit.com> | 2014-09-04 11:48:22 -0400 |
commit | c70fcce5db7172a9c0a1f1347ef5db1453e23350 (patch) | |
tree | 537b5eff394b9e59d9b32f69d0204b434ab90e25 | |
parent | 8b1d0aed40b4fc3ed5b30aa824a4c2924b788454 (diff) | |
parent | 2445d4b2b80671bdcefbd4ed81f394a5249ee13d (diff) | |
download | gitblit-c70fcce5db7172a9c0a1f1347ef5db1453e23350.tar.gz gitblit-c70fcce5db7172a9c0a1f1347ef5db1453e23350.zip |
Merge branch 'ticket/143' into develop
-rw-r--r-- | src/main/java/com/gitblit/auth/RedmineAuthProvider.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/auth/RedmineAuthProvider.java b/src/main/java/com/gitblit/auth/RedmineAuthProvider.java index 7e957ecb..e505a54d 100644 --- a/src/main/java/com/gitblit/auth/RedmineAuthProvider.java +++ b/src/main/java/com/gitblit/auth/RedmineAuthProvider.java @@ -153,15 +153,16 @@ public class RedmineAuthProvider extends UsernamePasswordAuthenticationProvider if (!url.endsWith("/")) { url = url.concat("/"); } + String apiUrl = url + "users/current.json"; + HttpURLConnection http; if (username == null) { // apikey authentication String apiKey = String.valueOf(password); - String apiUrl = url + "users/current.json?key=" + apiKey; http = (HttpURLConnection) ConnectionUtils.openConnection(apiUrl, null, null); + http.addRequestProperty("X-Redmine-API-Key", apiKey); } else { // username/password BASIC authentication - String apiUrl = url + "users/current.json"; http = (HttpURLConnection) ConnectionUtils.openConnection(apiUrl, username, password); } http.setRequestMethod("GET"); |