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

Added device_id parameter into purchase validation.

Browse source
This commit is contained in:
Daria Volvenkova 2018-09-17 15:33:15 +03:00 • committed by Roman Kuznetsov
parent 1844f65ecd
commit 9cbdd42975
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
map/purchase.cpp
View file

@ -30,11 +30,21 @@ std::string const kReceiptType = "google";
std::string const kReceiptType {};
#endif
std::string GetSubscriptionId()
std::string GetClientIdHash()
{
return coding::SHA1::CalculateBase64ForString(GetPlatform().UniqueClientId());
}
std::string GetSubscriptionId()
{
return GetClientIdHash();
}
std::string GetDeviceId()
{
return GetClientIdHash();
}
std::string ValidationUrl()
{
if (kServerUrl.empty())
@ -58,19 +68,23 @@ struct ReceiptData
struct ValidationData
{
ValidationData(Purchase::ValidationInfo const & validationInfo, std::string const & receiptType)
ValidationData(Purchase::ValidationInfo const & validationInfo, std::string const & receiptType,
std::string const & deviceId)
: m_serverId(validationInfo.m_serverId)
, m_vendorId(validationInfo.m_vendorId)
, m_receipt(validationInfo.m_receiptData, receiptType)
, m_deviceId(deviceId)
{}
std::string m_serverId;
std::string m_vendorId;
ReceiptData m_receipt;
std::string m_deviceId;
DECLARE_VISITOR(visitor(m_serverId, "server_id"),
visitor(m_vendorId, "vendor"),
visitor(m_receipt, "receipt"))
visitor(m_receipt, "receipt"),
visitor(m_deviceId, "device_id"))
};
struct ValidationResult
@ -164,7 +178,7 @@ void Purchase::Validate(ValidationInfo const & validationInfo, std::string const
using Sink = MemWriter<std::string>;
Sink sink(jsonStr);
coding::SerializerJson<Sink> serializer(sink);
serializer(ValidationData(validationInfo, kReceiptType));
serializer(ValidationData(validationInfo, kReceiptType, GetDeviceId()));
}
request.SetBodyData(std::move(jsonStr), "application/json");