Changeset 36051 in osm for applications

Timestamp:

2023-02-09T14:37:12+01:00 (2 years ago)

Author:

taylor.smock

Message:

See #20768: OpenStreetMap OAuth2 support

The SdsCredentialAgent extends AbstractCredentialsAgent, which means it needed
to be updated.

The agent is used in one place, and does not call any of the new methods. As
such, the new methods will just throw an exception.

Location:

applications/editors/josm/plugins/sds

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/hot/sds/SdsCredentialAgent.java (modified) (8 diffs)

applications/editors/josm/plugins/sds/build.xml

@@ -5 +5 @@
     <property name="commit.message" value=""/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="18650"/>
 
     <property name="plugin.author" value="Frederik Ramm"/>

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsCredentialAgent.java

@@ -7 +7 @@
 import java.net.Authenticator.RequestorType;
 import java.net.PasswordAuthentication;
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 
 import javax.swing.text.html.HTMLEditorKit;
 
+import org.openstreetmap.josm.data.oauth.IOAuthToken;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
 import org.openstreetmap.josm.gui.io.CredentialDialog;
@@ -27 +28 @@
 public class SdsCredentialAgent extends AbstractCredentialsAgent {
 
-    Map<RequestorType, PasswordAuthentication> sdsMemoryCredentialsCache = new HashMap<>();
+    private final Map<RequestorType, PasswordAuthentication> sdsMemoryCredentialsCache = new EnumMap<>(RequestorType.class);
 
     /**
-     * @see CredentialsAgent#lookup(RequestorType)
+     * @see CredentialsAgent#lookup(RequestorType, String)
      */
     @Override
-    public PasswordAuthentication lookup(RequestorType requestorType, String host) throws CredentialsAgentException {
+    public PasswordAuthentication lookup(RequestorType requestorType, String host) {
         if (requestorType == null)
             return null;
@@ -56 +57 @@
 
     /**
-     * @see CredentialsAgent#store(RequestorType, PasswordAuthentication)
+     * @see CredentialsAgent#store(RequestorType, String, PasswordAuthentication)
      */
     @Override
@@ -87 +88 @@
      *
      * @return the current OAuth Access Token to access the OSM server.
-     * @throws CredentialsAgentException thrown if something goes wrong
      */
     @Override
-    public OAuthToken lookupOAuthAccessToken() throws CredentialsAgentException {
+    public OAuthToken lookupOAuthAccessToken() {
         String accessTokenKey = Config.getPref().get("oauth.access-token.key", null);
         String accessTokenSecret = Config.getPref().get("oauth.access-token.secret", null);
@@ -96 +96 @@
             return null;
         return new OAuthToken(accessTokenKey, accessTokenSecret);
+    }
+
+    @Override
+    public IOAuthToken lookupOAuthAccessToken(String host) {
+        throw new UnsupportedOperationException("SDS does not support OAuth tokens");
     }
 
@@ -123 +128 @@
 
     @Override
-    public void storeOAuthAccessToken(OAuthToken accessToken)
-            throws CredentialsAgentException {
+    public void storeOAuthAccessToken(OAuthToken accessToken) {
         // no-op
-
+    }
+
+    @Override
+    public void storeOAuthAccessToken(String host, IOAuthToken accessToken) {
+        throw new UnsupportedOperationException("SDS does not support OAuth tokens");
     }
 
@@ -158 +166 @@
          * (noSuccessWithLastResponse == true).
          */
-        } else if (noSuccessWithLastResponse || username.equals("") || password.equals("")) {
-            CredentialDialog dialog = null;
+        } else if (noSuccessWithLastResponse || "".equals(username) || "".equals(password)) {
+            CredentialDialog dialog;
             switch(requestorType) {
             case SERVER:
@@ -167 +175 @@
                 dialog = CredentialDialog.getHttpProxyCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText());
                 break;
+            default:
+                return null;
             }
             dialog.setVisible(true);