Changeset 18662 in josm

Timestamp:

2023-02-14T15:21:54+01:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22744, see #20768: Fix NPE when switching to authentication methods

The NPE occurs because the UI state and the saved preferences state does not
match. This is solved by saving the state to preferences and then reloading it.

This also fixes an issue where the http2 plugin would prevent the OAuth
workflow from working, due to differing default behaviors (see #22730).

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/oauth/OAuth20Authorization.java (modified) (1 diff)
• gui/preferences/server/AuthenticationPreferencesPanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/oauth/OAuth20Authorization.java

@@ -93 +93 @@
                         + (this.codeVerifier != null ? "&code_verifier=" + this.codeVerifier : "")
                 ).getBytes(StandardCharsets.UTF_8));
+                tradeCodeForToken.setHeader("Content-Type", "application/x-www-form-urlencoded");
                 try {
                     tradeCodeForToken.connect();

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

@@ -180 +180 @@
             } else if (rbOAuth.isSelected()) {
                 pnlAuthenticationParameters.add(pnlOAuthPreferences, BorderLayout.CENTER);
+                pnlOAuthPreferences.saveToPreferences();
+                pnlOAuthPreferences.initFromPreferences();
                 pnlOAuthPreferences.revalidate();
             } else if (rbOAuth20.isSelected()) {
                 pnlAuthenticationParameters.add(pnlOAuth20Preferences, BorderLayout.CENTER);
+                pnlOAuth20Preferences.saveToPreferences();
+                pnlOAuth20Preferences.initFromPreferences();
                 pnlOAuth20Preferences.revalidate();
             }