diff options
Diffstat (limited to 'src/mining/BearerRequester.java')
-rw-r--r-- | src/mining/BearerRequester.java | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/mining/BearerRequester.java b/src/mining/BearerRequester.java index 104dabb..bc82cd9 100644 --- a/src/mining/BearerRequester.java +++ b/src/mining/BearerRequester.java @@ -4,10 +4,10 @@ import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; -import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.Charsets; import org.json.JSONException; import org.json.JSONObject; +import support.ConsumerKeySecret; /** * An API requester used for application-only requests. Not all requests are @@ -35,19 +35,18 @@ public class BearerRequester extends AbstractRequester { * Instantiates an instance, requesting an access token from the provided * consumer key and secret. * - * @param consumerKey Key provided by Twitter. - * @param consumerSecret Secret provided by Twitter. + * @param secrets The consumer secrets provided by Twitter. * @throws IOException if a failure occurred while acquiring a token. */ - public BearerRequester(String consumerKey, String consumerSecret) + public BearerRequester(ConsumerKeySecret secrets) throws IOException { - String creds = encodeToken(consumerKey, consumerSecret); String postData = "grant_type=client_credentials"; URL url = buildUrl("oauth2/token"); HttpURLConnection conn = open(url); conn.setRequestMethod("POST"); // set request headers - conn.addRequestProperty("Authorization", "Basic " + creds); + conn.addRequestProperty("Authorization", "Basic " + + secrets.getBearerTokenBase64()); conn.addRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8"); conn.setFixedLengthStreamingMode(postData.length()); @@ -74,14 +73,6 @@ public class BearerRequester extends AbstractRequester { conn.addRequestProperty("Authorization", "Bearer " + access_token); } - private String encodeToken(String consumerKey, String consumerSecret) { - StringBuilder sb = new StringBuilder(); - sb.append(consumerKey); - sb.append(":"); - sb.append(consumerSecret); - return Base64.encodeBase64String(sb.toString().getBytes(Charsets.UTF_8)); - } - /** * @return the access token that authenticates requests. */ |