Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 14:03:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Progress?

Browse source
This commit is contained in:
Zach Fox 2017-10-04 13:12:21 -07:00
parent ab08dc6bd6
commit cf7c1934f8
2 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
libraries/entities/src/EntityTree.cpp
View file

@ -1097,26 +1097,6 @@ bool EntityTree::isScriptInWhitelist(const QString& scriptProperty) {
return false;
}
void EntityTree::popStatusSuccess(QNetworkReply& reply) {
QJsonObject jsonObject = QJsonDocument::fromJson(reply.readAll()).object();
qCDebug(entities) << "ZRF FIXME" << jsonObject;
//if (!jsonObject["invalid_reason"].toString().isEmpty()) {
// qCDebug(entities) << "invalid_reason not empty, deleting entity" << entityItemID;
// deleteEntity(entityItemID, true);
//} else if (jsonObject["transfer_status"].toString() == "failed") {
// qCDebug(entities) << "'transfer_status' is 'failed', deleting entity" << entityItemID;
// deleteEntity(entityItemID, true);
//} else {
//}
}
void EntityTree::popStatusFailure(QNetworkReply& reply) {
QJsonObject jsonObject = QJsonDocument::fromJson(reply.readAll()).object();
qCDebug(entities) << "ZRF FIXME" << jsonObject;
//qCDebug(entities) << "Call to proof_of_purchase_status endpoint failed; deleting entity" << entityItemID;
//deleteEntity(entityItemID, true);
}
int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned char* editData, int maxLength,
const SharedNodePointer& senderNode) {
@ -1344,26 +1324,51 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
// Start owner verification.
// First, asynchronously hit "proof_of_purchase_status?transaction_type=transfer" endpoint.
const QString endpoint("proof_of_purchase_status?transaction_type=transfer");
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest networkRequest;
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
QUrl requestURL = NetworkingConstants::METAVERSE_SERVER_URL;
requestURL.setPath("/api/v1/commerce/proof_of_purchase_status?transaction_type=transfer");
QJsonObject request;
request["certificate_id"] = certID;
request["domain_id"] = DependencyManager::get<NodeList>()->getDomainHandler().getUUID().toString();
networkRequest.setUrl(requestURL);
auto accountManager = DependencyManager::get<AccountManager>();
const QString URL = "/api/v1/commerce/";
JSONCallbackParameters callbackParams(this, "popStatusSuccess", this, "popStatusFailure");
qCDebug(entities) << "Sending" << endpoint << QJsonDocument(request).toJson(QJsonDocument::Compact);
accountManager->sendRequest(URL + endpoint,
AccountManagerAuth::None,
QNetworkAccessManager::GetOperation,
callbackParams,
QJsonDocument(request).toJson());
QNetworkReply* networkReply = NULL;
networkReply = networkAccessManager.get(networkRequest);
// Second, challenge ownership of the PoP cert
//auto challengeOwnershipPacket = NLPacket::create(PacketType::ChallengeOwnership, NUM_BYTES_RFC4122_UUID + sizeof(encryptedText));
//challengeOwnershipPacket->write(senderNode->getUUID());
//challengeOwnershipPacket->writePrimitive(KillAvatarReason::TheirAvatarEnteredYourBubble);
//// Kickoff a 10-second timeout timer that deletes the entity if we don't get an ownership response in time
connect(networkReply, &QNetworkReply::finished, [=]() {
QJsonObject jsonObject = QJsonDocument::fromJson(networkReply->readAll()).object();
QJsonDocument doc(jsonObject);
qCDebug(entities) << "ZRF FIXME" << networkReply->error();
qCDebug(entities) << "ZRF FIXME" << doc.toJson(QJsonDocument::Compact);
if (networkReply->error() == QNetworkReply::NoError) {
//QJsonObject jsonObject = QJsonDocument::fromJson(reply.readAll()).object();
//qCDebug(entities) << "ZRF FIXME" << jsonObject;
//if (!jsonObject["invalid_reason"].toString().isEmpty()) {
// qCDebug(entities) << "invalid_reason not empty, deleting entity" << entityItemID;
// deleteEntity(entityItemID, true);
//} else if (jsonObject["transfer_status"].toString() == "failed") {
// qCDebug(entities) << "'transfer_status' is 'failed', deleting entity" << entityItemID;
// deleteEntity(entityItemID, true);
//} else {
// // Second, challenge ownership of the PoP cert
// // 1. Encrypt a nonce with the owner's public key
// QString ownerKey(jsonObject["owner_public_key"].toString());
// QString encryptedText("");
// // 2. Send the encrypted text to the rezzing avatar's node
// auto challengeOwnershipPacket = NLPacket::create(PacketType::ChallengeOwnership, NUM_BYTES_RFC4122_UUID + sizeof(encryptedText));
// challengeOwnershipPacket->write(senderNode->getUUID());
// challengeOwnershipPacket->writePrimitive(encryptedText);
// // 3. Kickoff a 10-second timeout timer that deletes the entity if we don't get an ownership response in time
//}
} else {
//qCDebug(entities) << "Call to proof_of_purchase_status endpoint failed; deleting entity" << entityItemID;
//deleteEntity(entityItemID, true);
}
});
}
}

5
libraries/entities/src/EntityTree.h
View file

@ -18,6 +18,7 @@
#include "AccountManager.h"
#include <QJsonObject>
#include <QJsonDocument>
#include <NetworkingConstants.h>
#include <Octree.h>
#include <SpatialParentFinder.h>
@ -281,10 +282,6 @@ signals:
void newCollisionSoundURL(const QUrl& url, const EntityItemID& entityID);
void clearingEntities();
private slots:
void popStatusSuccess(QNetworkReply& reply);
void popStatusFailure(QNetworkReply& reply);
protected:
void processRemovedEntities(const DeleteEntityOperator& theOperator);