Ticket #7612: 7612-v2.patch

src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

@@ -14 +14 @@
 import java.io.IOException;
 import java.net.Authenticator.RequestorType;
 import java.net.PasswordAuthentication;
+import java.util.concurrent.Executor;
 
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
@@ -66 +67 @@
     private JPanel pnlPropertiesPanel;
     private JPanel pnlActionButtonsPanel;
     private JPanel pnlResult;
+    private final Executor executor;
 
     /**
      * Builds the panel with the three privileges the user can grant JOSM
@@ -314 +316 @@
     /**
      * Constructs a new {@code FullyAutomaticAuthorizationUI} for the given API URL.
      * @param apiUrl The OSM API URL
+     * @param executor the executor used for running the HTTP requests for the authorization
      * @since 5422
      */
-    public FullyAutomaticAuthorizationUI(String apiUrl) {
+    public FullyAutomaticAuthorizationUI(String apiUrl, Executor executor) {
         super(apiUrl);
+        this.executor = executor;
         build();
     }
 
@@ -345 +349 @@
 
         @Override
         public void actionPerformed(ActionEvent evt) {
-            Main.worker.submit(new FullyAutomaticAuthorisationTask(FullyAutomaticAuthorizationUI.this));
+            executor.execute(new FullyAutomaticAuthorisationTask(FullyAutomaticAuthorizationUI.this));
         }
 
         protected final void updateEnabledState() {
@@ -395 +399 @@
 
         @Override
         public void actionPerformed(ActionEvent arg0) {
-            Main.worker.submit(new TestAccessTokenTask(
+            executor.execute(new TestAccessTokenTask(
                     FullyAutomaticAuthorizationUI.this,
                     getApiUrl(),
                     getAdvancedPropertiesPanel().getAdvancedParameters(),

src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java

@@ -11 +11 @@
 import java.awt.event.ActionEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.concurrent.Executor;
 
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
@@ -22 +23 @@
 import javax.swing.event.DocumentListener;
 import javax.swing.text.JTextComponent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
@@ -46 +46 @@
     private transient AccessTokenSecretValidator valAccessTokenSecret;
     private JCheckBox cbSaveToPreferences;
     private HtmlPanel pnlMessage;
+    private final Executor executor;
 
     protected JPanel buildAccessTokenPanel() {
         JPanel pnl = new JPanel(new GridBagLayout());
@@ -162 +163 @@
     /**
      * Constructs a new {@code ManualAuthorizationUI} for the given API URL.
      * @param apiUrl The OSM API URL
+     * @param executor the executor used for running the HTTP requests for the authorization
      * @since 5422
      */
-    public ManualAuthorizationUI(String apiUrl) {
+    public ManualAuthorizationUI(String apiUrl, Executor executor) {
         super(apiUrl);
+        this.executor = executor;
         build();
     }
 
@@ -260 +263 @@
                     getAdvancedPropertiesPanel().getAdvancedParameters(),
                     getAccessToken()
             );
-            Main.worker.submit(task);
+            executor.execute(task);
         }
 
         protected final void updateEnabledState() {

src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

@@ -21 +21 @@
 import java.awt.event.WindowEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.concurrent.Executor;
 
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
@@ -43 +44 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.UserCancelException;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
 /**
@@ -64 +67 @@
     private SemiAutomaticAuthorizationUI pnlSemiAutomaticAuthorisationUI;
     private ManualAuthorizationUI pnlManualAuthorisationUI;
     private JScrollPane spAuthorisationProcedureUI;
+    private final Executor executor;
+
+    /**
+     * Launches the wizard, {@link OAuthAccessTokenHolder#setAccessToken(OAuthToken) sets the token}
+     * and {@link OAuthAccessTokenHolder#setSaveToPreferences(boolean) saves to preferences}.
+     * @throws UserCancelException if user cancels the operation
+     */
+    public void showDialog() throws UserCancelException {
+        setVisible(true);
+        if (isCanceled()) {
+            throw new UserCancelException();
+        }
+        OAuthAccessTokenHolder holder = OAuthAccessTokenHolder.getInstance();
+        holder.setAccessToken(getAccessToken());
+        holder.setSaveToPreferences(isSaveAccessTokenToPreferences());
+    }
 
     /**
      * Builds the row with the action buttons
@@ -169 +188 @@
         setTitle(tr("Get an Access Token for ''{0}''", apiUrl));
         this.setMinimumSize(new Dimension(600, 420));
 
-        pnlFullyAutomaticAuthorisationUI = new FullyAutomaticAuthorizationUI(apiUrl);
-        pnlSemiAutomaticAuthorisationUI = new SemiAutomaticAuthorizationUI(apiUrl);
-        pnlManualAuthorisationUI = new ManualAuthorizationUI(apiUrl);
+        pnlFullyAutomaticAuthorisationUI = new FullyAutomaticAuthorizationUI(apiUrl, executor);
+        pnlSemiAutomaticAuthorisationUI = new SemiAutomaticAuthorizationUI(apiUrl, executor);
+        pnlManualAuthorisationUI = new ManualAuthorizationUI(apiUrl, executor);
 
         spAuthorisationProcedureUI = GuiHelper.embedInVerticalScrollPane(new JPanel());
         spAuthorisationProcedureUI.getVerticalScrollBar().addComponentListener(
@@ -208 +227 @@
     /**
      * Creates the wizard.
      *
-     * @param apiUrl the API URL. Must not be null.
-     * @throws IllegalArgumentException if apiUrl is null
-     */
-    public OAuthAuthorizationWizard(String apiUrl) {
-        this(Main.parent, apiUrl);
-    }
-
-    /**
-     * Creates the wizard.
-     *
      * @param parent the component relative to which the dialog is displayed
      * @param apiUrl the API URL. Must not be null.
+     * @param executor the executor used for running the HTTP requests for the authorization
      * @throws IllegalArgumentException if apiUrl is null
      */
-    public OAuthAuthorizationWizard(Component parent, String apiUrl) {
+    public OAuthAuthorizationWizard(Component parent, String apiUrl, Executor executor) {
         super(JOptionPane.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
         CheckParameterUtil.ensureParameterNotNull(apiUrl, "apiUrl");
         this.apiUrl = apiUrl;
+        this.executor = executor;
         build();
     }
 

src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java

@@ -13 +13 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.util.concurrent.Executor;
 
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
@@ -20 +21 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
@@ -46 +46 @@
     private RetrieveRequestTokenPanel pnlRetrieveRequestToken;
     private RetrieveAccessTokenPanel pnlRetrieveAccessToken;
     private ShowAccessTokenPanel pnlShowAccessToken;
-
+    private final Executor executor;
+    
     /**
      * build the UI
      */
@@ -62 +63 @@
     /**
      * Constructs a new {@code SemiAutomaticAuthorizationUI} for the given API URL.
      * @param apiUrl The OSM API URL
+     * @param executor the executor used for running the HTTP requests for the authorization
      * @since 5422
      */
-    public SemiAutomaticAuthorizationUI(String apiUrl) {
+    public SemiAutomaticAuthorizationUI(String apiUrl, Executor executor) {
         super(apiUrl);
+        this.executor = executor;
         build();
     }
 
@@ -395 +398 @@
                     SemiAutomaticAuthorizationUI.this,
                     getAdvancedPropertiesPanel().getAdvancedParameters()
             );
-            Main.worker.submit(task);
+            executor.execute(task);
             Runnable r  = new Runnable() {
                 @Override
                 public void run() {
@@ -410 +413 @@
                     });
                 }
             };
-            Main.worker.submit(r);
+            executor.execute(r);
         }
     }
 
@@ -432 +435 @@
                     getAdvancedPropertiesPanel().getAdvancedParameters(),
                     requestToken
             );
-            Main.worker.submit(task);
+            executor.execute(task);
             Runnable r  = new Runnable() {
                 @Override
                 public void run() {
@@ -447 +450 @@
                     });
                 }
             };
-            Main.worker.submit(r);
+            executor.execute(r);
         }
     }
 
@@ -470 +473 @@
                     getAdvancedPropertiesPanel().getAdvancedParameters(),
                     getAccessToken()
             );
-            Main.worker.submit(task);
+            executor.execute(task);
         }
     }
 }

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

@@ -20 +20 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
+import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
 
 /**
@@ -117 +118 @@
      * Initializes the panel from preferences
      */
     public final void initFromPreferences() {
-        String authMethod = Main.pref.get("osm-server.auth-method", "basic");
+        final String authMethod = OsmApi.getAuthMethod();
         if ("basic".equals(authMethod)) {
             rbBasicAuthentication.setSelected(true);
         } else if ("oauth".equals(authMethod)) {

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

@@ -34 +34 @@
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.UserCancelException;
 
 /**
  * The preferences panel for the OAuth preferences. This just a summary panel
@@ -324 +325 @@
         public void actionPerformed(ActionEvent arg0) {
             OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
                     OAuthAuthenticationPreferencesPanel.this,
-                    apiUrl
-            );
-            wizard.setVisible(true);
-            if (wizard.isCanceled()) return;
-            OAuthAccessTokenHolder holder = OAuthAccessTokenHolder.getInstance();
-            holder.setAccessToken(wizard.getAccessToken());
-            holder.setSaveToPreferences(wizard.isSaveAccessTokenToPreferences());
+                    apiUrl,
+                    Main.worker);
+            try {
+                wizard.showDialog();
+            } catch (UserCancelException ignore) {
+                Main.trace(ignore.toString());
+                return;
+            }
             pnlAdvancedProperties.setAdvancedParameters(wizard.getOAuthParameters());
             refreshView();
         }
@@ -339 +341 @@
     /**
      * Launches the OAuthAuthorisationWizard to generate a new Access Token
      */
-    private class RenewAuthorisationAction extends AbstractAction {
+    private class RenewAuthorisationAction extends AuthoriseNowAction {
         /**
          * Constructs a new {@code RenewAuthorisationAction}.
          */
@@ -347 +349 @@
             putValue(NAME, tr("New Access Token"));
             putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process and generate a new Access Token"));
             putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
-
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent arg0) {
-            OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
-                    OAuthAuthenticationPreferencesPanel.this,
-                    apiUrl
-            );
-            wizard.setVisible(true);
-            if (wizard.isCanceled()) return;
-            OAuthAccessTokenHolder holder = OAuthAccessTokenHolder.getInstance();
-            holder.setAccessToken(wizard.getAccessToken());
-            holder.setSaveToPreferences(wizard.isSaveAccessTokenToPreferences());
-            pnlAdvancedProperties.setAdvancedParameters(wizard.getOAuthParameters());
-            refreshView();
         }
     }
 

src/org/openstreetmap/josm/io/OsmApi.java

@@ -581 +581 @@
      * @return {@code true} if JOSM is configured to access OSM API via OAuth, {@code false} otherwise
      * @since 6349
      */
-    public static final boolean isUsingOAuth() {
-        return "oauth".equals(Main.pref.get("osm-server.auth-method", "basic"));
+    public static boolean isUsingOAuth() {
+        return "oauth".equals(getAuthMethod());
+    }
+
+    /**
+     * Returns the authentication method set in the preferences
+     * @return the authentication method
+     */
+    public static String getAuthMethod() {
+        return Main.pref.get("osm-server.auth-method", "oauth");
     }
 
     protected final String sendRequest(String requestMethod, String urlSuffix, String requestBody, ProgressMonitor monitor)

src/org/openstreetmap/josm/io/OsmConnection.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.lang.reflect.InvocationTargetException;
 import java.net.Authenticator.RequestorType;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
+import java.util.concurrent.FutureTask;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.oauth.OAuthParameters;
+import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.io.auth.CredentialsAgentException;
 import org.openstreetmap.josm.io.auth.CredentialsAgentResponse;
@@ -22 +30 @@
 import oauth.signpost.OAuthConsumer;
 import oauth.signpost.exception.OAuthException;
 
+import javax.swing.SwingUtilities;
+
 /**
  * Base class that handles common things like authentication for the reader and writer
  * to the osm server.
@@ -95 +105 @@
         }
         OAuthConsumer consumer = oauthParameters.buildConsumer();
         OAuthAccessTokenHolder holder = OAuthAccessTokenHolder.getInstance();
-        if (!holder.containsAccessToken())
+        if (!holder.containsAccessToken()) {
+            try {
+                final URL apiUrl = new URL(Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL));
+                if (!Objects.equals(apiUrl.getHost(), connection.getURL().getHost())) {
+                    throw new MissingOAuthAccessTokenException();
+                }
+                final FutureTask<OAuthAuthorizationWizard> authTask = new FutureTask<>(new Callable<OAuthAuthorizationWizard>() {
+                    @Override
+                    public OAuthAuthorizationWizard call() throws Exception {
+                        final OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
+                                Main.parent, apiUrl.toExternalForm(), new Executor() {
+                            @Override
+                            public void execute(Runnable command) {
+                                command.run();
+                            }
+                        });
+                        wizard.showDialog();
+                        OAuthAccessTokenHolder.getInstance().setSaveToPreferences(true);
+                        OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
+                        return wizard;
+                    }
+                });
+                if (SwingUtilities.isEventDispatchThread()) {
+                    authTask.run();
+                } else {
+                    SwingUtilities.invokeAndWait(authTask);
+                }
+            } catch (MalformedURLException | InterruptedException | InvocationTargetException e) {
+                throw new MissingOAuthAccessTokenException();
+            }
+        }
+        if (!holder.containsAccessToken()) { // check if wizard completed
             throw new MissingOAuthAccessTokenException();
+        }
         consumer.setTokenWithSecret(holder.getAccessTokenKey(), holder.getAccessTokenSecret());
         try {
             consumer.sign(connection);
@@ -106 +148 @@
     }
 
     protected void addAuth(HttpClient connection) throws OsmTransferException {
-        String authMethod = Main.pref.get("osm-server.auth-method", "basic");
+        final String authMethod = OsmApi.getAuthMethod();
         if ("basic".equals(authMethod)) {
             addBasicAuthorizationHeader(connection);
         } else if ("oauth".equals(authMethod)) {