Changeset 11194 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-10-30T18:14:52+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #13872 - use authentication only if OAuth is configured properly

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.auth.CredentialsAgentException;
+import org.openstreetmap.josm.io.auth.CredentialsManager;
 import org.openstreetmap.josm.tools.HttpClient;
 
@@ -29 +31 @@
 public abstract class OsmServerReader extends OsmConnection {
     private final OsmApi api = OsmApi.getOsmApi();
-    private boolean doAuthenticate = OsmApi.isUsingOAuth();
+    private boolean doAuthenticate;
     protected boolean gpxParsedProperly;
+
+    /**
+     * Constructs a new {@code OsmServerReader}.
+     */
+    public OsmServerReader() {
+        try {
+            doAuthenticate = OsmApi.isUsingOAuth() && CredentialsManager.getInstance().lookupOAuthAccessToken() != null;
+        } catch (CredentialsAgentException e) {
+            Main.warn(e);
+        }
+    }
 
     /**