No longer pass api_key parameter in method calls · JavaLeaks/Flickr4Java@270ea0e · GitHub
Skip to content

Commit 270ea0e

Browse files
author
boncey
committed
No longer pass api_key parameter in method calls
1 parent acc4485 commit 270ea0e

57 files changed

Lines changed: 515 additions & 1339 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Flickr4Java/src/main/java/com/flickr4java/flickr/Flickr.java.bak‎

Lines changed: 0 additions & 605 deletions
This file was deleted.

‎Flickr4Java/src/main/java/com/flickr4java/flickr/REST.java‎

Lines changed: 12 additions & 16 deletions

‎Flickr4Java/src/main/java/com/flickr4java/flickr/RESTResponse.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
*/
44
package com.flickr4java.flickr;
55

6-
import java.util.Collection;
7-
import java.util.List;
6+
import com.flickr4java.flickr.util.XMLUtilities;
87

98
import org.w3c.dom.Document;
109
import org.w3c.dom.Element;
1110

12-
import com.flickr4java.flickr.util.XMLUtilities;
11+
import java.util.Collection;
12+
import java.util.List;
1313

1414
/**
1515
* Flickr Response object.

‎Flickr4Java/src/main/java/com/flickr4java/flickr/RequestContext.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
package com.flickr4java.flickr;
66

7+
import com.flickr4java.flickr.auth.Auth;
8+
79
import java.util.ArrayList;
810
import java.util.List;
911

10-
import com.flickr4java.flickr.auth.Auth;
11-
1212
/**
1313
* A thread local variable used to hold contextual information used in requests. To get an instance of this class use RequestContext.getRequestContext(). The
1414
* method will return a RequestContext object which is only usable within the current thread.
@@ -31,7 +31,7 @@ public class RequestContext {
3131
* @return The RequestContext
3232
*/
3333
public static RequestContext getRequestContext() {
34-
return (RequestContext) threadLocal.get();
34+
return threadLocal.get();
3535
}
3636

3737
public Auth getAuth() {

‎Flickr4Java/src/main/java/com/flickr4java/flickr/Response.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
package com.flickr4java.flickr;
66

7-
import java.util.Collection;
8-
97
import org.w3c.dom.Document;
108
import org.w3c.dom.Element;
119

10+
import java.util.Collection;
11+
1212
/**
1313
* @author Anthony Eden
1414
*/

‎Flickr4Java/src/main/java/com/flickr4java/flickr/SOAPResponse.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package com.flickr4java.flickr;
22

3-
import java.util.Collection;
4-
import java.util.Iterator;
5-
import java.util.List;
3+
import com.flickr4java.flickr.util.XMLUtilities;
64

75
import org.apache.axis.message.SOAPBody;
86
import org.apache.axis.message.SOAPEnvelope;
97
import org.apache.axis.message.SOAPFault;
108
import org.w3c.dom.Document;
119
import org.w3c.dom.Element;
1210

13-
import com.flickr4java.flickr.util.XMLUtilities;
11+
import java.util.Collection;
12+
import java.util.Iterator;
13+
import java.util.List;
1414

1515
/**
1616
* Flickr SOAP Response object.

‎Flickr4Java/src/main/java/com/flickr4java/flickr/Transport.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,12 @@ public void setPath(String path) {
6969
* The request path
7070
* @param parameters
7171
* The parameters (collection of Parameter objects)
72+
* @param apiKey
7273
* @param sharedSecret
7374
* @return The Response
7475
* @throws FlickrException
7576
*/
76-
public abstract Response get(String path, Map<String, Object> parameters, String sharedSecret) throws FlickrException;
77+
public abstract Response get(String path, Map<String, Object> parameters, String apiKey, String sharedSecret) throws FlickrException;
7778

7879
/**
7980
* Invoke an HTTP POST request on a remote host.
@@ -82,11 +83,12 @@ public void setPath(String path) {
8283
* The request path
8384
* @param parameters
8485
* The parameters (List of Parameter objects)
86+
* @param apiKey
8587
* @param sharedSecret
8688
* @return The Response object
8789
* @throws FlickrException
8890
*/
89-
public abstract Response post(String path, Map<String, Object> parameters, String sharedSecret, boolean multipart) throws FlickrException;
91+
public abstract Response post(String path, Map<String, Object> parameters, String apiKey, String sharedSecret, boolean multipart) throws FlickrException;
9092

9193
/**
9294
* Invoke an HTTP POST request on a remote host.
@@ -95,13 +97,14 @@ public void setPath(String path) {
9597
* The request path
9698
* @param parameters
9799
* The parameters (List of Parameter objects)
100+
* @param apiKey
98101
* @param sharedSecret
99102
* @return The Response object
100103
* @throws FlickrException
101104
*/
102-
public Response post(String path, Map<String, Object> parameters, String sharedSecret) throws FlickrException {
105+
public Response post(String path, Map<String, Object> parameters, String apiKey, String sharedSecret) throws FlickrException {
103106

104-
return post(path, parameters, sharedSecret, false);
107+
return post(path, parameters, apiKey, sharedSecret, false);
105108
}
106109

107110
/**

‎Flickr4Java/src/main/java/com/flickr4java/flickr/activity/ActivityInterface.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package com.flickr4java.flickr.activity;
22

3+
import com.flickr4java.flickr.FlickrException;
4+
import com.flickr4java.flickr.Response;
5+
import com.flickr4java.flickr.Transport;
6+
import com.flickr4java.flickr.util.XMLUtilities;
7+
8+
import org.w3c.dom.Element;
9+
import org.w3c.dom.NodeList;
10+
311
import java.util.ArrayList;
412
import java.util.HashMap;
513
import java.util.List;
614
import java.util.Map;
715
import java.util.regex.Pattern;
816

9-
import org.w3c.dom.Element;
10-
import org.w3c.dom.NodeList;
11-
12-
import com.flickr4java.flickr.Flickr;
13-
import com.flickr4java.flickr.FlickrException;
14-
import com.flickr4java.flickr.Response;
15-
import com.flickr4java.flickr.Transport;
16-
import com.flickr4java.flickr.util.XMLUtilities;
17-
1817
/**
1918
* Gather activity information belonging to the calling user.
2019
*
@@ -52,7 +51,6 @@ public ItemList<Item> userComments(int perPage, int page) throws FlickrException
5251
ItemList<Item> items = new ItemList<Item>();
5352
Map<String, Object> parameters = new HashMap<String, Object>();
5453
parameters.put("method", METHOD_USER_COMMENTS);
55-
parameters.put(Flickr.API_KEY, apiKey);
5654

5755
if (perPage > 0) {
5856
parameters.put("per_page", "" + perPage);
@@ -62,7 +60,7 @@ public ItemList<Item> userComments(int perPage, int page) throws FlickrException
6260
parameters.put("page", "" + page);
6361
}
6462

65-
Response response = transportAPI.get(transportAPI.getPath(), parameters, sharedSecret);
63+
Response response = transportAPI.get(transportAPI.getPath(), parameters, apiKey, sharedSecret);
6664
if (response.isError()) {
6765
throw new FlickrException(response.getErrorCode(), response.getErrorMessage());
6866
}
@@ -96,7 +94,6 @@ public ItemList<Item> userPhotos(int perPage, int page, String timeframe) throws
9694
ItemList<Item> items = new ItemList<Item>();
9795
Map<String, Object> parameters = new HashMap<String, Object>();
9896
parameters.put("method", METHOD_USER_PHOTOS);
99-
parameters.put(Flickr.API_KEY, apiKey);
10097

10198
if (perPage > 0) {
10299
parameters.put("per_page", "" + perPage);
@@ -114,7 +111,7 @@ public ItemList<Item> userPhotos(int perPage, int page, String timeframe) throws
114111
}
115112
}
116113

117-
Response response = transportAPI.get(transportAPI.getPath(), parameters, sharedSecret);
114+
Response response = transportAPI.get(transportAPI.getPath(), parameters, apiKey, sharedSecret);
118115
if (response.isError()) {
119116
throw new FlickrException(response.getErrorCode(), response.getErrorMessage());
120117
}

‎Flickr4Java/src/main/java/com/flickr4java/flickr/auth/AuthInterface.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
package com.flickr4java.flickr.auth;
66

7-
import com.flickr4java.flickr.Flickr;
87
import com.flickr4java.flickr.FlickrException;
98
import com.flickr4java.flickr.Response;
109
import com.flickr4java.flickr.Transport;
@@ -215,7 +214,6 @@ private Map<String, String> constructNonOAuthParameters(String authToken, String
215214
// Use TreeMap so keys are automatically sorted alphabetically
216215
Map<String, String> parameters = new TreeMap<String, String>();
217216
parameters.put("method", method);
218-
parameters.put(Flickr.API_KEY, apiKey);
219217
parameters.put("oauth_token", authToken);
220218
// This method call must be signed using Flickr (not OAuth) style signing
221219
parameters.put("api_sig", getSignature(sharedSecret, parameters));

‎Flickr4Java/src/main/java/com/flickr4java/flickr/blogs/BlogsInterface.java‎

Lines changed: 12 additions & 16 deletions

0 commit comments

Comments
 (0)