Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 19:39:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Static avatar certification

Browse source
This commit is contained in:
Simon Walton 2019-04-07 22:14:53 -07:00
parent 73eef246ef
commit 56a06ef136
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
assignment-client/src/avatars/MixerAvatar.cpp
View file

@ -31,11 +31,13 @@ void MixerAvatar::fetchAvatarFST() {
return; return;
} }
// Match UUID + version // Match UUID + version
static const QRegularExpression marketIdRegex{ "^https?://mpassets.highfidelity.com/([-0-9a-z]{36,})/" }; static const QRegularExpression marketIdRegex
{ "^https://https://metaverse.highfidelity.com/api/v.+/commerce/entity_edition/([-0-9a-z]{36}).*certificate_id=([\\w/+%]+)" };
auto marketIdMatch = marketIdRegex.match(avatarURL.toDisplayString()); auto marketIdMatch = marketIdRegex.match(avatarURL.toDisplayString());
if (marketIdMatch.hasMatch()) { if (marketIdMatch.hasMatch()) {
QMutexLocker certifyLocker(&_avatarCertifyLock); QMutexLocker certifyLocker(&_avatarCertifyLock);
_marketplaceIdString = marketIdMatch.captured(1); _marketplaceIdString = marketIdMatch.captured(1);
_certificateId = QUrl::fromPercentEncoding(marketIdMatch.captured(2).toUtf8());
} else { } else {
_marketplaceIdString = "2119142f-0cd6-4126-b18e-06b53afcc0a9"; // XXX: plants entity, for testing _marketplaceIdString = "2119142f-0cd6-4126-b18e-06b53afcc0a9"; // XXX: plants entity, for testing
} }
@ -57,8 +59,8 @@ void MixerAvatar::fetchAvatarFST() {
} }
// TESTING // TESTING
static const QString PLANT_CERTID { static const QString PLANT_CERTID
"MEYCIQDxKA62xq/G/x1aWpXyJbGjIHm6SU4ceQu2ljtFRfeu/QIhAKw2uEfLId8sqLfEoErOlvu2UV2wbP3ttrYP1hoZT0Ge"}; { "MEYCIQDxKA62xq/G/x1aWpXyJbGjIHm6SU4ceQu2ljtFRfeu/QIhAKw2uEfLId8sqLfEoErOlvu2UV2wbP3ttrYP1hoZT0Ge" };
void MixerAvatar::fstRequestComplete() { void MixerAvatar::fstRequestComplete() {
ResourceRequest* fstRequest = static_cast<ResourceRequest*>(QObject::sender()); ResourceRequest* fstRequest = static_cast<ResourceRequest*>(QObject::sender());
@ -73,13 +75,10 @@ void MixerAvatar::fstRequestComplete() {
_verifyState = kReceivedFST; _verifyState = kReceivedFST;
generateFSTHash(); generateFSTHash();
QString& marketplacePublicKey = EntityItem::_marketplacePublicKey; QString& marketplacePublicKey = EntityItem::_marketplacePublicKey;
_certificateId = PLANT_CERTID;
bool staticVerification = validateFSTHash(marketplacePublicKey); bool staticVerification = validateFSTHash(marketplacePublicKey);
if (!staticVerification) { _verifyState = staticVerification ? kStaticValidation : kNoncertified;
_verifyState = kNoncertified;
}
if (!_certificateId.isEmpty()) { if (_verifyState == kStaticValidation) {
static const QString POP_MARKETPLACE_API { "/api/v1/commerce/proof_of_purchase_status/transfer" }; static const QString POP_MARKETPLACE_API { "/api/v1/commerce/proof_of_purchase_status/transfer" };
auto& networkAccessManager = NetworkAccessManager::getInstance(); auto& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest networkRequest; QNetworkRequest networkRequest;
@ -99,7 +98,7 @@ void MixerAvatar::fstRequestComplete() {
qCDebug(avatars) << "Marketplace response for avatar" << getDisplayName() << ":" << responseString; qCDebug(avatars) << "Marketplace response for avatar" << getDisplayName() << ":" << responseString;
QJsonDocument responseJson = QJsonDocument::fromJson(responseString.toUtf8()); QJsonDocument responseJson = QJsonDocument::fromJson(responseString.toUtf8());
if (networkReply->error() == QNetworkReply::NoError) { if (networkReply->error() == QNetworkReply::NoError) {
volatile int x = 1; QMutexLocker certifyLocker(&_avatarCertifyLock);
if (responseJson["status"].toString() == "success") { if (responseJson["status"].toString() == "success") {
auto jsonData = responseJson["data"]; auto jsonData = responseJson["data"];
// owner, owner key? // owner, owner key?