JavaLeaks
diff --git a/‎Flickr4Java/src/main/java/com/flickr4java/flickr/auth/AuthInterface.java‎
Lines changed: 14 additions & 17 deletions b/‎Flickr4Java/src/main/java/com/flickr4java/flickr/auth/AuthInterface.java‎
Lines changed: 14 additions & 17 deletions
@@ -4,6 +4,7 @@
 
 package com.flickr4java.flickr.auth;
 
+import com.flickr4java.flickr.Flickr;
 import com.flickr4java.flickr.FlickrException;
 import com.flickr4java.flickr.Response;
 import com.flickr4java.flickr.Transport;
@@ -171,7 +172,13 @@ public Auth checkToken(Token accessToken) throws FlickrException {
      */
     public Auth checkToken(String authToken, String tokenSecret) throws FlickrException {
 
-        Map<String, String> parameters = constructNonOAuthParameters(authToken, METHOD_CHECK_TOKEN);
+        // Use TreeMap so keys are automatically sorted alphabetically
+        Map<String, String> parameters = new TreeMap<String, String>();
+        parameters.put("method", METHOD_CHECK_TOKEN);
+        parameters.put("oauth_token", authToken);
+        parameters.put(Flickr.API_KEY, apiKey);
+        // This method call must be signed using Flickr (not OAuth) style signing
+        parameters.put("api_sig", getSignature(sharedSecret, parameters));
 
         Response response = transportAPI.getNonOAuth(transportAPI.getPath(), parameters);
         if (response.isError()) {
@@ -193,7 +200,12 @@ public Auth checkToken(String authToken, String tokenSecret) throws FlickrExcept
      */
     public Token exchangeAuthToken(String authToken) throws FlickrException {
 
-        Map<String, String> parameters = constructNonOAuthParameters(authToken, METHOD_EXCHANGE_TOKEN);
+        // Use TreeMap so keys are automatically sorted alphabetically
+        Map<String, String> parameters = new TreeMap<String, String>();
+        parameters.put("method", METHOD_EXCHANGE_TOKEN);
+        parameters.put(Flickr.API_KEY, apiKey);
+        // This method call must be signed using Flickr (not OAuth) style signing
+        parameters.put("api_sig", getSignature(sharedSecret, parameters));
 
         Response response = transportAPI.getNonOAuth(transportAPI.getPath(), parameters);
         if (response.isError()) {
@@ -205,21 +217,6 @@ public Token exchangeAuthToken(String authToken) throws FlickrException {
         return accessToken;
     }
 
-    /**
-     * 
-     * @param authToken
-     * @param method
-     */
-    private Map<String, String> constructNonOAuthParameters(String authToken, String method) {
-        // Use TreeMap so keys are automatically sorted alphabetically
-        Map<String, String> parameters = new TreeMap<String, String>();
-        parameters.put("method", method);
-        parameters.put("oauth_token", authToken);
-        // This method call must be signed using Flickr (not OAuth) style signing
-        parameters.put("api_sig", getSignature(sharedSecret, parameters));
-        return parameters;
-    }
-
     /**
      * 
      * @param response