RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Added cloud notification

Browse source
This commit is contained in:
r.kuznetsov 2018-02-22 12:06:55 +03:00 • committed by Aleksandr Zatsepin
parent b18bc420a0
commit 9510f9d135
2 changed files with 73 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
map/cloud.cpp
View file

@ -41,6 +41,8 @@ uint64_t constexpr kMaxUploadingFileSizeInBytes = 100 * 1024 * 1024; // 100Mb
std::string const kServerUrl = CLOUD_URL;
std::string const kCloudServerVersion = "v1";
std::string const kCloudServerUploadMethod = "upload_url";
std::string const kCloudServerNotifyMethod = "upload_succeeded";
std::string const kApplicationJson = "application/json";
std::string GetIndexFilePath(std::string const & indexName)
{
@ -60,6 +62,19 @@ std::string BuildUploadingUrl(std::string const & serverPathName)
return ss.str();
}
std::string BuildNotificationUrl(std::string const & serverPathName)
{
if (kServerUrl.empty())
return {};
std::ostringstream ss;
ss << kServerUrl << "/"
<< kCloudServerVersion << "/"
<< serverPathName << "/"
<< kCloudServerNotifyMethod << "/";
return ss.str();
}
std::string BuildAuthenticationToken(std::string const & accessToken)
{
return "Bearer " + accessToken;
@ -99,6 +114,26 @@ std::string CalculateSHA1(std::string const & filePath)
}
return {};
}
std::string BuildUploadingRequestDataJson(std::string const & filePath)
{
std::string jsonBody;
Cloud::UploadingRequestData data;
data.m_alohaId = GetPlatform().UniqueClientId();
data.m_deviceName = GetPlatform().DeviceName();
data.m_fileName = ExtractFileName(filePath);
using Sink = MemWriter<string>;
Sink sink(jsonBody);
coding::SerializerJson<Sink> serializer(sink);
serializer(data);
return jsonBody;
}
bool IsSuccessfulResultCode(int resultCode)
{
return resultCode >= 200 && resultCode < 300;
}
} // namespace
Cloud::Cloud(CloudParams && params)
@ -461,6 +496,15 @@ void Cloud::ScheduleUploadingTask(EntryPtr const & entry, uint32_t timeout,
FinishUploading(SynchronizationResult::NetworkError, executeResult.m_error);
return;
}
// Notify about successful uploading.
auto const notificationResult =
NotifyAboutUploading(BuildNotificationUrl(m_params.m_serverPathName), uploadedName);
if (executeResult.m_status != RequestStatus::Ok)
{
FinishUploading(SynchronizationResult::NetworkError, notificationResult.m_error);
return;
}
}
// Mark entry as not outdated.
@ -515,33 +559,17 @@ std::string Cloud::PrepareFileToUploading(std::string const & fileName,
Cloud::UploadingResult Cloud::RequestUploading(std::string const & uploadingUrl,
std::string const & filePath) const
{
static std::string const kApplicationJson = "application/json";
UploadingResult result;
platform::HttpClient request(uploadingUrl);
request.SetRawHeader("Accept", kApplicationJson);
request.SetRawHeader("Authorization", BuildAuthenticationToken(m_accessToken));
std::string jsonBody;
{
UploadingRequestData data;
data.m_alohaId = GetPlatform().UniqueClientId();
data.m_deviceName = GetPlatform().DeviceName();
data.m_fileName = ExtractFileName(filePath);
using Sink = MemWriter<string>;
Sink sink(jsonBody);
coding::SerializerJson<Sink> serializer(sink);
serializer(data);
}
request.SetBodyData(std::move(jsonBody), kApplicationJson);
request.SetBodyData(BuildUploadingRequestDataJson(filePath), kApplicationJson);
if (request.RunHttpRequest() && !request.WasRedirected())
{
int const resultCode = request.ErrorCode();
bool const isSuccessfulCode = (resultCode == 200 || resultCode == 201);
if (isSuccessfulCode)
if (IsSuccessfulResultCode(resultCode))
{
result.m_requestResult = {RequestStatus::Ok, {}};
coding::DeserializerJson des(request.ServerResponse());
@ -580,7 +608,7 @@ Cloud::RequestResult Cloud::ExecuteUploading(UploadingResponseData const & respo
request.SetFilePath(filePath);
auto const result = request.Upload();
if (result.m_httpCode == 200 || result.m_httpCode == 201)
if (IsSuccessfulResultCode(result.m_httpCode))
return {RequestStatus::Ok, {}};
auto const errorStr = strings::to_string(result.m_httpCode) + " " + result.m_description;
@ -590,6 +618,30 @@ Cloud::RequestResult Cloud::ExecuteUploading(UploadingResponseData const & respo
return {RequestStatus::NetworkError, errorStr};
}
Cloud::RequestResult Cloud::NotifyAboutUploading(std::string const & notificationUrl,
std::string const & filePath) const
{
platform::HttpClient request(notificationUrl);
request.SetRawHeader("Accept", kApplicationJson);
request.SetRawHeader("Authorization", BuildAuthenticationToken(m_accessToken));
request.SetBodyData(BuildUploadingRequestDataJson(filePath), kApplicationJson);
if (request.RunHttpRequest() && !request.WasRedirected())
{
int const resultCode = request.ErrorCode();
if (IsSuccessfulResultCode(resultCode))
return {RequestStatus::Ok, {}};
if (resultCode == 403)
{
LOG(LWARNING, ("Access denied for", notificationUrl));
return {RequestStatus::Forbidden, request.ServerResponse()};
}
}
return {RequestStatus::NetworkError, request.ServerResponse()};
}
Cloud::EntryPtr Cloud::FindOutdatedEntry() const
{
std::lock_guard<std::mutex> lock(m_mutex);

2
map/cloud.hpp
View file

@ -199,6 +199,8 @@ private:
std::string const & filePath) const;
RequestResult ExecuteUploading(UploadingResponseData const & responseData,
std::string const & filePath);
RequestResult NotifyAboutUploading(std::string const & notificationUrl,
std::string const & filePath) const;
CloudParams const m_params;
InvalidTokenHandler m_onInvalidToken;