Changeset 2748 in josm for trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java

Timestamp:

2010-01-06T20:35:56+01:00 (14 years ago)

Author:

Gubaer

Message:

new: JOSM now supports OAuth

See also online help for server preferences and new OAuth Authorisation Wizard

File:

• trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java

@@ -6 +6 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.oauth.OAuthToken;
 import org.openstreetmap.josm.gui.io.CredentialDialog;
-import org.openstreetmap.josm.gui.preferences.ProxyPreferences;
+import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
 
 /**
@@ -32 +33 @@
             return new PasswordAuthentication(user, password == null ? new char[0] : password.toCharArray());
         case PROXY:
-            user = Main.pref.get(ProxyPreferences.PROXY_USER, null);
-            password = Main.pref.get(ProxyPreferences.PROXY_PASS, null);
+            user = Main.pref.get(ProxyPreferencesPanel.PROXY_USER, null);
+            password = Main.pref.get(ProxyPreferencesPanel.PROXY_PASS, null);
             if (user == null)
                 return null;
@@ -57 +58 @@
             break;
         case PROXY:
-            Main.pref.put("proxy.username", credentials.getUserName());
+            Main.pref.put(ProxyPreferencesPanel.PROXY_USER, credentials.getUserName());
             if (credentials.getPassword() == null) {
-                Main.pref.put("proxy.password", null);
+                Main.pref.put(ProxyPreferencesPanel.PROXY_PASS, null);
             } else {
-                Main.pref.put("proxy.password", String.valueOf(credentials.getPassword()));
+                Main.pref.put(ProxyPreferencesPanel.PROXY_PASS, String.valueOf(credentials.getPassword()));
             }
             break;
@@ -104 +105 @@
         return response;
     }
+
+
+    /**
+     * Lookup the current OAuth Access Token to access the OSM server. Replies null, if no
+     * Access Token is currently managed by this CredentialManager.
+     * 
+     * @return the current OAuth Access Token to access the OSM server.
+     * @throws CredentialsManagerException thrown if something goes wrong
+     */
+    public OAuthToken lookupOAuthAccessToken() throws CredentialsManagerException {
+        String accessTokenKey = Main.pref.get("oauth.access-token.key", null);
+        String accessTokenSecret = Main.pref.get("oauth.access-token.secret", null);
+        if (accessTokenKey == null && accessTokenSecret == null)
+            return null;
+        return new OAuthToken(accessTokenKey, accessTokenSecret);
+    }
+
+    /**
+     * Stores the OAuth Access Token <code>accessToken</code>.
+     * 
+     * @param accessToken the access Token. null, to remove the Access Token.
+     * @throws CredentialsManagerException thrown if something goes wrong
+     */
+    public void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsManagerException {
+        if (accessToken == null) {
+            Main.pref.put("oauth.access-token.key", null);
+            Main.pref.put("oauth.access-token.secret", null);
+        } else {
+            Main.pref.put("oauth.access-token.key", accessToken.getKey());
+            Main.pref.put("oauth.access-token.secret", accessToken.getSecret());
+        }
+    }
 }