Cleanup and QSettings fix

Author: niwakame

main.cpp

@@ -22,6 +22,7 @@ int main(int argc, char *argv[])
         Blog blog_req;
         Settings settings;
         Oauth oauth;
+        oauth.setSettings(&settings);
 
 
         /* DEBUG VALUES */

meemblr.pro

@@ -44,7 +44,8 @@ SOURCES += main.cpp \
     kqoauth/kqoauthutils.cpp \
     kqoauth/kqoauthrequest_xauth.cpp \
     kqoauth/kqoauthrequest_1.cpp \
-    kqoauth/kqoauthauthreplyserver.cpp
+    kqoauth/kqoauthauthreplyserver.cpp \
+    tumblrapi.cpp
 
 # Please do not modify the following two lines. Required for deployment.
 include(qmlapplicationviewer/qmlapplicationviewer.pri)
@@ -80,6 +81,7 @@ HEADERS += \
     kqoauth/kqoauthmanager_p.h \
     kqoauth/kqoauthglobals.h \
     kqoauth/kqoauthauthreplyserver_p.h \
-    kqoauth/kqoauthauthreplyserver.h
+    kqoauth/kqoauthauthreplyserver.h \
+    tumblrapi.h
 
 RESOURCES +=

oauth.cpp

@@ -1,9 +1,13 @@
 #include "oauth.h"
 
-Oauth::Oauth(QObject *parent) : QObject(parent)
-{
-    /* seed random generator */
-    qsrand(QTime::currentTime().msec());
+Oauth::Oauth(QObject *parent) : QObject(parent) {
+    oauthRequest = new KQOAuthRequest;
+    oauthManager = new KQOAuthManager;
+    oauthRequest->setEnableDebugOutput(true);
+}
+
+void Oauth::setSettings(Settings *settings) {
+    m_sets = settings;
 }
 
 void Oauth::startAuthentication(QString username) {
@@ -31,7 +35,6 @@ void Oauth::startAuthentication(QString username) {
     data.setRequestEndpoint("http://www.tumblr.com/oauth/request_token");
     data.setTokenEndpoint("http://www.tumblr.com/oauth/access_token");
 
-
     /* Please read this! ###############
      * these are actually our keys ! if you wish to use this code, please register your key / application at: http://www.tumblr.com/oauth/apps
     */
@@ -40,9 +43,8 @@ void Oauth::startAuthentication(QString username) {
     //data.setConsumerKey("7zSQ06s60K8PHwXYK1Hw2fTSqgQQkLzPPS14BQQjsXRvQMMWyP");
     //data.setConsumerSecret("8rRNTXMWxe6p5AYumqnZYSDDfofBehF1cjuT05w7nqMHpGy0YZ");
     /* Niwakame's keys */
-    data.setConsumerKey("KhJM28EMcP1iEeUomSnFbpwI1YmzPVEYxh1xl07Rlr5AQfbKEj");
-    data.setConsumerSecret("ouPTiEiAU7mUXbkRlDZkD3FlXEAOREWyffmtVuo5bQSanf7UFb");
-
+    data.setConsumerKey(m_sets->getConsumerKey());
+    data.setConsumerSecret(m_sets->getConsumerSecret());
 
     data.setCallback("http://www.tumblr.com/oauth/access_token");
     data.setDisplayCallback("true");
@@ -70,33 +72,62 @@ void Oauth::onResponse(const SignOn::SessionData &sessionData)
     qDebug() << "Access token: " << response.AccessToken();
     qDebug() << "Toke nSecret: " << response.TokenSecret();
 
+    m_sets->setAccessToken(response.AccessToken());
+    m_sets->setAccessTokenSecret(response.TokenSecret());
 }
 
 void Oauth::onApiResponse(QByteArray response) {
     qDebug() << response;
 }
+void Oauth::onApiError(QByteArray response) {
 
+}
 
 /* test function to get a profile */
 void Oauth::testCall(QString test) {
-    oauthRequest = new KQOAuthRequest;
-    oauthManager = new KQOAuthManager;
-    oauthRequest->setEnableDebugOutput(true);
+    oauthRequest->initRequest(KQOAuthRequest::AuthorizedRequest, QUrl("http://api.tumblr.com/v2/user/info"));
+    //oauthRequest->initRequest(KQOAuthRequest::AuthorizedRequest, QUrl("http://api.tumblr.com/v2/blog/niwakame.tumblr.com/post"));
 
-    //oauthRequest->initRequest(KQOAuthRequest::AuthorizedRequest, QUrl("http://api.tumblr.com/v2/user/info"));
-    oauthRequest->initRequest(KQOAuthRequest::AuthorizedRequest, QUrl("http://api.tumblr.com/v2/blog/niwakame.tumblr.com/post"));
-    oauthRequest->setConsumerKey("KhJM28EMcP1iEeUomSnFbpwI1YmzPVEYxh1xl07Rlr5AQfbKEj");
-    oauthRequest->setConsumerSecretKey("ouPTiEiAU7mUXbkRlDZkD3FlXEAOREWyffmtVuo5bQSanf7UFb");
-    oauthRequest->setToken("");
-    oauthRequest->setTokenSecret("");
-    oauthRequest->setHttpMethod(KQOAuthRequest::POST);
+    oauthRequest->setConsumerKey(m_sets->getConsumerKey());
+    oauthRequest->setConsumerSecretKey(m_sets->getConsumerSecret());
+    oauthRequest->setToken(m_sets->getAccessToken());
+    oauthRequest->setTokenSecret(m_sets->getAccessTokenSecret());
+    //oauthRequest->setHttpMethod(KQOAuthRequest::POST);
 
-    KQOAuthParameters params;
+    /*KQOAuthParameters params;
     params.insert("type", "text");
     params.insert("body", "This is a testpost from Meemblr. Fear us :>");
-    oauthRequest->setAdditionalParameters(params);
+    oauthRequest->setAdditionalParameters(params);*/
 
     connect(oauthManager, SIGNAL(requestReady(QByteArray)), this, SLOT(onApiResponse(QByteArray)));
 
     oauthManager->executeRequest(oauthRequest);
 }
+
+void Oauth::callApi(QUrl url, QList< QPair<QString, QString> > params, QString method) {
+    oauthRequest->initRequest(KQOAuthRequest::AuthorizedRequest, url);
+    oauthRequest->setConsumerKey(m_sets->getConsumerKey());
+    oauthRequest->setConsumerSecretKey(m_sets->getConsumerSecret());
+    oauthRequest->setToken(m_sets->getAccessToken());
+    oauthRequest->setTokenSecret(m_sets->getAccessTokenSecret());
+
+    if (method == "POST") {
+        oauthRequest->setHttpMethod(KQOAuthRequest::POST);
+    } else {
+        oauthRequest->setHttpMethod(KQOAuthRequest::GET);
+    }
+
+    if (params.size() > 0) {
+        KQOAuthParameters parameters;
+        QPair<QString, QString> pair;
+        foreach(pair, params) {
+            QString key = pair.first;
+            QString val = pair.second;
+            parameters.insert(key, val);
+        }
+        oauthRequest->setAdditionalParameters(parameters);
+    }
+
+    connect(oauthManager, SIGNAL(requestReady(QByteArray)), this, SLOT(onApiResponse(QByteArray)));
+    oauthManager->executeRequest(oauthRequest);
+}

oauth.h

@@ -4,17 +4,10 @@
 #include <QObject>
 #include <QString>
 #include <QDebug>
-#include <QStringList>
-#include <QMap>
 #include <QUrl>
-#include <QList>
+#include <settings.h>
 #include <QPair>
-#include <QCryptographicHash>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QNetworkAccessManager>
-#include <QTime>
-#include <QtAlgorithms>
+#include <QList>
 
 #include <kqoauth/kqoauthmanager.h>
 #include <kqoauth/kqoauthrequest.h>
@@ -31,21 +24,25 @@ class Oauth : public QObject
 public:
     Oauth(QObject *parent = 0);
     Q_INVOKABLE void startAuthentication(QString username);
-    Q_INVOKABLE void testCall(QString test);
+    void testCall(QString test);
+    void setSettings(Settings *settings);
+    void callApi(QUrl url, QList< QPair<QString, QString> >, QString method);
 
 
 public slots:
     void onResponse(const SignOn::SessionData &sessionData);
     void onError(const SignOn::Error &error);
     void identityMethodsAvailable(const QStringList &);
     void onApiResponse(QByteArray response);
+    void onApiError(QByteArray response);
 
 private:
     SignOn::AuthService *authService;
     SignOn::IdentityInfo *m_info;
 
     KQOAuthManager *oauthManager;
     KQOAuthRequest *oauthRequest;
+    Settings *m_sets;
 };
 
 #endif // OAUTH_H

settings.cpp

@@ -3,15 +3,17 @@
 Settings::Settings(QObject *parent)
     : QObject(parent)
 {
-    sets = new QSettings("meemblr", "cyrus-ZogG-niwakame");
+    productName = QString("meemblr");
+    configName = QString("config");
+    sets = new QSettings(productName, configName, this);
 }
 
 void Settings::setUsername(QString username) {
     sets->setValue("username", username);
 }
 
 QVariant Settings::getUsername() {
-    return sets->value("username","");
+    return sets->value("username","").toString();
 }
 
 void Settings::setThemeInverted(QVariant inverted) {
@@ -21,3 +23,26 @@ void Settings::setThemeInverted(QVariant inverted) {
 QVariant Settings::getThemeInverted() {
     return sets->value("themeInverted", false);
 }
+
+void Settings::setAccessToken(QString token) {
+    sets->setValue("token", token);
+}
+
+QString Settings::getAccessToken() {
+    return sets->value("token", "").toString();
+}
+
+void Settings::setAccessTokenSecret(QString tokenSecret) {
+    sets->setValue("tokenSecret", tokenSecret);
+}
+
+QString Settings::getAccessTokenSecret() {
+    return sets->value("tokenSecret", "").toString();
+}
+
+QString Settings::getConsumerKey() {
+    return "KhJM28EMcP1iEeUomSnFbpwI1YmzPVEYxh1xl07Rlr5AQfbKEj";
+}
+QString Settings::getConsumerSecret() {
+    return "ouPTiEiAU7mUXbkRlDZkD3FlXEAOREWyffmtVuo5bQSanf7UFb";
+}

settings.h

@@ -11,11 +11,19 @@ class Settings : public QObject
 
 public:
     Settings(QObject *parent = 0);
-
     Q_INVOKABLE void setUsername(QString username);
     Q_INVOKABLE QVariant getUsername();
     Q_INVOKABLE void setThemeInverted(QVariant inverted);
     Q_INVOKABLE QVariant getThemeInverted();
+    void setAccessToken(QString token);
+    QString getAccessToken();
+    void setAccessTokenSecret(QString tokenSecret);
+    QString getAccessTokenSecret();
+    QString getConsumerKey();
+    QString getConsumerSecret();
+    QString productName;
+    QString configName;
+
 private:
     QSettings *sets;