Changeset 2862 in josm for trunk

Timestamp:

2010-01-15T11:29:36+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #4322: No error message if trying to upload without OAuth token

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/ExceptionDialogUtil.java (modified) (4 diffs)
• gui/io/UploadPrimitivesTask.java (modified) (3 diffs)
• io/MissingOAuthAccessTokenException.java (added)
• io/OsmConnection.java (modified) (1 diff)
• tools/ExceptionUtil.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java

@@ -15 +15 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.ChangesetClosedException;
+import org.openstreetmap.josm.io.MissingOAuthAccessTokenException;
 import org.openstreetmap.josm.io.OsmApiException;
 import org.openstreetmap.josm.io.OsmApiInitializationException;
@@ -269 +270 @@
 
     /**
+     * Explains a {@see OsmApiException} which was thrown because accessing a protected
+     * resource was forbidden.
+     *
+     * @param e the exception
+     */
+    public static void explainMissingOAuthAccessTokenException(MissingOAuthAccessTokenException e) {
+        HelpAwareOptionPane.showOptionDialog(
+                Main.parent,
+                ExceptionUtil.explainMissingOAuthAccessTokenException(e),
+                tr("Authenticationi failed"),
+                JOptionPane.ERROR_MESSAGE,
+                ht("/ErrorMessages#MissingOAuthAccessToken")
+        );
+    }
+
+    /**
      * Explains a {@see UnknownHostException} which has caused an {@see OsmTransferException}.
      * This is most likely happening when there is an error in the API URL or when
@@ -340 +357 @@
         }
 
+        if (e instanceof MissingOAuthAccessTokenException) {
+            explainMissingOAuthAccessTokenException((MissingOAuthAccessTokenException)e);
+            return;
+        }
+
         if (e instanceof OsmApiException) {
             OsmApiException oae = (OsmApiException) e;
@@ -368 +390 @@
                 return;
             }
-            explainGeneric(e);
-        }
+        }
+        explainGeneric(e);
     }
 

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -228 +228 @@
     @Override protected void realRun() throws SAXException, IOException {
         try {
-            uploadloop: while(true) {
+            uploadloop:while(true) {
                 try {
                     getProgressMonitor().subTask(tr("Uploading {0} objects ...", toUpload.getSize()));
@@ -241 +241 @@
                     break;
                 } catch(OsmTransferCancelledException e) {
+                    e.printStackTrace();
                     uploadCancelled = true;
                     return;
@@ -343 +344 @@
                     handleFailedUpload(lastException);
                 }
-
             }
         };

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

@@ -118 +118 @@
         OAuthAccessTokenHolder holder = OAuthAccessTokenHolder.getInstance();
         if (! holder.containsAccessToken())
-            throw new OsmTransferException(tr("Failed to add an OAuth authentication header. There is currently no OAuth Access Token configured."));
-
+            throw new MissingOAuthAccessTokenException();
         consumer.setTokenWithSecret(holder.getAccessTokenKey(), holder.getAccessTokenSecret());
         try {

trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java

@@ -21 +21 @@
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.io.ChangesetClosedException;
+import org.openstreetmap.josm.io.MissingOAuthAccessTokenException;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmApiException;
@@ -41 +42 @@
                 + "Check the server URL in your preferences and your internet connection.</html>", Main.pref.get(
                         "osm-server.url", "http://api.openstreetmap.org/api"));
+        return msg;
+    }
+
+
+    /**
+     *  Creates the error message
+     *
+     * @param e the exception
+     */
+    public static String explainMissingOAuthAccessTokenException(MissingOAuthAccessTokenException e) {
+        e.printStackTrace();
+        String msg = tr(
+                "<html>Failed to authenticate at the OSM server ''{0}''.<br>"
+                + "You are using OAuth to authenticate but currently there is no<br>"
+                + "OAuth Access Token configured.<br>"
+                + "Please open the Preferences Dialog and generate or enter an Access Token."
+                + "</html>",
+                Main.pref.get("osm-server.url", "http://api.openstreetmap.org/api")
+        );
         return msg;
     }