Fix #23707: Remove basic auth for openstreetmap.org

This does the following:
* On startup, if the current API is set to the default OSM API url,
  `osm-server.{auth-method|username|password}` are set to `null`, clearing them
   from the saved preferences.xml file.
* In preferences, if the OSM API is set to the default OSM API url, the basic
  auth radio button is disabled (if it is not currently selected or the current
  auth method). This is done since some users contribute to both OSM and some
  other project, which may still support basic authentication.

git-svn-id: https://josm.openstreetmap.de/svn/trunk@19095 0c6e7542-c601-0410-84e7-c038aed88b3b

Author: taylor.smock

src/org/openstreetmap/josm/data/Preferences.java

@@ -37,11 +37,13 @@
 
 import org.openstreetmap.josm.data.preferences.ColorInfo;
 import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
+import org.openstreetmap.josm.data.preferences.JosmUrls;
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.data.preferences.PreferencesReader;
 import org.openstreetmap.josm.data.preferences.PreferencesWriter;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.io.NetworkManager;
+import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.spi.preferences.AbstractPreferences;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.DefaultPreferenceChangeEvent;
@@ -910,6 +912,12 @@ private void removeAndUpdateObsolete(int loadedVersion) {
             }
             modifiedDefault = false;
         }
+        // As of June 1st, 2024, the OSM.org instance no longer allows basic authentication.
+        if (JosmUrls.getInstance().getDefaultOsmApiUrl().equals(OsmApi.getOsmApi().getServerUrl()) && "basic".equals(OsmApi.getAuthMethod())) {
+            put("osm-server.auth-method", null);
+            put("osm-server.username", null);
+            put("osm-server.password", null);
+        }
     }
 
     /**

src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java

@@ -17,7 +17,6 @@
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 
-import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.data.UserIdentityManager;
 import org.openstreetmap.josm.data.oauth.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.data.oauth.OAuthVersion;
@@ -47,15 +46,6 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
     /** the panel for the OAuth 2.0 authentication parameters */
     private OAuthAuthenticationPreferencesPanel pnlOAuth20Preferences;
 
-    /** Used to determine which API we are using for disabling/enabling Basic Auth/OAuth 1.0a */
-    private String apiUrl = OsmApi.getOsmApi().getServerUrl();
-    /** ExpertToggleAction uses weak references; we don't want this listener to be garbage collected */
-    private final ExpertToggleAction.ExpertModeChangeListener expertModeChangeListener = isExpert -> {
-        final String authMethod = OsmApi.getAuthMethod();
-        final boolean defaultApi = JosmUrls.getInstance().getDefaultOsmApiUrl().equals(apiUrl);
-        rbBasicAuthentication.setEnabled(rbBasicAuthentication.isSelected() || "basic".equals(authMethod) || isExpert || !defaultApi);
-    };
-
     /**
      * Constructs a new {@code AuthenticationPreferencesPanel}.
      */
@@ -108,9 +98,8 @@ protected final void build() {
         pnlBasicAuthPreferences = new BasicAuthenticationPreferencesPanel();
         pnlOAuth20Preferences = new OAuthAuthenticationPreferencesPanel(OAuthVersion.OAuth20);
 
-        ExpertToggleAction.addExpertModeChangeListener(expertModeChangeListener, true);
-
         pnlAuthenticationParameters.add(pnlOAuth20Preferences, BorderLayout.CENTER);
+        this.updateAcceptableAuthenticationMethods(OsmApi.getOsmApi().getServerUrl());
     }
 
     /**
@@ -166,7 +155,6 @@ public final void saveToPreferences() {
                 UserIdentityManager.getInstance().setAnonymous();
             }
         }
-        ExpertToggleAction.removeExpertModeChangeListener(this.expertModeChangeListener);
     }
 
     /**
@@ -195,8 +183,18 @@ public void propertyChange(PropertyChangeEvent evt) {
             pnlOAuth20Preferences.propertyChange(evt);
         }
         if (OsmApiUrlInputPanel.API_URL_PROP.equals(evt.getPropertyName())) {
-            this.apiUrl = (String) evt.getNewValue();
-            this.expertModeChangeListener.expertChanged(ExpertToggleAction.isExpert());
+            this.updateAcceptableAuthenticationMethods((String) evt.getNewValue());
         }
     }
+
+    /**
+     * Update the acceptable authentications methods
+     * @param apiUrl The API url to check
+     */
+    private void updateAcceptableAuthenticationMethods(String apiUrl) {
+        final String authMethod = OsmApi.getAuthMethod();
+        final boolean defaultApi = JosmUrls.getInstance().getDefaultOsmApiUrl().equals(apiUrl);
+        rbBasicAuthentication.setEnabled(rbBasicAuthentication.isSelected() || "basic".equals(authMethod) || !defaultApi);
+    }
+
 }