archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compute signature for sync api requests correctly

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent a2a3171550
commit 15ac0f3d57
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File

14
astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
Unescape Escape View File

@ -130,7 +130,7 @@ public class ActFmInvoker {
public JSONObject invokeWithApi(String api, String method, Object... getParameters) throws IOException, public JSONObject invokeWithApi(String api, String method, Object... getParameters) throws IOException,
ActFmServiceException { ActFmServiceException {
try { try {
String request = createFetchUrl(api, method, getParameters); String request = createFetchUrl(api, method, true, getParameters);
if (SYNC_DEBUG) if (SYNC_DEBUG)
Log.e("act-fm-invoke", request); Log.e("act-fm-invoke", request);
@ -164,7 +164,7 @@ public class ActFmInvoker {
public JSONObject post(String method, HttpEntity data, Object... getParameters) throws IOException, public JSONObject post(String method, HttpEntity data, Object... getParameters) throws IOException,
ActFmServiceException { ActFmServiceException {
try { try {
String request = createFetchUrl(null, method, getParameters); String request = createFetchUrl(null, method, true, getParameters);
if (SYNC_DEBUG) if (SYNC_DEBUG)
Log.e("act-fm-post", request); Log.e("act-fm-post", request);
@ -188,13 +188,16 @@ public class ActFmInvoker {
public JSONObject postSync(JSONArray data, String token) throws IOException, public JSONObject postSync(JSONArray data, String token) throws IOException,
ActFmServiceException { ActFmServiceException {
try { try {
String request = createFetchUrl("api/" + API_VERSION, "synchronize"); String dataString = data.toString();
String timeString = DateUtilities.timeToIso8601(DateUtilities.now(), true);
String request = createFetchUrl("api/" + API_VERSION, "synchronize", false, "token", token, "data", dataString, "time", timeString);
if (SYNC_DEBUG) if (SYNC_DEBUG)
Log.e("act-fm-post", request); Log.e("act-fm-post", request);
List<BasicNameValuePair> pairs = new ArrayList<BasicNameValuePair>(); List<BasicNameValuePair> pairs = new ArrayList<BasicNameValuePair>();
pairs.add(new BasicNameValuePair("token", token)); pairs.add(new BasicNameValuePair("token", token));
pairs.add(new BasicNameValuePair("data", data.toString())); pairs.add(new BasicNameValuePair("data", data.toString()));
pairs.add(new BasicNameValuePair("time", DateUtilities.timeToIso8601(DateUtilities.now(), true))); pairs.add(new BasicNameValuePair("time", timeString));
UrlEncodedFormEntity entity = new UrlEncodedFormEntity(pairs, HTTP.UTF_8); UrlEncodedFormEntity entity = new UrlEncodedFormEntity(pairs, HTTP.UTF_8);
String response = restClient.post(request, entity); String response = restClient.post(request, entity);
@ -221,7 +224,7 @@ public class ActFmInvoker {
* @throws UnsupportedEncodingException * @throws UnsupportedEncodingException
* @throws NoSuchAlgorithmException * @throws NoSuchAlgorithmException
*/ */
private String createFetchUrl(String api, String method, Object... getParameters) throws UnsupportedEncodingException, NoSuchAlgorithmException { private String createFetchUrl(String api, String method, boolean appendParameters, Object... getParameters) throws UnsupportedEncodingException, NoSuchAlgorithmException {
ArrayList<Pair<String, Object>> params = new ArrayList<Pair<String, Object>>(); ArrayList<Pair<String, Object>> params = new ArrayList<Pair<String, Object>>();
for(int i = 0; i < getParameters.length; i += 2) { for(int i = 0; i < getParameters.length; i += 2) {
if(getParameters[i+1] instanceof ArrayList) { if(getParameters[i+1] instanceof ArrayList) {
@ -281,6 +284,7 @@ public class ActFmInvoker {
String value = entry.getRight().toString(); String value = entry.getRight().toString();
String encoded = URLEncoder.encode(value, "UTF-8"); String encoded = URLEncoder.encode(value, "UTF-8");
if (appendParameters)
requestBuilder.append(key).append('=').append(encoded).append('&'); requestBuilder.append(key).append('=').append(encoded).append('&');
sigBuilder.append(key).append(value); sigBuilder.append(key).append(value);

Write Preview
Loading…
Cancel
Save