sessionIdChanged working

This commit is contained in:
Jeena 2015-01-10 15:06:14 +01:00
parent 9bbc88eca7
commit bd1a80af61
5 changed files with 63 additions and 35 deletions

View file

@ -1,12 +1,18 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import TTRSS 1.0
Rectangle { Rectangle {
color: "white" color: "white"
anchors.fill: parent anchors.fill: parent
function login() { Login {
id: ttrsslogin
onSessionIdChanged: parent.visible = false
}
function login() {
ttrsslogin.login(serverUrl.getText(), userName.getText(), password.getText())
} }
Column { Column {

View file

@ -1,11 +1,17 @@
#include <QGuiApplication> #include <QGuiApplication>
#include <QQmlApplicationEngine> #include <QQmlApplicationEngine>
#include <qdebug.h> #include <qdebug.h>
#include <QMetaType>
#include <QtQml>
#include "tinytinyrsslogin.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
qmlRegisterType<TinyTinyRSSLogin>("TTRSS", 1, 0, "Login");
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); engine.load(QUrl(QStringLiteral("qrc:/main.qml")));

View file

@ -15,26 +15,6 @@ TinyTinyRSS::~TinyTinyRSS()
} }
QString TinyTinyRSS::login(QString serverUrl, QString user, QString password)
{
QVariantMap options;
options.insert("op", "login");
options.insert("user", user);
options.insert("password", password);
QJsonObject jsonobj = QJsonObject::fromVariantMap(options);
QJsonDocument json = QJsonDocument(jsonobj);
QNetworkAccessManager *manager = new QNetworkAccessManager(this);
QUrl url(serverUrl + "/api/");
QNetworkRequest request(url);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
QObject::connect(manager, SIGNAL(finished(QNetworkReply)), this, SIGNAL(replyLogin(QNetworkReply)));
manager->post(request, json.toBinaryData());
}
void TinyTinyRSS::doOperation(QString operation, QVariantMap opts) { void TinyTinyRSS::doOperation(QString operation, QVariantMap opts) {
QVariantMap options; QVariantMap options;
options.insert("sid", this->sessionId); options.insert("sid", this->sessionId);

View file

@ -1,12 +1,23 @@
#include "tinytinyrsslogin.h" #include "tinytinyrsslogin.h"
#include <QJsonDocument>
#include <QJsonObject>
#include <QNetworkReply>
TinyTinyRSSLogin::TinyTinyRSSLogin(QObject *parent) : TinyTinyRSSLogin::TinyTinyRSSLogin(QObject *parent) :
QObject(parent) QObject(parent)
{ {
mNetworkManager = new QNetworkAccessManager(this);
} }
void TinyTinyRSSLogin::login(QString serverUrl, QString user, QString password) TinyTinyRSSLogin::~TinyTinyRSSLogin()
{ {
delete mNetworkManager;
}
void TinyTinyRSSLogin::login(const QString serverUrl, const QString user, const QString password)
{
mServerUrl = QUrl(serverUrl + "/api/");
QVariantMap options; QVariantMap options;
options.insert("op", "login"); options.insert("op", "login");
options.insert("user", user); options.insert("user", user);
@ -15,18 +26,27 @@ void TinyTinyRSSLogin::login(QString serverUrl, QString user, QString password)
QJsonObject jsonobj = QJsonObject::fromVariantMap(options); QJsonObject jsonobj = QJsonObject::fromVariantMap(options);
QJsonDocument json = QJsonDocument(jsonobj); QJsonDocument json = QJsonDocument(jsonobj);
QNetworkAccessManager *manager = new QNetworkAccessManager(this); QNetworkRequest request(mServerUrl);
QUrl url(serverUrl + "/api/");
QNetworkRequest request(url);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
QObject::connect(manager, SIGNAL(finished(QNetworkReply)), this, SIGNAL(replyLogin(QNetworkReply))); QNetworkReply *reply = mNetworkManager->post(request, json.toBinaryData());
manager->post(request, json.toBinaryData()); connect(reply, SIGNAL(finished()), this, SLOT(reply()));
} }
TinyTinyRSSLogin::replyLogin(QNetworkReply reply) void TinyTinyRSSLogin::reply()
{ {
QString sessionId = "1234"; QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
this->parent()->loggedIn(QString(sessionId));
if (reply) {
if (reply->error() == QNetworkReply::NoError) {
//read data from reply
} else {
//get http status code
int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
//do some error management
}
reply->deleteLater();
}
mSessionId = "1234";
emit sessionIdChanged(mSessionId);
} }

View file

@ -2,18 +2,34 @@
#define TINYTINYRSSLOGIN_H #define TINYTINYRSSLOGIN_H
#include <QObject> #include <QObject>
#include <QMetaType>
#include <QNetworkAccessManager>
#include <QNetworkRequest>
class TinyTinyRSSLogin : public QObject class TinyTinyRSSLogin : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString sessionId READ sessionId NOTIFY sessionIdChanged)
Q_PROPERTY(QUrl serverUrl READ serverUrl)
public: public:
explicit TinyTinyRSSLogin(QObject *parent = 0); TinyTinyRSSLogin(QObject *parent = 0);
login(QString serverUrl, QString user, QString password); ~TinyTinyRSSLogin();
QString sessionId() const { return mSessionId; }
QUrl serverUrl() const { return mServerUrl; }
Q_INVOKABLE void login(const QString serverUrl, const QString user, const QString password);
signals: signals:
replyLogin(QNetworkReply reply); void sessionIdChanged(QString);
public slots: private slots:
void reply();
private:
QString mSessionId;
QUrl mServerUrl;
QNetworkAccessManager *mNetworkManager;
}; };