Merge lp:~diegosarmentero/clickmanager-plugin/sign-url into lp:clickmanager-plugin

[Diego Sarmentero]

- Support signed url.
- Improve error handling.

Use ubuntuone-credentials to get the token and use that token to sign the urls when a click download needs to be started.

[lp:~diegosarmentero/clickmanager-plugin/sign-url]

20. By Diego Sarmentero on 2013-09-25

update debian/control to include new dependencies

[dobey (dobey)]

+#include <ubuntuoneauth-2.0/ssoservice.h>

This is wrong. You should only include <ssoservice> as the ubuntuoneauth-2.0 should come from the INCLUDES paths passed to the compiler (as -I/usr/include/ubuntuoneauth-2.0/ for example).

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:20
http://jenkins.qa.ubuntu.com/job/clickmanager-plugin-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/clickmanager-plugin-saucy-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/clickmanager-plugin-saucy-armhf-ci/8

Click here to trigger a rebuild:
http://s-jenkins:8080/job/clickmanager-plugin-ci/8/rebuild

review: Approve (continuous-integration)

[lp:~diegosarmentero/clickmanager-plugin/sign-url]

21. By Diego Sarmentero on 2013-09-26

fixing includes

[Diego Sarmentero (diegosarmentero)]

> +#include <ubuntuoneauth-2.0/ssoservice.h>
>
> This is wrong. You should only include <ssoservice> as the ubuntuoneauth-2.0
> should come from the INCLUDES paths passed to the compiler (as
> -I/usr/include/ubuntuoneauth-2.0/ for example).

Fixed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:21
http://jenkins.qa.ubuntu.com/job/clickmanager-plugin-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/clickmanager-plugin-saucy-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/clickmanager-plugin-saucy-armhf-ci/9

Click here to trigger a rebuild:
http://s-jenkins:8080/job/clickmanager-plugin-ci/9/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Abstain

[Alejandro J. Cura (alecu)]

While reviewing this I found a bug for clickmanager-plugin here: #1231422, but this branch looks good to me.

review: Approve

[dobey (dobey)]

I'm abstaining for now, because this really should be 2 separate branches, one which adds the ClickPlugin namespace changes, and another which depends on that one, which adds the URL signing bits. I don't want to block this too long, given our current time frame, but I do want to state such changes should be split into separate branches when they are this invasive. So I am choosing to Abstain rather than vote Needs Fixing.

[lp:~diegosarmentero/clickmanager-plugin/sign-url]

22. By Diego Sarmentero on 2013-09-26

* Automatic snapshot from revision 9
[ Łukasz 'sil2100' Zemczak ]
* Automatic snapshot from revision 5 (bootstrap)
[ Ubuntu daily release ]
* Automatic snapshot from revision 6

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:22
http://jenkins.qa.ubuntu.com/job/clickmanager-plugin-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/clickmanager-plugin-saucy-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/clickmanager-plugin-saucy-armhf-ci/11

Click here to trigger a rebuild:
http://s-jenkins:8080/job/clickmanager-plugin-ci/11/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-09-18 13:27:46 +0000
+++ debian/control	2013-09-26 16:47:31 +0000
@@ -4,6 +4,9 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
                libapt-pkg-dev,
+               libubuntuoneauth-2.0-dev,
+               libsignon-qt5-dev,
+               libaccounts-qt5-dev,
                qt5-default,
                qt5-qmake,
                qtbase5-dev,
 
=== modified file 'src/application.cpp'
--- src/application.cpp	2013-09-13 10:12:01 +0000
+++ src/application.cpp	2013-09-26 16:47:31 +0000
@@ -21,6 +21,8 @@
 #include <apt-pkg/debversion.h>
 #include <QDebug>
 
+namespace ClickPlugin {
+
 Application::Application(QQuickItem *parent) :
     QQuickItem(parent)
 {
@@ -47,13 +49,20 @@
 {
     this->m_remote_version = version;
 
-    debVersioningSystem debVersion;
-
-    int result = debVersion.CmpVersion(this->m_local_version.toUtf8().data(),
-                                       this->m_remote_version.toUtf8().data());
+    int result = debVS.CmpVersion(this->m_local_version.toUtf8().data(),
+                                  this->m_remote_version.toUtf8().data());
     if(result == -1) {
         this->m_update = true;
     }else{
         this->m_update = false;
     }
 }
+
+void Application::setError(QString error) {
+    this->m_error = error;
+    if(!this->m_error.isEmpty()) {
+        emit this->errorChanged();
+    }
+}
+
+}
 
=== modified file 'src/application.h'
--- src/application.h	2013-09-13 10:12:01 +0000
+++ src/application.h	2013-09-26 16:47:31 +0000
@@ -22,6 +22,8 @@
 #include <QQuickItem>
 #include <QString>
 
+namespace ClickPlugin {
+
 class Application : public QQuickItem
 {
     Q_OBJECT
@@ -36,6 +38,7 @@
     Q_PROPERTY(bool updateState READ updateState WRITE setUpdateState NOTIFY updatesStateChanged)
     Q_PROPERTY(bool selected READ selected WRITE setSelected NOTIFY selectedChanged)
     Q_PROPERTY(QString dbusPath READ dbusPath NOTIFY dbusPathChanged)
+    Q_PROPERTY(QString error READ getError NOTIFY errorChanged)
 
 signals:
     void titleChanged();
@@ -46,6 +49,7 @@
     void updatesStateChanged();
     void selectedChanged();
     void dbusPathChanged();
+    void errorChanged();
 
 public:
     Application(QQuickItem *parent = 0);
@@ -60,6 +64,7 @@
     bool updateRequired() { return this->m_update; }
     bool updateState() { return this->m_update_state; }
     bool selected() { return this->m_selected; }
+    QString getError() { return this->m_error; }
 
     void initializeApplication(QString packagename, QString title, QString version);
     void setRemoteVersion(QString& version);
@@ -68,6 +73,7 @@
     void setDbusPath(QString dbuspath) { this->m_dbuspath = dbuspath; emit this->dbusPathChanged(); }
     void setBinaryFilesize(int size) { this->m_binary_filesize = size; emit this->binaryFilesizeChanged(); }
     void setIconUrl(QString icon) { this->m_icon_url = icon; emit this->iconUrlChanged(); }
+    void setError(QString error);
 
 private:
     QString m_packagename;
@@ -76,12 +82,15 @@
     QString m_remote_version;
     QString m_dbuspath;
     QString m_icon_url;
+    QString m_error;
     int m_binary_filesize;
     bool m_update;
     bool m_update_state;
     bool m_selected;
 };
 
-QML_DECLARE_TYPE(Application)
+}
+
+QML_DECLARE_TYPE(ClickPlugin::Application)
 
 #endif // APPLICATION_H
 
=== modified file 'src/clickmanager.cpp'
--- src/clickmanager.cpp	2013-09-23 14:26:39 +0000
+++ src/clickmanager.cpp	2013-09-26 16:47:31 +0000
@@ -25,34 +25,54 @@
 #include <QJsonValue>
 #include <QDebug>
 
+namespace ClickPlugin {
+
 ClickManager::ClickManager(QQuickItem *parent):
     QQuickItem(parent)
   , m_process(this)
 {
-    this->m_updatesAvailable = false;
-    this->connect(&(this->m_process), SIGNAL(finished(int)),
+    QObject::connect(&m_service, SIGNAL(credentialsFound(const Token&)),
+                     this, SLOT(handleCredentialsFound(Token)));
+    QObject::connect(&m_service, SIGNAL(credentialsNotFound()),
+                     this, SLOT(handleCredentialsNotFound()));
+    QObject::connect(&(this->m_process), SIGNAL(finished(int)),
                   this, SLOT(processOutput()));
-    this->connect(&(this->network), SIGNAL(updatesFound()),
+    QObject::connect(&(this->m_network), SIGNAL(updatesFound()),
                   this, SLOT(processUpdates()));
-    this->connect(&(this->network), SIGNAL(updatesNotFound()),
+    QObject::connect(&(this->m_network), SIGNAL(updatesNotFound()),
                   this, SIGNAL(updatesNotFound()));
-    this->connect(&(this->network), SIGNAL(downloadUrlFound(QString,QString)),
+    QObject::connect(&(this->m_network), SIGNAL(downloadUrlFound(QString,QString)),
                   this, SLOT(downloadUrlObtained(QString,QString)));
-    this->connect(&(this->downloader), SIGNAL(downloadCreated(QString,QString)),
+    QObject::connect(&(this->downloader), SIGNAL(downloadCreated(QString,QString)),
                   this, SLOT(downloadCreated(QString,QString)));
+    QObject::connect(&(this->downloader), SIGNAL(downloadNotCreated(QString,QString)),
+                  this, SLOT(downloadNotCreated(QString,QString)));
 }
 
 ClickManager::~ClickManager()
 {
 }
 
-void ClickManager::checkUpdates()
+void ClickManager::handleCredentialsFound(Token token)
 {
+    qDebug() << "Credentials found.";
+    this->m_token = token;
     QStringList args("list");
     args << "--manifest";
     this->m_process.start("click", args);
 }
 
+void ClickManager::handleCredentialsNotFound()
+{
+    qDebug() << "No credentials were found.";
+    emit this->credentialsNotFound();
+}
+
+void ClickManager::checkUpdates()
+{
+    this->m_service.getCredentials();
+}
+
 void ClickManager::processOutput()
 {
     QString output(this->m_process.readAllStandardOutput());
@@ -72,7 +92,7 @@
         this->m_apps[app->getPackageName()] = app;
     }
 
-    this->network.checkForNewVersions(this->m_apps);
+    this->m_network.checkForNewVersions(this->m_apps);
 }
 
 void ClickManager::processUpdates()
@@ -90,13 +110,20 @@
 void ClickManager::startDownload(QString packagename)
 {
     qDebug() << "Download Package:" << packagename;
-    this->network.getResourceUrl(packagename);
+    this->m_network.getResourceUrl(packagename);
 }
 
 void ClickManager::downloadUrlObtained(QString packagename, QString url)
 {
-    this->downloader.startDownload(packagename, url.append("?noauth=1"));
-    qDebug() << "Download Url:" << url;
+    if(this->m_token.isValid()) {
+        QString authHeader = this->m_token.signUrl(url, QStringLiteral("GET"));
+        qDebug() << "Download Url:" << url;
+        this->m_apps[packagename]->setError("");
+        this->downloader.startDownload(packagename, url, authHeader);
+    } else {
+        Application* app = this->m_apps[packagename];
+        app->setError("Invalid User Token");
+    }
 }
 
 void ClickManager::downloadCreated(QString packagename, QString dbuspath)
@@ -105,3 +132,11 @@
     this->m_apps[packagename]->setDbusPath(dbuspath);
     this->m_apps[packagename]->setUpdateState(true);
 }
+
+void ClickManager::downloadNotCreated(QString packagename, QString error)
+{
+    Application* app = this->m_apps[packagename];
+    app->setError(error);
+}
+
+}
 
=== modified file 'src/clickmanager.h'
--- src/clickmanager.h	2013-09-23 14:20:48 +0000
+++ src/clickmanager.h	2013-09-26 16:47:31 +0000
@@ -25,23 +25,29 @@
 #include <QVariant>
 #include <QVariantList>
 #include "application.h"
+#include <token.h>
 
 #ifdef TESTS
 #include "fakeprocess.h"
 #include "fakenetwork.h"
 #include "fakedownloader.h"
 #include "testclickmanager.h"
+#include "fakessoservice.h"
 #else
+#include <ssoservice.h>
 #include <QProcess>
 #include "network/network.h"
 #include "download/downloader.h"
 #endif
 
+using namespace UbuntuOne;
+
+namespace ClickPlugin {
+
 class ClickManager : public QQuickItem
 {
     Q_OBJECT
     Q_DISABLE_COPY(ClickManager)
-    Q_PROPERTY(bool updatesAvailable READ updatesAvailable NOTIFY updatesAvailableChanged)
     Q_PROPERTY(QVariantList model READ model NOTIFY modelChanged)
 
 #ifdef TESTS
@@ -49,9 +55,9 @@
 #endif
 
 signals:
-    void updatesAvailableChanged();
     void modelChanged();
     void updatesNotFound();
+    void credentialsNotFound();
     
 public:
     ClickManager(QQuickItem *parent = 0);
@@ -60,7 +66,6 @@
     Q_INVOKABLE void checkUpdates();
     Q_INVOKABLE void startDownload(QString packagename);
 
-    bool updatesAvailable() { return this->m_updatesAvailable; }
     QVariantList model() const { return this->m_model; }
 
 private slots:
@@ -68,25 +73,32 @@
     void processUpdates();
     void downloadUrlObtained(QString packagename, QString url);
     void downloadCreated(QString packagename, QString dbuspath);
+    void downloadNotCreated(QString packagename, QString error);
+    void handleCredentialsFound(Token token);
+    void handleCredentialsNotFound();
 
 private:
-    bool m_updatesAvailable;
     QHash<QString, Application*> m_apps;
     QVariantList m_model;
+    Token m_token;
 #ifdef TESTS
-    FakeNetwork network;
+    FakeSsoService m_service;
+    FakeNetwork m_network;
     FakeDownloader downloader;
     FakeProcess m_process;
 #else
+    SSOService m_service;
     QProcess m_process;
-    Network network;
+    Network m_network;
     Downloader downloader;
 #endif
 
     void checkForUpdates();
 };
 
-QML_DECLARE_TYPE(ClickManager)
+}
+
+QML_DECLARE_TYPE(ClickPlugin::ClickManager)
 
 #endif // CLICKMANAGER_H
 
 
=== modified file 'src/clickmanager_plugin.cpp'
--- src/clickmanager_plugin.cpp	2013-09-13 10:12:01 +0000
+++ src/clickmanager_plugin.cpp	2013-09-26 16:47:31 +0000
@@ -23,6 +23,8 @@
 
 #include <qqml.h>
 
+using namespace ClickPlugin;
+
 void ClickManagerPlugin::registerTypes(const char *uri)
 {
     // @uri com.ubuntu.click
 
=== modified file 'src/download/downloader.cpp'
--- src/download/downloader.cpp	2013-09-23 14:50:58 +0000
+++ src/download/downloader.cpp	2013-09-26 16:47:31 +0000
@@ -23,6 +23,8 @@
 #define DOWNLOAD_COMMAND "post-download-command"
 #define APP_ID "app_id"
 
+namespace ClickPlugin {
+
 Downloader::Downloader(QObject *parent) :
     QObject(parent)
 {
@@ -33,7 +35,7 @@
     this->manager = new DownloadManager("com.canonical.applications.Downloader", "/", QDBusConnection::sessionBus(), 0);
 }
 
-void Downloader::startDownload(QString& packagename, QString& url)
+void Downloader::startDownload(QString& packagename, QString& url, QString& authHeader)
 {
     QVariantMap vmap;
     QStringList args;
@@ -41,14 +43,16 @@
     vmap[DOWNLOAD_COMMAND] = args;
     vmap[APP_ID] = packagename;
     StringMap map;
+    map["Authorization"] = authHeader;
     DownloadStruct down = DownloadStruct(url, vmap, map);
     QDBusPendingReply<QDBusObjectPath> reply = this->manager->createDownload(down);
     reply.waitForFinished();
     if (reply.isError()) {
-        emit this->downloadNotCreated(packagename);
+        emit this->downloadNotCreated(packagename, reply.error().message());
     }else{
         QDBusObjectPath path = reply.value();
         emit this->downloadCreated(packagename, path.path());
     }
 }
 
+}
 
=== modified file 'src/download/downloader.h'
--- src/download/downloader.h	2013-09-10 19:01:19 +0000
+++ src/download/downloader.h	2013-09-26 16:47:31 +0000
@@ -24,21 +24,25 @@
 #include <QDBusObjectPath>
 #include "downloadmanager.h"
 
+namespace ClickPlugin {
+
 class Downloader : public QObject
 {
     Q_OBJECT
 public:
     explicit Downloader(QObject *parent = 0);
 
-    void startDownload(QString& packagename, QString& url);
+    void startDownload(QString& packagename, QString& url, QString& authHeader);
 
 signals:
     void downloadCreated(QString packagename, QString dbuspath);
-    void downloadNotCreated(QString packagename);
+    void downloadNotCreated(QString packagename, QString error);
 
 private:
     DownloadManager* manager;
     
 };
 
+}
+
 #endif // DOWNLOADER_H
 
=== modified file 'src/download_tracker.cpp'
--- src/download_tracker.cpp	2013-09-13 10:12:01 +0000
+++ src/download_tracker.cpp	2013-09-26 16:47:31 +0000
@@ -22,6 +22,8 @@
 #include "download_tracker.h"
 #include <QDebug>
 
+namespace ClickPlugin {
+
 DownloadTracker::DownloadTracker(QQuickItem *parent) :
     QQuickItem(parent)
 {
@@ -70,3 +72,5 @@
         this->adaptor->start();
     }
 }
+
+}
 
=== modified file 'src/download_tracker.h'
--- src/download_tracker.h	2013-09-13 10:12:01 +0000
+++ src/download_tracker.h	2013-09-26 16:47:31 +0000
@@ -27,6 +27,8 @@
 #include <QDBusObjectPath>
 #include <download/downloadtrackeradaptor.h>
 
+namespace ClickPlugin {
+
 class DownloadTracker : public QQuickItem
 {
     Q_OBJECT
@@ -61,6 +63,8 @@
     void startService();
 };
 
-QML_DECLARE_TYPE(DownloadTracker)
+}
+
+QML_DECLARE_TYPE(ClickPlugin::DownloadTracker)
 
 #endif // MYTYPE_H
 
=== modified file 'src/network/network.cpp'
--- src/network/network.cpp	2013-09-23 14:20:48 +0000
+++ src/network/network.cpp	2013-09-26 16:47:31 +0000
@@ -27,6 +27,7 @@
 #define URL_APPS "https://myapps.developer.ubuntu.com/dev/api/click-metadata/"
 #define URL_PACKAGE "https://search.apps.ubuntu.com/api/v1/package/"
 
+namespace ClickPlugin {
 
 Network::Network(QObject *parent) :
     QObject(parent)
@@ -127,3 +128,5 @@
     this->_request->setUrl(QUrl(URL_PACKAGE + packagename));
     this->_nam->get(*this->_request);
 }
+
+}
 
=== modified file 'src/network/network.h'
--- src/network/network.h	2013-09-10 19:01:19 +0000
+++ src/network/network.h	2013-09-26 16:47:31 +0000
@@ -25,6 +25,8 @@
 #include <QHash>
 #include "application.h"
 
+namespace ClickPlugin {
+
 class Network : public QObject
 {
     Q_OBJECT
@@ -49,4 +51,6 @@
     QHash<QString, Application*> _apps;
 };
 
+}
+
 #endif // NETWORK_H
 
=== modified file 'src/src.pro'
--- src/src.pro	2013-09-13 15:34:29 +0000
+++ src/src.pro	2013-09-26 16:47:31 +0000
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = ClickManager
-QT += qml quick core dbus 
+QT += qml quick core dbus xml network
 CONFIG += qt plugin
 
 TARGET = $$qtLibraryTarget($$TARGET)
@@ -52,4 +52,5 @@
     INSTALLS += target qmldir
 }
 
-LIBS += -lapt-pkg
+QMAKE_CXXFLAGS += -I /usr/include/ubuntuoneauth-2.0 -I /usr/include/signon-qt5 -I /usr/include/accounts-qt5
+LIBS += -lapt-pkg -lubuntuoneauth-2.0 -lsignon-qt5 -laccounts-qt5
 
=== modified file 'tests/fakedownloader.cpp'
--- tests/fakedownloader.cpp	2013-09-13 11:00:52 +0000
+++ tests/fakedownloader.cpp	2013-09-26 16:47:31 +0000
@@ -17,13 +17,22 @@
  */
 
 #include "fakedownloader.h"
+#include <QDebug>
+
+namespace ClickPlugin {
 
 FakeDownloader::FakeDownloader(QObject *parent) :
     QObject(parent)
 {
 }
 
-void FakeDownloader::startDownload(QString& packagename, QString& url)
+void FakeDownloader::startDownload(QString& packagename, QString& url, QString authHeader)
 {
-    emit this->downloadCreated(packagename, "/com/canonical/download/path");
+    if(authHeader.isEmpty()) {
+        emit this->downloadNotCreated(packagename, QString("DOWNLOAD ERROR"));
+    } else {
+        emit this->downloadCreated(packagename, "/com/canonical/download/path");
+    }
+}
+
 }
 
=== modified file 'tests/fakedownloader.h'
--- tests/fakedownloader.h	2013-09-13 11:00:52 +0000
+++ tests/fakedownloader.h	2013-09-26 16:47:31 +0000
@@ -21,18 +21,22 @@
 
 #include <QObject>
 
+namespace ClickPlugin {
+
 class FakeDownloader : public QObject
 {
     Q_OBJECT
 public:
     explicit FakeDownloader(QObject *parent = 0);
     
-    void startDownload(QString& packagename, QString& url);
+    void startDownload(QString& packagename, QString& url, QString authHeader);
 
 signals:
     void downloadCreated(QString packagename, QString dbuspath);
-    void downloadNotCreated(QString packagename);
+    void downloadNotCreated(QString packagename, QString error);
     
 };
 
+}
+
 #endif // FAKEDOWNLOADER_H
 
=== modified file 'tests/fakenetwork.cpp'
--- tests/fakenetwork.cpp	2013-09-13 11:00:52 +0000
+++ tests/fakenetwork.cpp	2013-09-26 16:47:31 +0000
@@ -18,6 +18,8 @@
 
 #include "fakenetwork.h"
 
+namespace ClickPlugin {
+
 FakeNetwork::FakeNetwork(QObject *parent) :
     QObject(parent)
 {
@@ -37,3 +39,5 @@
 {
     emit this->downloadUrlFound(packagename, "http://canonical.com");
 }
+
+}
 
=== modified file 'tests/fakenetwork.h'
--- tests/fakenetwork.h	2013-09-13 11:00:52 +0000
+++ tests/fakenetwork.h	2013-09-26 16:47:31 +0000
@@ -24,6 +24,8 @@
 #include <QString>
 #include "application.h"
 
+namespace ClickPlugin {
+
 class FakeNetwork : public QObject
 {
     Q_OBJECT
@@ -41,4 +43,6 @@
     
 };
 
+}
+
 #endif // FAKENETWORK_H
 
=== modified file 'tests/fakeprocess.cpp'
--- tests/fakeprocess.cpp	2013-09-23 15:32:01 +0000
+++ tests/fakeprocess.cpp	2013-09-26 16:47:31 +0000
@@ -21,6 +21,8 @@
 #include <QTextStream>
 #include <QDir>
 
+namespace ClickPlugin {
+
 FakeProcess::FakeProcess(QObject *parent) :
     QObject(parent)
 {
@@ -55,3 +57,5 @@
 {
 
 }
+
+}
 
=== modified file 'tests/fakeprocess.h'
--- tests/fakeprocess.h	2013-09-23 15:32:01 +0000
+++ tests/fakeprocess.h	2013-09-26 16:47:31 +0000
@@ -23,6 +23,8 @@
 #include <QString>
 #include <QStringList>
 
+namespace ClickPlugin {
+
 class FakeProcess : public QObject
 {
     Q_OBJECT
@@ -41,4 +43,6 @@
     
 };
 
+}
+
 #endif // FAKEPROCESS_H
 
=== added file 'tests/fakessoservice.cpp'
--- tests/fakessoservice.cpp	1970-01-01 00:00:00 +0000
+++ tests/fakessoservice.cpp	2013-09-26 16:47:31 +0000
@@ -0,0 +1,16 @@
+#include "fakessoservice.h"
+
+namespace ClickPlugin {
+
+FakeSsoService::FakeSsoService(QObject *parent) :
+    QObject(parent)
+{
+}
+
+void FakeSsoService::getCredentials()
+{
+    Token token("token_key", "token_secret", "consumer_key", "consumer_secret");
+    emit this->credentialsFound(token);
+}
+
+}
 
=== added file 'tests/fakessoservice.h'
--- tests/fakessoservice.h	1970-01-01 00:00:00 +0000
+++ tests/fakessoservice.h	2013-09-26 16:47:31 +0000
@@ -0,0 +1,27 @@
+#ifndef FAKESSOSERVICE_H
+#define FAKESSOSERVICE_H
+
+#include <QObject>
+#include <token.h>
+
+using namespace UbuntuOne;
+
+namespace ClickPlugin {
+
+class FakeSsoService : public QObject
+{
+    Q_OBJECT
+public:
+    explicit FakeSsoService(QObject *parent = 0);
+
+    void getCredentials();
+    
+signals:
+    void credentialsFound(const Token&);
+    void credentialsNotFound();
+
+};
+
+}
+
+#endif // FAKESSOSERVICE_H
 
=== modified file 'tests/test_main.cpp'
--- tests/test_main.cpp	2013-09-13 10:12:01 +0000
+++ tests/test_main.cpp	2013-09-26 16:47:31 +0000
@@ -21,6 +21,8 @@
 #include "testapplication.h"
 #include "testclickmanager.h"
 
+using namespace ClickPlugin;
+
 int main()
 {
 
 
=== modified file 'tests/testapplication.cpp'
--- tests/testapplication.cpp	2013-09-13 11:00:52 +0000
+++ tests/testapplication.cpp	2013-09-26 16:47:31 +0000
@@ -21,6 +21,8 @@
 
 #include "application.h"
 
+namespace ClickPlugin {
+
 void TestApplication::testCompareVersion()
 {
     Application app;
@@ -30,3 +32,5 @@
     app.setRemoteVersion(version);
     QCOMPARE(app.updateRequired(), true);
 }
+
+}
 
=== modified file 'tests/testapplication.h'
--- tests/testapplication.h	2013-09-13 11:00:52 +0000
+++ tests/testapplication.h	2013-09-26 16:47:31 +0000
@@ -23,6 +23,8 @@
 
 #include <QtTest/QtTest>
 
+namespace ClickPlugin {
+
 class TestApplication : public QObject
 {
     Q_OBJECT
@@ -32,4 +34,6 @@
     
 };
 
+}
+
 #endif // TESTAPPLICATION_H
 
=== modified file 'tests/testclickmanager.cpp'
--- tests/testclickmanager.cpp	2013-09-13 11:00:52 +0000
+++ tests/testclickmanager.cpp	2013-09-26 16:47:31 +0000
@@ -21,6 +21,8 @@
 #include "clickmanager.h"
 #include "application.h"
 
+namespace ClickPlugin {
+
 void TestClickManager::cleanup()
 {
     this->m_signal_counter = 0;
@@ -57,3 +59,24 @@
     QCOMPARE(app->updateState(), true);
     QCOMPARE(app->dbusPath(), QString("/com/canonical/download/path"));
 }
+
+void TestClickManager::testTokenObtained()
+{
+    ClickManager manager;
+    manager.checkUpdates();
+    QCOMPARE(manager.m_token.isValid(), true);
+}
+
+void TestClickManager::testDownloadNotCreated()
+{
+    ClickManager manager;
+    manager.checkUpdates();
+    manager.m_token = Token();
+    Application* app = manager.m_model[0].value<Application*>();
+    manager.startDownload(app->getPackageName());
+    QCOMPARE(app->updateState(), false);
+    QCOMPARE(app->dbusPath(), QString(""));
+    QCOMPARE(app->getError(), QString("Invalid User Token"));
+}
+
+}
 
=== modified file 'tests/testclickmanager.h'
--- tests/testclickmanager.h	2013-09-13 11:00:52 +0000
+++ tests/testclickmanager.h	2013-09-26 16:47:31 +0000
@@ -23,6 +23,8 @@
 
 #include <QtTest/QtTest>
 
+namespace ClickPlugin {
+
 class TestClickManager : public QObject
 {
     Q_OBJECT
@@ -35,9 +37,13 @@
 
     void testCheckUpdates();
     void testStartDownload();
+    void testTokenObtained();
+    void testDownloadNotCreated();
 
 private:
     int m_signal_counter;
 };
 
+}
+
 #endif // TESTCLICKMANAGER_H
 
=== modified file 'tests/tests.pro'
--- tests/tests.pro	2013-09-13 15:34:29 +0000
+++ tests/tests.pro	2013-09-26 16:47:31 +0000
@@ -1,4 +1,4 @@
-QT       += core qml quick network testlib dbus
+QT       += core qml quick network testlib dbus xml
 
 QT       -= gui
 
@@ -25,7 +25,8 @@
     fakeprocess.cpp \
     ../src/download/download_struct.cpp \
     ../src/download/group_download_struct.cpp \
-    ../src/download/hash_algorithm.cpp
+    ../src/download/hash_algorithm.cpp \
+    fakessoservice.cpp
 
 HEADERS += \
     ../src/clickmanager_plugin.h \
@@ -44,9 +45,11 @@
     fakeprocess.h \
     ../src/download/download_struct.h \
     ../src/download/group_download_struct.h \
-    ../src/download/hash_algorithm.h
+    ../src/download/hash_algorithm.h \
+    fakessoservice.h
 
-LIBS += -lapt-pkg
+QMAKE_CXXFLAGS += -I /usr/include/ubuntuoneauth-2.0 -I /usr/include/signon-qt5 -I /usr/include/accounts-qt5
+LIBS += -lapt-pkg -lubuntuoneauth-2.0 -lsignon-qt5 -laccounts-qt5
 INCLUDEPATH += ../src/
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"