Changeset 9313 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-01-04T23:40:53+01:00 (8 years ago)

Author:

simon04

Message:

fix #8050 - Make OSM API OAuth and imagery HTTP authentication work

Fix: When using OAuth for access to API server, imagery requiring username/password will not prompt for username and password

File:

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

trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java

@@ -6 +6 @@
 import java.util.EnumMap;
 import java.util.Map;
+import java.util.Objects;
 
 import org.openstreetmap.josm.Main;
@@ -47 +48 @@
             return null;
         try {
-            if (getRequestorType().equals(Authenticator.RequestorType.SERVER) && OsmApi.isUsingOAuth()) {
+            if (OsmApi.isUsingOAuth()
+                    && Objects.equals(OsmApi.getOsmApi().getHost(), getRequestingHost())
+                    && RequestorType.SERVER.equals(getRequestorType())) {
                 // if we are working with OAuth we don't prompt for a password
                 return null;