ondra/colnod-connector
1
0
Fork 1
mirror of https://gitlab.com/spaceti-app/integrations/acs/colnod-connector.git synced 2026-07-12 19:20:37 +02:00
Code Issues Projects Releases Wiki Activity

fix for Qt 5.9

Browse Source
This commit is contained in:
Ondřej Fischer 2019-10-01 13:33:00 +02:00
parent da391a44d5
commit c44def7650
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/colnod/requestmanager.cpp
View File

@ -78,11 +78,12 @@ void RequestManager::getRequest(QString endpoint)
qDebug() << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute); qDebug() << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
jsonResponse = reply->readAll(); jsonResponse = reply->readAll();
//qDebug() << jsonResponse;
emit responseReady(); emit responseReady();
}); });
} }
QString RequestManager::getFromJson(QString json, QString member) QString RequestManager::getFromJson(QString json, const QString &member)
{ {
QJsonParseError err; QJsonParseError err;
QJsonDocument document = QJsonDocument::fromJson(json.toUtf8(),&err); QJsonDocument document = QJsonDocument::fromJson(json.toUtf8(),&err);
@ -90,7 +91,7 @@ QString RequestManager::getFromJson(QString json, QString member)
{ {
qDebug() << err.errorString(); qDebug() << err.errorString();
} }
return document[member].toString(); return document.object().value(member).toString();
} }
QString RequestManager::encryptedPassword(QString password) QString RequestManager::encryptedPassword(QString password)

2
src/colnod/requestmanager.h
View File

@ -34,7 +34,7 @@ public:
QString getToken(){return token;} QString getToken(){return token;}
private: private:
QString getFromJson(QString json, QString member); QString getFromJson(QString json, const QString &member);
QString encryptedPassword(QString password); QString encryptedPassword(QString password);
QString getLoginHeader(QString username, QString hash); QString getLoginHeader(QString username, QString hash);
void prepareAuthHeader(); void prepareAuthHeader();

10
test/unitTests/UnitTest.cpp
View File

@ -12,7 +12,7 @@ void UnitTest::loginSuccessfully()
QString json = testAccess->getResponse(); QString json = testAccess->getResponse();
qDebug() << json; qDebug() << json;
QJsonDocument doc = QJsonDocument::fromJson(json.toUtf8()); QJsonDocument doc = QJsonDocument::fromJson(json.toUtf8());
QVERIFY2(doc["id"].isString(), "No parameter 'id' in response"); QVERIFY2(doc.object().value("id").isString(), "No parameter 'id' in response");
} }
//POST request w/o datas //POST request w/o datas
@ -28,9 +28,9 @@ void UnitTest::getSubjects()
QString json = testAccess->getResponse(); QString json = testAccess->getResponse();
QJsonDocument doc = QJsonDocument::fromJson(json.toUtf8()); QJsonDocument doc = QJsonDocument::fromJson(json.toUtf8());
QVERIFY(doc.isObject()); QVERIFY(doc.isObject());
QVERIFY2(doc["items"].isArray(), "No parameter 'id' in response"); QVERIFY2(doc.object().value("items").isArray(), "No parameter 'id' in response");
qDebug() << doc["items"].toArray()[0].toObject()["id"].toString(); qDebug() << doc.object().value("items").toArray()[0].toObject()["id"].toString();
QVERIFY2(doc["items"].toArray()[0].toObject()["id"].isString(), "ada"); QVERIFY2(doc.object().value("items").toArray()[0].toObject()["id"].isString(), "ada");
} }
@ -58,8 +58,8 @@ void UnitTest::getTokensOpenManager()
QVERIFY(spy.isValid()); QVERIFY(spy.isValid());
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
QString response = testAccess->getResponse(); QString response = testAccess->getResponse();
QVERIFY(!response.isEmpty());
qDebug() << response; qDebug() << response;
QVERIFY(!response.isEmpty());
} }

10
test/unitTests/unittest.h
View File

@ -11,12 +11,10 @@ class UnitTest : public QObject
private slots: private slots:
void loginSuccessfully(); void loginSuccessfully(); // /AaaManager/authSession
void getSubjects(); // /SubjectManager/getSubjects
void getTokens(); // /TokenManager/getTokens
void getTokens(); void getTokensOpenManager(); // /OpenManager/getTokenSubject
void getTokensOpenManager();
void getSubjects();
private: private:
// QString host = "https://localhost:8080"; //colnod server (ssh -L 8080:192.168.254.11:8443 penta-master) // QString host = "https://localhost:8080"; //colnod server (ssh -L 8080:192.168.254.11:8443 penta-master)