Changeset 5434 in josm

Timestamp:

2012-08-12T04:03:42+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #6594 - Fetch user details with supplied OAuth credentials to download changesets without having to set user name in "Basic authentication" tab + fix a bug in languages parsing

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/JosmUserIdentityManager.java (modified) (5 diffs)
• gui/dialogs/changeset/ChangesetCacheManager.java (modified) (1 diff)
• io/OsmServerUserInfoReader.java (modified) (1 diff)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Component;
 import java.text.MessageFormat;
 
@@ -11 +12 @@
 import org.openstreetmap.josm.data.Preferences.StringSetting;
 import org.openstreetmap.josm.data.osm.UserInfo;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.io.OsmServerUserInfoReader;
+import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -34 +38 @@
  * of what the current JOSM instance knows about the current user. Other subsystems can
  * let the global JosmUserStateManager know in case they fully identify the current user, see
- * {@link #setFullyIdentified(String, long)}.
+ * {@link #setFullyIdentified}.
  *
  * The information kept by the JosmUserStateManager can be used to
  * <ul>
  *   <li>safely query changesets owned by the current user based on its user id, not on its user name</li>
- *   <li>safely search for objects last touched by the current user  based on its user id, not on its user name</li>
+ *   <li>safely search for objects last touched by the current user based on its user id, not on its user name</li>
  * </ul>
  *
@@ -166 +170 @@
         return userInfo;
     }
-    /**
-     * Initializes the user identity manager from values in the {@link org.openstreetmap.josm.data.Preferences}
+    
+    /**
+     * Initializes the user identity manager from Basic Authentication values in the {@link org.openstreetmap.josm.data.Preferences}
+     * This method should be called if {@code osm-server.auth-method} is set to {@code basic}.
+     * @see #initFromOAuth
      */
     public void initFromPreferences() {
@@ -182 +189 @@
                 // keep the state, be it partially or fully identified
             }
+        }
+    }
+
+    /**
+     * Initializes the user identity manager from OAuth request of user details.
+     * This method should be called if {@code osm-server.auth-method} is set to {@code oauth}.
+     * @param parent component relative to which the {@link PleaseWaitDialog} is displayed.
+     * @see #initFromPreferences
+     * @since 5434
+     */
+    public void initFromOAuth(Component parent) {
+        try {
+            UserInfo info = new OsmServerUserInfoReader().fetchUserInfo(NullProgressMonitor.INSTANCE);
+            setFullyIdentified(info.getDisplayName(), info);
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        } catch (OsmTransferException e) {
+            e.printStackTrace();
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java

@@ -532 +532 @@
         public void actionPerformed(ActionEvent arg0) {
             JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
-            im.initFromPreferences();
-            if (im.isAnonymous()) {
-                alertAnonymousUser();
-                return;
+            if (Main.pref.get("osm-server.auth-method").equals("oauth")) {
+                im.initFromOAuth(ChangesetCacheManager.this);
+            } else {
+                im.initFromPreferences();
+                if (im.isAnonymous()) {
+                    alertAnonymousUser();
+                    return;
+                }
             }
             ChangesetQuery query = new ChangesetQuery();

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

@@ -97 +97 @@
 
             // -- language list
-            NodeList xmlNodeList = (NodeList)xpath.compile("/osm/user[1]/languages[1]/lang").evaluate(document, XPathConstants.NODESET);
+            NodeList xmlNodeList = (NodeList)xpath.compile("/osm/user[1]/languages[1]/lang/text()").evaluate(document, XPathConstants.NODESET);
             if (xmlNodeList != null) {
                 List<String> languages = new LinkedList<String>();