Changeset 9309 in josm for trunk/src/org/openstreetmap/josm/gui/oauth

Timestamp:

2016-01-04T20:51:45+01:00 (8 years ago)

Author:

simon04

Message:

see #12292 - Allow to disconnect HttpClient in connecting phase

Location:

trunk/src/org/openstreetmap/josm/gui/oauth

Files:

• OsmOAuthAuthorizationClient.java (modified) (9 diffs)
• TestAccessTokenTask.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -44 +44 @@
     private final OAuthProvider provider;
     private boolean canceled;
-    private HttpClient.Response connection;
+    private HttpClient connection;
 
     private static class SessionId {
@@ -183 +183 @@
 
     protected String extractToken() {
-        try (BufferedReader r = connection.getContentReader()) {
+        try (BufferedReader r = connection.getResponse().getContentReader()) {
             String c;
             Pattern p = Pattern.compile(".*authenticity_token.*value=\"([^\"]+)\".*");
@@ -200 +200 @@
 
     protected SessionId extractOsmSession() {
-        List<String> setCookies = connection.getHeaderFields().get("Set-Cookie");
+        List<String> setCookies = connection.getResponse().getHeaderFields().get("Set-Cookie");
         if (setCookies == null)
             // no cookies set
@@ -293 +293 @@
             URL url = new URL(sb.toString());
             synchronized (this) {
-                connection = HttpClient.create(url).connect();
+                connection = HttpClient.create(url);
+                connection.connect();
             }
             SessionId sessionId = extractOsmSession();
@@ -322 +323 @@
             synchronized (this) {
                 connection = HttpClient.create(url)
-                        .setHeader("Cookie", "_osm_session=" + sessionId.id + "; _osm_username=" + sessionId.userName)
-                        .connect();
+                        .setHeader("Cookie", "_osm_session=" + sessionId.id + "; _osm_username=" + sessionId.userName);
+                connection.connect();
             }
             sessionId.token = extractToken();
@@ -357 +358 @@
 
             synchronized (this) {
-                connection = client.connect();
+                connection = client;
+                connection.connect();
             }
 
@@ -364 +366 @@
             // an error page is sent to back to the user.
             //
-            int retCode = connection.getResponseCode();
+            int retCode = connection.getResponse().getResponseCode();
             if (retCode != HttpURLConnection.HTTP_MOVED_TEMP)
                 throw new OsmOAuthAuthorizationException(tr("Failed to authenticate user ''{0}'' with password ''***'' as OAuth user",
@@ -383 +385 @@
             URL url = new URL(buildOsmLogoutUrl());
             synchronized (this) {
-                connection = HttpClient.create(url).setMaxRedirects(-1).connect();
+                connection = HttpClient.create(url).setMaxRedirects(-1);
+                connection.connect();
             }
         } catch (IOException e) {
@@ -432 +435 @@
 
             synchronized (this) {
-                connection = client.connect();
-            }
-
-            int retCode = connection.getResponseCode();
+                connection = client;
+                connection.connect();
+            }
+
+            int retCode = connection.getResponse().getResponseCode();
             if (retCode != HttpURLConnection.HTTP_OK)
                 throw new OsmOAuthAuthorizationException(tr("Failed to authorize OAuth request  ''{0}''", requestToken.getKey()));

trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java

@@ -46 +46 @@
     private final Component parent;
     private final String apiUrl;
-    private HttpClient.Response connection;
+    private HttpClient connection;
 
     /**
@@ -107 +107 @@
             sign(client);
             synchronized (this) {
-                connection = client.connect();
+                connection = client;
+                connection.connect();
             }
 
-            if (connection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED)
+            if (connection.getResponse().getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED)
                 throw new OsmApiException(HttpURLConnection.HTTP_UNAUTHORIZED,
                         tr("Retrieving user details with Access Token Key ''{0}'' was rejected.", token.getKey()), null);
 
-            if (connection.getResponseCode() == HttpURLConnection.HTTP_FORBIDDEN)
+            if (connection.getResponse().getResponseCode() == HttpURLConnection.HTTP_FORBIDDEN)
                 throw new OsmApiException(HttpURLConnection.HTTP_FORBIDDEN,
                         tr("Retrieving user details with Access Token Key ''{0}'' was forbidden.", token.getKey()), null);
 
-            if (connection.getResponseCode() != HttpURLConnection.HTTP_OK)
-                throw new OsmApiException(connection.getResponseCode(), connection.getHeaderField("Error"), null);
-            Document d = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(connection.getContent());
+            if (connection.getResponse().getResponseCode() != HttpURLConnection.HTTP_OK)
+                throw new OsmApiException(connection.getResponse().getResponseCode(),
+                        connection.getResponse().getHeaderField("Error"), null);
+            Document d = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(connection.getResponse().getContent());
             return OsmServerUserInfoReader.buildFromXML(d);
         } catch (SAXException | ParserConfigurationException e) {