CLOUD: Simplify OneDriveTokenRefresher
It now just extends CurlJsonRequest, not wraps one.
This commit is contained in:
Alexander Tkachev
parent
dcbaeb57c4
commit
6c01edc57a
3 changed files with 44 additions and 94 deletions
|
|
@ -23,10 +23,7 @@
|
|||
|
||||
#include "backends/cloud/onedrive/onedrivetokenrefresher.h"
|
||||
#include "backends/cloud/onedrive/onedrivestorage.h"
|
||||
#include "backends/networking/curl/connectionmanager.h"
|
||||
#include "backends/networking/curl/curljsonrequest.h"
|
||||
#include "backends/networking/curl/networkreadstream.h"
|
||||
#include "common/config-manager.h"
|
||||
#include "common/debug.h"
|
||||
#include "common/json.h"
|
||||
#include <curl/curl.h>
|
||||
|
|
@ -35,50 +32,10 @@ namespace Cloud {
|
|||
namespace OneDrive {
|
||||
|
||||
OneDriveTokenRefresher::OneDriveTokenRefresher(OneDriveStorage *parent, Networking::JsonCallback callback, const char *url):
|
||||
CurlJsonRequest(0, url),
|
||||
_parentStorage(parent),
|
||||
_innerRequest(
|
||||
new CurlJsonRequest(
|
||||
new Common::Callback<OneDriveTokenRefresher, Networking::JsonResponse>(this, &OneDriveTokenRefresher::innerRequestCallback),
|
||||
url
|
||||
)
|
||||
), _jsonCallback(callback), _retryRequest(nullptr), _started(false) {}
|
||||
CurlJsonRequest(callback, url), _parentStorage(parent) {}
|
||||
|
||||
OneDriveTokenRefresher::~OneDriveTokenRefresher() {}
|
||||
|
||||
void OneDriveTokenRefresher::innerRequestCallback(Networking::JsonResponse pair) {
|
||||
if (!pair.value) {
|
||||
//notify user of failure
|
||||
warning("OneDriveTokenRefresher: got NULL instead of JSON");
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
|
||||
Common::JSONObject result = pair.value->asObject();
|
||||
if (result.contains("error")) {
|
||||
//new token needed => request token & then retry original request
|
||||
CurlJsonRequest *streamRequest = (CurlJsonRequest *)pair.request;
|
||||
if (streamRequest) {
|
||||
const Networking::NetworkReadStream *stream = streamRequest->getNetworkReadStream();
|
||||
if (stream) {
|
||||
debug("code %ld", stream->httpResponseCode());
|
||||
}
|
||||
}
|
||||
|
||||
Common::JSONObject error = result.getVal("error")->asObject();
|
||||
debug("code = %s", error.getVal("code")->asString().c_str());
|
||||
debug("message = %s", error.getVal("message")->asString().c_str());
|
||||
if (pair.request) pair.request->pause();
|
||||
_retryRequest = pair.request;
|
||||
delete pair.value;
|
||||
_parentStorage->getAccessToken(new Common::Callback<OneDriveTokenRefresher, Storage::BoolResponse>(this, &OneDriveTokenRefresher::tokenRefreshed));
|
||||
return;
|
||||
}
|
||||
|
||||
//notify user of success
|
||||
finishJson(pair.value);
|
||||
}
|
||||
|
||||
void OneDriveTokenRefresher::tokenRefreshed(Storage::BoolResponse pair) {
|
||||
if (!pair.value) {
|
||||
//failed to refresh token, notify user with NULL in original callback
|
||||
|
|
@ -87,53 +44,54 @@ void OneDriveTokenRefresher::tokenRefreshed(Storage::BoolResponse pair) {
|
|||
return;
|
||||
}
|
||||
|
||||
//successfully received refreshed token, can restart the original request now
|
||||
if (_retryRequest) _retryRequest->retry(1);
|
||||
|
||||
//update headers: first change header with token, then pass those to request
|
||||
for (uint32 i = 0; i < _headers.size(); ++i) {
|
||||
if (_headers[i].contains("Authorization")) {
|
||||
_headers[i] = "Authorization: bearer " + _parentStorage->accessToken();
|
||||
}
|
||||
}
|
||||
CurlJsonRequest *retryRequest = (CurlJsonRequest *)_retryRequest;
|
||||
if (retryRequest) retryRequest->setHeaders(_headers);
|
||||
}
|
||||
setHeaders(_headers);
|
||||
|
||||
void OneDriveTokenRefresher::handle() {
|
||||
if (!_started) {
|
||||
for (uint32 i = 0; i < _headers.size(); ++i)
|
||||
_innerRequest->addHeader(_headers[i]);
|
||||
_started = true;
|
||||
ConnMan.addRequest(_innerRequest);
|
||||
}
|
||||
}
|
||||
|
||||
void OneDriveTokenRefresher::restart() {
|
||||
//can't restart as all headers were passed to _innerRequest which is probably dead now
|
||||
warning("OneDriveTokenRefresher: cannot be restarted");
|
||||
finish();
|
||||
}
|
||||
|
||||
void OneDriveTokenRefresher::finish() {
|
||||
finishJson(0);
|
||||
//successfully received refreshed token, can restart the original request now
|
||||
retry(0);
|
||||
}
|
||||
|
||||
void OneDriveTokenRefresher::finishJson(Common::JSONValue *json) {
|
||||
Request::finish();
|
||||
if (_jsonCallback) (*_jsonCallback)(Networking::JsonResponse(this, json));
|
||||
if (!json) {
|
||||
//notify user of failure
|
||||
warning("OneDriveTokenRefresher: got NULL instead of JSON");
|
||||
CurlJsonRequest::finish();
|
||||
return;
|
||||
}
|
||||
|
||||
Networking::NetworkReadStreamResponse OneDriveTokenRefresher::execute() {
|
||||
if (!_started) {
|
||||
for (uint32 i = 0; i < _headers.size(); ++i)
|
||||
_innerRequest->addHeader(_headers[i]);
|
||||
_started = true;
|
||||
} else {
|
||||
warning("OneDriveTokenRefresher: inner Request is already started");
|
||||
Common::JSONObject result = json->asObject();
|
||||
if (result.contains("error")) {
|
||||
//new token needed => request token & then retry original request
|
||||
if (_stream) {
|
||||
debug("code %ld", _stream->httpResponseCode());
|
||||
}
|
||||
return _innerRequest->execute();
|
||||
|
||||
Common::JSONObject error = result.getVal("error")->asObject();
|
||||
debug("code = %s", error.getVal("code")->asString().c_str());
|
||||
debug("message = %s", error.getVal("message")->asString().c_str());
|
||||
pause();
|
||||
delete json;
|
||||
_parentStorage->getAccessToken(new Common::Callback<OneDriveTokenRefresher, Storage::BoolResponse>(this, &OneDriveTokenRefresher::tokenRefreshed));
|
||||
return;
|
||||
}
|
||||
|
||||
//notify user of success
|
||||
CurlJsonRequest::finishJson(json);
|
||||
}
|
||||
|
||||
void OneDriveTokenRefresher::setHeaders(Common::Array<Common::String> &headers) {
|
||||
_headers = headers;
|
||||
curl_slist_free_all(_headersList);
|
||||
_headersList = 0;
|
||||
for (uint32 i = 0; i < headers.size(); ++i)
|
||||
CurlJsonRequest::addHeader(headers[i]);
|
||||
}
|
||||
|
||||
|
||||
} //end of namespace OneDrive
|
||||
} //end of namespace Cloud
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
#define BACKENDS_CLOUD_ONEDRIVE_ONEDRIVETOKENREFRESHER_H
|
||||
|
||||
#include "backends/cloud/storage.h"
|
||||
#include "common/callback.h"
|
||||
#include "backends/networking/curl/curljsonrequest.h"
|
||||
|
||||
namespace Cloud {
|
||||
|
|
@ -35,12 +34,7 @@ class OneDriveStorage;
|
|||
class OneDriveTokenRefresher: public Networking::CurlJsonRequest {
|
||||
OneDriveStorage *_parentStorage;
|
||||
Common::Array<Common::String> _headers;
|
||||
CurlJsonRequest *_innerRequest;
|
||||
Networking::JsonCallback _jsonCallback;
|
||||
Request *_retryRequest;
|
||||
bool _started;
|
||||
|
||||
void innerRequestCallback(Networking::JsonResponse pair);
|
||||
void tokenRefreshed(Storage::BoolResponse pair);
|
||||
|
||||
virtual void finishJson(Common::JSONValue *json);
|
||||
|
|
@ -48,14 +42,12 @@ public:
|
|||
OneDriveTokenRefresher(OneDriveStorage *parent, Networking::JsonCallback callback, const char *url);
|
||||
virtual ~OneDriveTokenRefresher();
|
||||
|
||||
virtual void handle();
|
||||
virtual void restart();
|
||||
virtual void finish();
|
||||
virtual void setHeaders(Common::Array<Common::String> &headers);
|
||||
|
||||
virtual void setHeaders(Common::Array<Common::String> &headers) { _headers = headers; }
|
||||
virtual void addHeader(Common::String header) { _headers.push_back(header); }
|
||||
virtual void addPostField(Common::String field) { _innerRequest->addPostField(field); }
|
||||
virtual Networking::NetworkReadStreamResponse execute();
|
||||
virtual void addHeader(Common::String header) {
|
||||
_headers.push_back(header);
|
||||
CurlJsonRequest::addHeader(header);
|
||||
}
|
||||
};
|
||||
|
||||
} //end of namespace OneDrive
|
||||
|
|
|
|||
|
|
@ -33,13 +33,13 @@ typedef Response<Common::JSONValue *> JsonResponse;
|
|||
typedef Common::BaseCallback<JsonResponse> *JsonCallback;
|
||||
|
||||
class CurlJsonRequest: public CurlRequest {
|
||||
protected:
|
||||
JsonCallback _jsonCallback;
|
||||
Common::MemoryWriteStreamDynamic _contentsStream;
|
||||
|
||||
/** Prepares raw bytes from _contentsStream to be parsed with Common::JSON::parse(). */
|
||||
char *getPreparedContents();
|
||||
|
||||
protected:
|
||||
/** Sets FINISHED state and passes the JSONValue * into user's callback in JsonResponse. */
|
||||
virtual void finishJson(Common::JSONValue *json);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue