CLOUD: #define all OAuth2/API-related URLs

5 files changed, 112 insertions, 46 deletions

diff --git a/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp b/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
index 968fb4550a..ad9b0fcc0d 100644
--- a/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
+++ b/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
@@ -30,6 +30,8 @@
 namespace Cloud {
 namespace Dropbox {
 
+#define DROPBOX_API_CREATE_FOLDER "https://api.dropboxapi.com/2/files/create_folder"
+
 DropboxCreateDirectoryRequest::DropboxCreateDirectoryRequest(Common::String token, Common::String path, Storage::BoolCallback cb, Networking::ErrorCallback ecb):
 	Networking::Request(nullptr, ecb), _token(token), _path(path), _boolCallback(cb),
 	_workingRequest(nullptr), _ignoreCallback(false) {
@@ -51,7 +53,7 @@ void DropboxCreateDirectoryRequest::start() {
 
 	Networking::JsonCallback innerCallback = new Common::Callback<DropboxCreateDirectoryRequest, Networking::JsonResponse>(this, &DropboxCreateDirectoryRequest::responseCallback);
 	Networking::ErrorCallback errorCallback = new Common::Callback<DropboxCreateDirectoryRequest, Networking::ErrorResponse>(this, &DropboxCreateDirectoryRequest::errorCallback);
-	Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(innerCallback, errorCallback, "https://api.dropboxapi.com/2/files/create_folder");
+	Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(innerCallback, errorCallback, DROPBOX_API_CREATE_FOLDER);
 	request->addHeader("Authorization: Bearer " + _token);
 	request->addHeader("Content-Type: application/json");
 
diff --git a/backends/cloud/dropbox/dropboxinforequest.cpp b/backends/cloud/dropbox/dropboxinforequest.cpp
index 37700eaf55..207c20271a 100644
--- a/backends/cloud/dropbox/dropboxinforequest.cpp
+++ b/backends/cloud/dropbox/dropboxinforequest.cpp
@@ -31,6 +31,9 @@
 namespace Cloud {
 namespace Dropbox {
 
+#define DROPBOX_API_GET_CURRENT_ACCOUNT "https://api.dropboxapi.com/2/users/get_current_account"
+#define DROPBOX_API_GET_SPACE_USAGE "https://api.dropboxapi.com/2/users/get_space_usage"
+
 DropboxInfoRequest::DropboxInfoRequest(Common::String token, Storage::StorageInfoCallback cb, Networking::ErrorCallback ecb):
 	Networking::Request(nullptr, ecb), _token(token), _infoCallback(cb),
 	_workingRequest(nullptr), _ignoreCallback(false) {
@@ -52,7 +55,7 @@ void DropboxInfoRequest::start() {
 
 	Networking::JsonCallback innerCallback = new Common::Callback<DropboxInfoRequest, Networking::JsonResponse>(this, &DropboxInfoRequest::userResponseCallback);
 	Networking::ErrorCallback errorCallback = new Common::Callback<DropboxInfoRequest, Networking::ErrorResponse>(this, &DropboxInfoRequest::errorCallback);
-	Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(innerCallback, errorCallback, "https://api.dropboxapi.com/2/users/get_current_account");
+	Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(innerCallback, errorCallback, DROPBOX_API_GET_CURRENT_ACCOUNT);
 	request->addHeader("Authorization: Bearer " + _token);
 	request->addHeader("Content-Type: application/json");
 	request->addPostField("null"); //use POST
@@ -90,7 +93,7 @@ void DropboxInfoRequest::userResponseCallback(Networking::JsonResponse response)
 
 	Networking::JsonCallback innerCallback = new Common::Callback<DropboxInfoRequest, Networking::JsonResponse>(this, &DropboxInfoRequest::quotaResponseCallback);
 	Networking::ErrorCallback errorCallback = new Common::Callback<DropboxInfoRequest, Networking::ErrorResponse>(this, &DropboxInfoRequest::errorCallback);
-	Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(innerCallback, errorCallback, "https://api.dropboxapi.com/2/users/get_space_usage");
+	Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(innerCallback, errorCallback, DROPBOX_API_GET_SPACE_USAGE);
 	request->addHeader("Authorization: Bearer " + _token);
 	request->addHeader("Content-Type: application/json");
 	request->addPostField("null"); //use POST
diff --git a/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp b/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
index 2e1d61812a..8b00f7c2bf 100644
--- a/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
+++ b/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
@@ -31,6 +31,9 @@
 namespace Cloud {
 namespace Dropbox {
 
+#define DROPBOX_API_LIST_FOLDER "https://api.dropboxapi.com/2/files/list_folder"
+#define DROPBOX_API_LIST_FOLDER_CONTINUE "https://api.dropboxapi.com/2/files/list_folder/continue"
+
 DropboxListDirectoryRequest::DropboxListDirectoryRequest(Common::String token, Common::String path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive):
 	Networking::Request(nullptr, ecb), _requestedPath(path), _requestedRecursive(recursive), _listDirectoryCallback(cb),
 	_token(token), _workingRequest(nullptr), _ignoreCallback(false) {
@@ -53,7 +56,7 @@ void DropboxListDirectoryRequest::start() {
 
 	Networking::JsonCallback callback = new Common::Callback<DropboxListDirectoryRequest, Networking::JsonResponse>(this, &DropboxListDirectoryRequest::responseCallback);
 	Networking::ErrorCallback failureCallback = new Common::Callback<DropboxListDirectoryRequest, Networking::ErrorResponse>(this, &DropboxListDirectoryRequest::errorCallback);
-	Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(callback, failureCallback, "https://api.dropboxapi.com/2/files/list_folder");
+	Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(callback, failureCallback, DROPBOX_API_LIST_FOLDER);
 	request->addHeader("Authorization: Bearer " + _token);
 	request->addHeader("Content-Type: application/json");
 
@@ -71,6 +74,7 @@ void DropboxListDirectoryRequest::start() {
 
 void DropboxListDirectoryRequest::responseCallback(Networking::JsonResponse response) {
 	_workingRequest = nullptr;
+
 	if (_ignoreCallback) {
 		delete response.value;
 		return;
@@ -85,58 +89,109 @@ void DropboxListDirectoryRequest::responseCallback(Networking::JsonResponse resp
 		error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
 
 	Common::JSONValue *json = response.value;
-	if (json) {
-		Common::JSONObject responseObjecct = json->asObject();
+	if (json == nullptr) {
+		error.response = "Failed to parse JSON, null passed!";
+		finishError(error);
+		return;
+	}
+
+	if (!json->isObject()) {
+		error.response = "Passed JSON is not an object!";
+		finishError(error);
+		delete json;
+		return;
+	}
+
+	Common::JSONObject responseObject = json->asObject();
+
+	if (responseObject.contains("error") || responseObject.contains("error_summary")) {
+		if (responseObject.contains("error_summary") && responseObject.getVal("error_summary")->isString()) {
+			warning("Dropbox returned error: %s", responseObject.getVal("error_summary")->asString().c_str());
+		}
+		error.failed = true;
+		error.response = json->stringify();
+		finishError(error);
+		delete json;
+		return;
+	}
 
-		if (responseObjecct.contains("error") || responseObjecct.contains("error_summary")) {
-			warning("Dropbox returned error: %s", responseObjecct.getVal("error_summary")->asString().c_str());
-			error.failed = true;
-			error.response = json->stringify();
+	//check that ALL keys exist AND HAVE RIGHT TYPE to avoid segfaults
+	if (responseObject.contains("entries")) {
+		if (!responseObject.getVal("entries")->isArray()) {
+			error.response = Common::String::format(
+				"\"entries\" found, but that's not an array!\n%s",
+				responseObject.getVal("entries")->stringify(true).c_str()
+				);
 			finishError(error);
 			delete json;
 			return;
 		}
 
-		//TODO: check that ALL keys exist AND HAVE RIGHT TYPE to avoid segfaults
-
-		if (responseObjecct.contains("entries")) {
-			Common::JSONArray items = responseObjecct.getVal("entries")->asArray();
-			for (uint32 i = 0; i < items.size(); ++i) {
-				Common::JSONObject item = items[i]->asObject();
-				Common::String path = item.getVal("path_lower")->asString();
-				bool isDirectory = (item.getVal(".tag")->asString() == "folder");
-				uint32 size = 0, timestamp = 0;
-				if (!isDirectory) {
-					size = item.getVal("size")->asIntegerNumber();
-					timestamp = ISO8601::convertToTimestamp(item.getVal("server_modified")->asString());
-				}
-				_files.push_back(StorageFile(path, size, timestamp, isDirectory));
+		Common::JSONArray items = responseObject.getVal("entries")->asArray();
+		for (uint32 i = 0; i < items.size(); ++i) {
+			if (!Networking::CurlJsonRequest::jsonIsObject(items[i], "DropboxListDirectoryRequest"))
+				continue;
+
+			Common::JSONObject item = items[i]->asObject();
+
+			if (!Networking::CurlJsonRequest::jsonContainsString(item, "path_lower", "DropboxListDirectoryRequest"))
+				continue;
+			if (!Networking::CurlJsonRequest::jsonContainsString(item, ".tag", "DropboxListDirectoryRequest"))
+				continue;
+
+			Common::String path = item.getVal("path_lower")->asString();
+			bool isDirectory = (item.getVal(".tag")->asString() == "folder");
+			uint32 size = 0, timestamp = 0;
+			if (!isDirectory) {
+				if (!Networking::CurlJsonRequest::jsonContainsString(item, "server_modified", "DropboxListDirectoryRequest"))
+					continue;
+				if (!Networking::CurlJsonRequest::jsonContainsIntegerNumber(item, "size", "DropboxListDirectoryRequest"))
+					continue;
+
+				size = item.getVal("size")->asIntegerNumber();
+				timestamp = ISO8601::convertToTimestamp(item.getVal("server_modified")->asString());
 			}
+			_files.push_back(StorageFile(path, size, timestamp, isDirectory));
 		}
+	}
 
-		bool hasMore = (responseObjecct.contains("has_more") && responseObjecct.getVal("has_more")->asBool());
+	bool hasMore = false;
+	if (responseObject.contains("has_more")) {
+		if (!responseObject.getVal("has_more")->isBool()) {
+			warning("DropboxListDirectoryRequest: \"has_more\" is not a boolean");
+			debug(9, "%s", responseObject.getVal("has_more")->stringify(true).c_str());
+			error.response = "\"has_more\" is not a boolean!";
+			finishError(error);
+			delete json;
+			return;
+		}
 
-		if (hasMore) {
-			Networking::JsonCallback callback = new Common::Callback<DropboxListDirectoryRequest, Networking::JsonResponse>(this, &DropboxListDirectoryRequest::responseCallback);
-			Networking::ErrorCallback failureCallback = new Common::Callback<DropboxListDirectoryRequest, Networking::ErrorResponse>(this, &DropboxListDirectoryRequest::errorCallback);
-			Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(callback, failureCallback, "https://api.dropboxapi.com/2/files/list_folder/continue");
-			request->addHeader("Authorization: Bearer " + _token);
-			request->addHeader("Content-Type: application/json");
+		hasMore = responseObject.getVal("has_more")->asBool();
+	}
 
-			Common::JSONObject jsonRequestParameters;
-			jsonRequestParameters.setVal("cursor", new Common::JSONValue(responseObjecct.getVal("cursor")->asString()));
+	if (hasMore) {
+		if (!Networking::CurlJsonRequest::jsonContainsString(responseObject, "cursor", "DropboxListDirectoryRequest")) {
+			error.response = "\"has_more\" found, but \"cursor\" is not (or it's not a string)!";
+			finishError(error);
+			delete json;
+			return;
+		}
 
-			Common::JSONValue value(jsonRequestParameters);
-			request->addPostField(Common::JSON::stringify(&value));
+		Networking::JsonCallback callback = new Common::Callback<DropboxListDirectoryRequest, Networking::JsonResponse>(this, &DropboxListDirectoryRequest::responseCallback);
+		Networking::ErrorCallback failureCallback = new Common::Callback<DropboxListDirectoryRequest, Networking::ErrorResponse>(this, &DropboxListDirectoryRequest::errorCallback);
+		Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(callback, failureCallback, DROPBOX_API_LIST_FOLDER_CONTINUE);
+		request->addHeader("Authorization: Bearer " + _token);
+		request->addHeader("Content-Type: application/json");
 
-			_workingRequest = ConnMan.addRequest(request);
-		} else {
-			finishListing(_files);
-		}
+		Common::JSONObject jsonRequestParameters;
+		jsonRequestParameters.setVal("cursor", new Common::JSONValue(responseObject.getVal("cursor")->asString()));
+
+		Common::JSONValue value(jsonRequestParameters);
+		request->addPostField(Common::JSON::stringify(&value));
+
+		_workingRequest = ConnMan.addRequest(request);
 	} else {
-		warning("null, not json");
-		error.failed = true;
-		finishError(error);
+		finishListing(_files);
 	}
 
 	delete json;
diff --git a/backends/cloud/dropbox/dropboxstorage.cpp b/backends/cloud/dropbox/dropboxstorage.cpp
index cd1dff8afb..20f8a68327 100644
--- a/backends/cloud/dropbox/dropboxstorage.cpp
+++ b/backends/cloud/dropbox/dropboxstorage.cpp
@@ -37,6 +37,9 @@
 namespace Cloud {
 namespace Dropbox {
 
+#define DROPBOX_OAUTH2_TOKEN "https://api.dropboxapi.com/oauth2/token"
+#define DROPBOX_API_FILES_DOWNLOAD "https://content.dropboxapi.com/2/files/download"
+
 char *DropboxStorage::KEY = nullptr; //can't use CloudConfig there yet, loading it on instance creation/auth
 char *DropboxStorage::SECRET = nullptr; //TODO: hide these secrets somehow
 
@@ -65,7 +68,7 @@ void DropboxStorage::getAccessToken(Common::String code) {
 		loadKeyAndSecret();
 	Networking::JsonCallback callback = new Common::Callback<DropboxStorage, Networking::JsonResponse>(this, &DropboxStorage::codeFlowComplete);
 	Networking::ErrorCallback errorCallback = new Common::Callback<DropboxStorage, Networking::ErrorResponse>(this, &DropboxStorage::codeFlowFailed);
-	Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(callback, errorCallback, "https://api.dropboxapi.com/oauth2/token");
+	Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(callback, errorCallback, DROPBOX_OAUTH2_TOKEN);
 	request->addPostField("code=" + code);
 	request->addPostField("grant_type=authorization_code");
 	request->addPostField("client_id=" + Common::String(KEY));
@@ -129,7 +132,7 @@ Networking::Request *DropboxStorage::streamFileById(Common::String path, Network
 	jsonRequestParameters.setVal("path", new Common::JSONValue(path));
 	Common::JSONValue value(jsonRequestParameters);
 
-	Networking::CurlRequest *request = new Networking::CurlRequest(nullptr, nullptr, "https://content.dropboxapi.com/2/files/download"); //TODO: is it right?
+	Networking::CurlRequest *request = new Networking::CurlRequest(nullptr, nullptr, DROPBOX_API_FILES_DOWNLOAD); //TODO: is it OK to pass no callbacks?
 	request->addHeader("Authorization: Bearer " + _token);
 	request->addHeader("Dropbox-API-Arg: " + Common::JSON::stringify(&value));
 	request->addHeader("Content-Type: "); //required to be empty (as we do POST, it's usually app/form-url-encoded)
diff --git a/backends/cloud/dropbox/dropboxuploadrequest.cpp b/backends/cloud/dropbox/dropboxuploadrequest.cpp
index 03c3fbc244..f129eaa94d 100644
--- a/backends/cloud/dropbox/dropboxuploadrequest.cpp
+++ b/backends/cloud/dropbox/dropboxuploadrequest.cpp
@@ -32,6 +32,9 @@
 namespace Cloud {
 namespace Dropbox {
 
+#define DROPBOX_API_FILES_UPLOAD "https://content.dropboxapi.com/2/files/upload"
+#define DROPBOX_API_FILES_UPLOAD_SESSION "https://content.dropboxapi.com/2/files/upload_session/"
+
 DropboxUploadRequest::DropboxUploadRequest(Common::String token, Common::String path, Common::SeekableReadStream *contents, Storage::UploadCallback callback, Networking::ErrorCallback ecb):
 	Networking::Request(nullptr, ecb), _token(token), _savePath(path), _contentsStream(contents), _uploadCallback(callback),
 	_workingRequest(nullptr), _ignoreCallback(false) {
@@ -68,12 +71,12 @@ void DropboxUploadRequest::start() {
 void DropboxUploadRequest::uploadNextPart() {
 	const uint32 UPLOAD_PER_ONE_REQUEST = 10 * 1024 * 1024;
 
-	Common::String url = "https://content.dropboxapi.com/2/files/upload_session/";
+	Common::String url = DROPBOX_API_FILES_UPLOAD_SESSION;
 	Common::JSONObject jsonRequestParameters;
 
 	if (_contentsStream->pos() == 0 || _sessionId == "") {
 		if ((uint32)_contentsStream->size() <= UPLOAD_PER_ONE_REQUEST) {
-			url = "https://content.dropboxapi.com/2/files/upload";
+			url = DROPBOX_API_FILES_UPLOAD;
 			jsonRequestParameters.setVal("path", new Common::JSONValue(_savePath));
 			jsonRequestParameters.setVal("mode", new Common::JSONValue("overwrite"));
 			jsonRequestParameters.setVal("autorename", new Common::JSONValue(false));