Changeset 6076 in josm for trunk/src/org

Timestamp:

2013-07-19T21:52:17+02:00 (11 years ago)

Author:

stoecker

Message:

fix #8875 - update JOSM key for OAuth, smooth transition for old key.

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (1 diff)
• oauth/OAuthParameters.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1632 +1632 @@
      */
     public void removeObsolete() {
+        /* update the data with old consumer key*/
+        if(getInteger("josm.version", Version.getInstance().getVersion()) < 6076) {
+            if(!get("oauth.access-token.key").isEmpty() && get("oauth.settings.consumer-key").isEmpty()) {
+                put("oauth.settings.consumer-key", "AdCRxTpvnbmfV8aPqrTLyA");
+                put("oauth.settings.consumer-secret", "XmYOiGY9hApytcBC3xCec3e28QBqOWz5g6DSb5UpE");
+            }
+        }
+
         String[] obsolete = {
                 "downloadAlong.downloadAlongTrack.distance",   // 07/2013 - can be removed mid-2014. Replaced by downloadAlongWay.distance

trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java

@@ -29 +29 @@
     static public final String DEFAULT_JOSM_CONSUMER_SECRET = "rIkjpPcBNkMQxrqzcOvOC4RRuYupYr7k8mfP13H5";
     /**
-     * The old default JOSM OAuth consumer key.
-     */
-    static public final String OLD_JOSM_CONSUMER_KEY = "AdCRxTpvnbmfV8aPqrTLyA";
-    /**
-     * The old default JOSM OAuth consumer secret.
-     */
-    static public final String OLD_JOSM_CONSUMER_SECRET = "XmYOiGY9hApytcBC3xCec3e28QBqOWz5g6DSb5UpE";
-    /**
      * The default OSM OAuth request token URL.
      */
@@ -71 +63 @@
     static public OAuthParameters createDefault(String apiUrl) {
         OAuthParameters parameters = new OAuthParameters();
-        parameters.setConsumerKey(OLD_JOSM_CONSUMER_KEY);
-        parameters.setConsumerSecret(OLD_JOSM_CONSUMER_SECRET);
-        if (apiUrl == null || apiUrl.isEmpty() || apiUrl.equals(OsmApi.DEFAULT_API_URL)) {
-            parameters.setRequestTokenUrl(DEFAULT_REQUEST_TOKEN_URL);
-            parameters.setAccessTokenUrl(DEFAULT_ACCESS_TOKEN_URL);
-            parameters.setAuthoriseUrl(DEFAULT_AUTHORISE_URL);
-        } else {
+        parameters.setConsumerKey(DEFAULT_JOSM_CONSUMER_KEY);
+        parameters.setConsumerSecret(DEFAULT_JOSM_CONSUMER_SECRET);
+        parameters.setRequestTokenUrl(DEFAULT_REQUEST_TOKEN_URL);
+        parameters.setAccessTokenUrl(DEFAULT_ACCESS_TOKEN_URL);
+        parameters.setAuthoriseUrl(DEFAULT_AUTHORISE_URL);
+        if(!apiUrl.equals(OsmApi.DEFAULT_API_URL)) {
             try {
                 String host = new URL(apiUrl).getHost();
@@ -99 +90 @@
      */
     static public OAuthParameters createFromPreferences(Preferences pref) {
-        boolean useDefault = pref.getBoolean("oauth.settings.use-default", true );
-        if (useDefault)
-            return createDefault(pref.get("osm-server.url"));
-        OAuthParameters parameters = new OAuthParameters();
-        parameters.setConsumerKey(pref.get("oauth.settings.consumer-key", ""));
-        parameters.setConsumerSecret(pref.get("oauth.settings.consumer-secret", ""));
-        parameters.setRequestTokenUrl(pref.get("oauth.settings.request-token-url", ""));
-        parameters.setAccessTokenUrl(pref.get("oauth.settings.access-token-url", ""));
-        parameters.setAuthoriseUrl(pref.get("oauth.settings.authorise-url", ""));
+        OAuthParameters parameters = createDefault(pref.get("osm-server.url"));
+        parameters.setConsumerKey(pref.get("oauth.settings.consumer-key", DEFAULT_JOSM_CONSUMER_KEY));
+        parameters.setConsumerSecret(pref.get("oauth.settings.consumer-secret", DEFAULT_JOSM_CONSUMER_SECRET));
+        parameters.setRequestTokenUrl(pref.get("oauth.settings.request-token-url", parameters.getRequestTokenUrl()));
+        parameters.setAccessTokenUrl(pref.get("oauth.settings.access-token-url", parameters.getAccessTokenUrl()));
+        parameters.setAuthoriseUrl(pref.get("oauth.settings.authorise-url", parameters.getAuthoriseUrl()));
         return parameters;
-    }
-
-    /**
-     * Clears the preferences for OAuth parameters
-     *
-     * @param pref the preferences in which keys related to OAuth parameters are
-     * removed
-     */
-    static public void clearPreferences(Preferences pref) {
-        pref.put("oauth.settings.consumer-key", null);
-        pref.put("oauth.settings.consumer-secret", null);
-        pref.put("oauth.settings.request-token-url", null);
-        pref.put("oauth.settings.access-token-url", null);
-        pref.put("oauth.settings.authorise-url", null);
     }
 
@@ -265 +239 @@
      */
     public void saveToPreferences(Preferences pref) {
-        if (this.equals(createDefault(pref.get("osm-server.url")))) {
-            pref.put("oauth.settings.use-default", true );
-            clearPreferences(pref);
-            return;
-        }
-        pref.put("oauth.settings.use-default", false);
         pref.put("oauth.settings.consumer-key", consumerKey);
         pref.put("oauth.settings.consumer-secret", consumerSecret);