Changeset 18764 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java

Timestamp:

2023-06-20T19:40:11+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #22952, #23013: Improve methods for seeing who is logged in to OSM

This adds a Test Authentication button to the OAuth 2 panel and updates the
current UserIdentityManager to have the appropriate details. In addition, this
fixes a problem whereby a user logged in via OAuth 2 would not be able to log in
via OAuth 1.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (modified) (3 diffs)

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

@@ -283 +283 @@
                 // these want the OAuth 1.0 token information
                 btns.add(new JButton(new RenewAuthorisationAction(AuthorizationProcedure.FULLY_AUTOMATIC)));
-                btns.add(new JButton(new TestAuthorisationAction()));
-            }
+            }
+            btns.add(new JButton(new TestAuthorisationAction(oAuthVersion)));
             btns.add(new JButton(new RemoveAuthorisationAction()));
             gc.gridy = 4;
@@ -423 +423 @@
      */
     private class TestAuthorisationAction extends AbstractAction {
+        private final OAuthVersion oAuthVersion;
+
         /**
          * Constructs a new {@code TestAuthorisationAction}.
          */
-        TestAuthorisationAction() {
+        TestAuthorisationAction(OAuthVersion oAuthVersion) {
+            this.oAuthVersion = oAuthVersion;
             putValue(NAME, tr("Test Access Token"));
             putValue(SHORT_DESCRIPTION, tr("Click test access to the OSM server with the current access token"));
@@ -434 +437 @@
         @Override
         public void actionPerformed(ActionEvent evt) {
-            OAuthToken token = OAuthAccessTokenHolder.getInstance().getAccessToken();
-            OAuthParameters parameters = OAuthParameters.createFromApiUrl(OsmApi.getOsmApi().getServerUrl());
-            TestAccessTokenTask task = new TestAccessTokenTask(
-                    OAuthAuthenticationPreferencesPanel.this,
-                    apiUrl,
-                    parameters,
-                    token
-            );
-            MainApplication.worker.submit(task);
+            if (this.oAuthVersion == OAuthVersion.OAuth10a) {
+                OAuthToken token = OAuthAccessTokenHolder.getInstance().getAccessToken();
+                OAuthParameters parameters = OAuthParameters.createFromApiUrl(OsmApi.getOsmApi().getServerUrl());
+                TestAccessTokenTask task = new TestAccessTokenTask(
+                        OAuthAuthenticationPreferencesPanel.this,
+                        apiUrl,
+                        parameters,
+                        token
+                );
+                MainApplication.worker.submit(task);
+            } else {
+                IOAuthToken token = OAuthAccessTokenHolder.getInstance().getAccessToken(OsmApi.getOsmApi().getBaseUrl(), OAuthVersion.OAuth20);
+                TestAccessTokenTask task = new TestAccessTokenTask(
+                        OAuthAuthenticationPreferencesPanel.this,
+                        apiUrl,
+                        token.getParameters(),
+                        token
+                );
+                MainApplication.worker.submit(task);
+            }
         }
     }