Changeset 18764 in josm for trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.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/oauth/TestAccessTokenTask.java (modified) (12 diffs)

trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java

@@ -12 +12 @@
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.openstreetmap.josm.data.oauth.IOAuthParameters;
+import org.openstreetmap.josm.data.oauth.IOAuthToken;
+import org.openstreetmap.josm.data.oauth.OAuth20Token;
 import org.openstreetmap.josm.data.oauth.OAuthParameters;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
@@ -42 +45 @@
  */
 public class TestAccessTokenTask extends PleaseWaitRunnable {
-    private final OAuthToken token;
-    private final OAuthParameters oauthParameters;
+    private final OAuthToken tokenOAuth1;
+    private final IOAuthToken tokenOAuth2;
+    private final IOAuthParameters oauthParameters;
     private boolean canceled;
     private final Component parent;
@@ -62 +66 @@
         CheckParameterUtil.ensureParameterNotNull(parameters, "parameters");
         CheckParameterUtil.ensureParameterNotNull(accessToken, "accessToken");
-        this.token = accessToken;
+        this.tokenOAuth1 = accessToken;
+        this.tokenOAuth2 = null;
+        this.oauthParameters = parameters;
+        this.parent = parent;
+        this.apiUrl = apiUrl;
+    }
+
+    /**
+     * Create the task
+     *
+     * @param parent the parent component relative to which the  {@link PleaseWaitRunnable}-Dialog is displayed
+     * @param apiUrl the API URL. Must not be null.
+     * @param parameters the OAuth parameters. Must not be null.
+     * @param accessToken the Access Token. Must not be null.
+     * @since xxx
+     */
+    public TestAccessTokenTask(Component parent, String apiUrl, IOAuthParameters parameters, IOAuthToken accessToken) {
+        super(parent, tr("Testing OAuth Access Token"), false /* don't ignore exceptions */);
+        CheckParameterUtil.ensureParameterNotNull(apiUrl, "apiUrl");
+        CheckParameterUtil.ensureParameterNotNull(parameters, "parameters");
+        CheckParameterUtil.ensureParameterNotNull(accessToken, "accessToken");
+        this.tokenOAuth1 = null;
+        this.tokenOAuth2 = accessToken;
         this.oauthParameters = parameters;
         this.parent = parent;
@@ -84 +110 @@
 
     protected void sign(HttpClient con) throws OAuthException {
-        OAuthConsumer consumer = oauthParameters.buildConsumer();
-        consumer.setTokenWithSecret(token.getKey(), token.getSecret());
-        consumer.sign(con);
+        if (oauthParameters instanceof OAuthParameters) {
+            OAuthConsumer consumer = ((OAuthParameters) oauthParameters).buildConsumer();
+            consumer.setTokenWithSecret(tokenOAuth1.getKey(), tokenOAuth1.getSecret());
+            consumer.sign(con);
+        } else {
+            try {
+                this.tokenOAuth2.sign(con);
+            } catch (org.openstreetmap.josm.data.oauth.OAuthException e) {
+                // Adapt our OAuthException to the SignPost OAuth exception
+                throw new OAuthException(e) {};
+            }
+        }
     }
 
@@ -114 +149 @@
             }
 
+            final String oauthKey = getAuthKey();
             if (connection.getResponse().getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED)
                 throw new OsmApiException(HttpURLConnection.HTTP_UNAUTHORIZED,
-                        tr("Retrieving user details with Access Token Key ''{0}'' was rejected.", token.getKey()), null);
+                        tr("Retrieving user details with Access Token Key ''{0}'' was rejected.",
+                                oauthKey), null);
 
             if (connection.getResponse().getResponseCode() == HttpURLConnection.HTTP_FORBIDDEN)
                 throw new OsmApiException(HttpURLConnection.HTTP_FORBIDDEN,
-                        tr("Retrieving user details with Access Token Key ''{0}'' was forbidden.", token.getKey()), null);
+                        tr("Retrieving user details with Access Token Key ''{0}'' was forbidden.", oauthKey), null);
 
             if (connection.getResponse().getResponseCode() != HttpURLConnection.HTTP_OK)
@@ -146 +183 @@
                         + "You are accessing the OSM server as user ''{2}'' with id ''{3}''."
                         + "</html>",
-                        token.getKey(),
+                        getAuthKey(),
                         apiUrl,
                         Utils.escapeReservedCharactersHTML(userInfo.getDisplayName()),
@@ -167 +204 @@
                         +"</html>",
                         apiUrl,
-                        token.getKey()
+                        getAuthKey()
                 ),
                 tr("Test failed"),
@@ -185 +222 @@
                         +"</html>",
                         apiUrl,
-                        token.getKey()
+                        getAuthKey()
                 ),
                 tr("Token allows restricted access"),
@@ -204 +241 @@
                         +"</html>",
                         apiUrl,
-                        token.getKey()
+                        getAuthKey()
                 ),
                 tr("Test failed"),
@@ -221 +258 @@
                         +"</html>",
                         apiUrl,
-                        token.getKey()
+                        getAuthKey()
                 ),
                 tr("Test failed"),
@@ -237 +274 @@
                         + "</html>",
                         apiUrl,
-                        token.getKey()
+                        getAuthKey()
                 ),
                 tr("Test failed"),
@@ -276 +313 @@
         }
     }
+
+    private String getAuthKey() {
+        if (this.tokenOAuth1 != null) {
+            return this.tokenOAuth1.getKey();
+        }
+        if (this.tokenOAuth2 instanceof OAuth20Token) {
+            return ((OAuth20Token) this.tokenOAuth2).getBearerToken();
+        }
+        throw new IllegalArgumentException("Only OAuth1 and OAuth2 tokens are understood: " + this.tokenOAuth2);
+    }
 }