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

use existing constants for HTTP operations

Browse source
This commit is contained in:
Stephen Birarda 2014-02-19 18:12:10 -08:00
parent d3dd49a2e8
commit cb165902fd
4 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/src/DomainServer.cpp
View file

@ -92,7 +92,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
void DomainServer::requestUUIDFromDataServer() { void DomainServer::requestUUIDFromDataServer() {
// this slot is fired when we get a valid access token from the data-server // this slot is fired when we get a valid access token from the data-server
// now let's ask it to set us up with a UUID // now let's ask it to set us up with a UUID
AccountManager::getInstance().authenticatedRequest("/api/v1/domains/create", AuthenticatedRequestMethod::POST, AccountManager::getInstance().authenticatedRequest("/api/v1/domains/create", QNetworkAccessManager::PostOperation,
this, SLOT(parseUUIDFromDataServer())); this, SLOT(parseUUIDFromDataServer()));
} }

8
libraries/shared/src/AccountManager.cpp
View file

@ -52,7 +52,7 @@ AccountManager::AccountManager() :
} }
} }
void AccountManager::authenticatedRequest(const QString& path, AuthenticatedRequestMethod::Method method, void AccountManager::authenticatedRequest(const QString& path, QNetworkAccessManager::Operation operation,
const QObject *successReceiver, const char *successMethod, const QObject *successReceiver, const char *successMethod,
const QByteArray& dataByteArray, const QByteArray& dataByteArray,
const QObject* errorReceiver, const char* errorMethod) { const QObject* errorReceiver, const char* errorMethod) {
@ -69,11 +69,11 @@ void AccountManager::authenticatedRequest(const QString& path, AuthenticatedRequ
QNetworkReply* networkReply = NULL; QNetworkReply* networkReply = NULL;
switch (method) { switch (operation) {
case AuthenticatedRequestMethod::GET: case QNetworkAccessManager::GetOperation:
networkReply = _networkAccessManager->get(authenticatedRequest); networkReply = _networkAccessManager->get(authenticatedRequest);
break; break;
case AuthenticatedRequestMethod::POST: case QNetworkAccessManager::PostOperation:
authenticatedRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); authenticatedRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
networkReply = _networkAccessManager->post(authenticatedRequest, dataByteArray); networkReply = _networkAccessManager->post(authenticatedRequest, dataByteArray);
default: default:

11
libraries/shared/src/AccountManager.h
View file

@ -17,15 +17,6 @@
#include "OAuthAccessToken.h" #include "OAuthAccessToken.h"
namespace AuthenticatedRequestMethod {
enum Method {
GET,
POST,
PUT,
DELETE
};
}
class AccountManager : public QObject { class AccountManager : public QObject {
Q_OBJECT Q_OBJECT
public: public:
@ -33,7 +24,7 @@ public:
static AccountManager& getInstance(); static AccountManager& getInstance();
void authenticatedRequest(const QString& path, void authenticatedRequest(const QString& path,
AuthenticatedRequestMethod::Method method, QNetworkAccessManager::Operation operation,
const QObject* successReceiver, const char* successMethod, const QObject* successReceiver, const char* successMethod,
const QByteArray& dataByteArray = QByteArray(), const QByteArray& dataByteArray = QByteArray(),
const QObject* errorReceiver = 0, const char* errorMethod = NULL); const QObject* errorReceiver = 0, const char* errorMethod = NULL);

2
libraries/shared/src/NodeList.cpp
View file

@ -588,7 +588,7 @@ void NodeList::domainServerAuthReply() {
void NodeList::requestAuthForDomainServer() { void NodeList::requestAuthForDomainServer() {
AccountManager::getInstance().authenticatedRequest("/api/v1/domains/" AccountManager::getInstance().authenticatedRequest("/api/v1/domains/"
+ uuidStringWithoutCurlyBraces(_domainInfo.getUUID()) + "/auth.json", + uuidStringWithoutCurlyBraces(_domainInfo.getUUID()) + "/auth.json",
AuthenticatedRequestMethod::GET, QNetworkAccessManager::GetOperation,
this, SLOT(domainServerAuthReply())); this, SLOT(domainServerAuthReply()));
} }