Changeset 3425 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-08-08T13:56:03+02:00 (14 years ago)

Author:

stoecker

Message:

fix #5244 - port to signpost 1.2 - patch by dpaleino

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/oauth/OAuthParameters.java (modified) (3 diffs)
• gui/oauth/OsmOAuthAuthorizationClient.java (modified) (2 diffs)

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

@@ -6 +6 @@
 import oauth.signpost.basic.DefaultOAuthConsumer;
 import oauth.signpost.basic.DefaultOAuthProvider;
-import oauth.signpost.signature.SignatureMethod;
+import oauth.signpost.signature.HmacSha1MessageSigner;
 
 import org.openstreetmap.josm.data.Preferences;
@@ -134 +134 @@
      */
     public OAuthConsumer buildConsumer() {
-        return new DefaultOAuthConsumer(consumerKey, consumerSecret, SignatureMethod.HMAC_SHA1);
+        OAuthConsumer consumer = new DefaultOAuthConsumer(consumerKey, consumerSecret);
+        return consumer;
     }
 
@@ -147 +148 @@
         CheckParameterUtil.ensureParameterNotNull(consumer, "consumer");
         return new DefaultOAuthProvider(
-                consumer,
                 requestTokenUrl,
                 accessTokenUrl,

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -130 +130 @@
             monitor.beginTask("");
             monitor.indeterminateSubTask(tr("Retrieving OAuth Request Token from ''{0}''", oauthProviderParameters.getRequestTokenUrl()));
-            provider.retrieveRequestToken(null);
+            provider.retrieveRequestToken(consumer, null);
             return OAuthToken.createToken(consumer);
         } catch(OAuthCommunicationException e){
@@ -163 +163 @@
             monitor.beginTask("");
             monitor.indeterminateSubTask(tr("Retrieving OAuth Access Token from ''{0}''", oauthProviderParameters.getAccessTokenUrl()));
-            provider.retrieveAccessToken(null);
+            provider.retrieveAccessToken(consumer, null);
             return OAuthToken.createToken(consumer);
         } catch(OAuthCommunicationException e){