Merge lp:~ted/pay-service/lp1348231-account-creation into lp:~ted/pay-service/pay-test-app

[Ted Gould]

Use libaccounts to get signals on account creation or deletion to update the stored token

Getting some signals from the Account Service and just asking for a refresh on them.

Unmerged revisions

42. By Ted Gould on 2014-08-07

Explaining what's going on a bit

41. By Ted Gould on 2014-08-07

Adding enabled as well

40. By Ted Gould on 2014-08-07

Thinking this should really show up in the default log

39. By Ted Gould on 2014-08-07

Attaching bug

38. By Ted Gould on 2014-08-07

Move the rest of the Qt main based stuff to qDebug()

37. By Ted Gould on 2014-08-07

Clean up debug messages

36. By Ted Gould on 2014-08-07

Get the accounts manager integrated

35. By Ted Gould on 2014-08-07

Get libaccounts in here

34. By Ted Gould on 2014-08-07

Add a handler for the credentials stored signal

33. By Ted Gould on 2014-08-07

Catch up to the pay-test-app branch

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-06 00:00:52 +0000
+++ CMakeLists.txt	2014-08-07 15:19:02 +0000
@@ -35,6 +35,7 @@
 find_package (Qt5Core REQUIRED)
 
 pkg_check_modules (SERVICE_DEPS REQUIRED
+                   accounts-qt5
                    libcurl
                    ubuntu-app-launch-2
                    dbustest-1

=== modified file 'debian/control'
--- debian/control	2014-08-06 00:00:52 +0000
+++ debian/control	2014-08-07 15:19:02 +0000
@@ -13,6 +13,7 @@
 # in libstdc++ causing us issues, we explicitly select a G++
 # version.
                g++-4.9,
+               libaccounts-qt5-dev,
                libclick-0.4-dev,
                libcurl4-gnutls-dev,
                libdbustest1-dev,

=== modified file 'service/token-grabber-u1.cpp'
--- service/token-grabber-u1.cpp	2014-07-15 14:34:16 +0000
+++ service/token-grabber-u1.cpp	2014-08-07 15:19:02 +0000
@@ -20,9 +20,13 @@
 #include "token-grabber-u1.h"
 #include "qtbridge.h"
 
+/* U1 Creds */
 #include <ssoservice.h>
 #include <token.h>
 
+/* Accounts Service */
+#include <Accounts/Manager>
+
 class TokenGrabberU1Qt: public QObject
 {
     Q_OBJECT
@@ -35,22 +39,45 @@
 private Q_SLOTS:
     void handleCredentialsFound(const UbuntuOne::Token& token);
     void handleCredentialsNotFound();
+    void handleCredentialsStored();
+    void accountChanged(Accounts::AccountId id);
 
 private:
     UbuntuOne::Token token;
     UbuntuOne::SSOService service;
+    Accounts::Manager manager;
 };
 
 TokenGrabberU1Qt::TokenGrabberU1Qt (QObject* parent) :
-    QObject(parent)
+    QObject(parent),
+    manager("ubuntuone")
 {
-    std::cout << "Token grabber built" << std::endl;
+    qDebug() << "Token grabber built";
 }
 
 void TokenGrabberU1Qt::run (void)
 {
-    std::cout << "Token grabber running" << std::endl;
-
+    qDebug() << "Token grabber running";
+
+    /* Accounts Manager */
+    QObject::connect(&manager,
+                     &Accounts::Manager::accountCreated,
+                     this,
+                     &TokenGrabberU1Qt::accountChanged);
+    QObject::connect(&manager,
+                     &Accounts::Manager::accountRemoved,
+                     this,
+                     &TokenGrabberU1Qt::accountChanged);
+    QObject::connect(&manager,
+                     &Accounts::Manager::accountUpdated,
+                     this,
+                     &TokenGrabberU1Qt::accountChanged);
+    QObject::connect(&manager,
+                     &Accounts::Manager::enabledEvent,
+                     this,
+                     &TokenGrabberU1Qt::accountChanged);
+
+    /* U1 signals */
     QObject::connect(&service,
                      &UbuntuOne::SSOService::credentialsFound,
                      this,
@@ -59,19 +86,43 @@
                      &UbuntuOne::SSOService::credentialsNotFound,
                      this,
                      &TokenGrabberU1Qt::handleCredentialsNotFound);
-
+    QObject::connect(&service,
+                     &UbuntuOne::SSOService::credentialsStored,
+                     this,
+                     &TokenGrabberU1Qt::handleCredentialsStored);
+
+
+
+    service.getCredentials();
+}
+
+void TokenGrabberU1Qt::accountChanged(Accounts::AccountId id)
+{
+    /* We don't need to worry about @id here because there
+       can only be one U1 account for the user at a time, so
+       we're not getting a specific account or anything. Just
+       watching for changes */
+    qDebug() << "Account changed, try to get a new token";
+    token = UbuntuOne::Token();
     service.getCredentials();
 }
 
 void TokenGrabberU1Qt::handleCredentialsFound(const UbuntuOne::Token& in_token)
 {
+    qDebug() << "Got a Token";
     token = in_token;
-    std::cout << "Got a Token" << std::endl;
 }
 
 void TokenGrabberU1Qt::handleCredentialsNotFound()
 {
-    std::cout << "No Token :-(" << std::endl;
+    qWarning() << "No Token :-(";
+    token = UbuntuOne::Token();
+}
+
+void TokenGrabberU1Qt::handleCredentialsStored()
+{
+    qDebug() << "New Credentials Stored";
+    service.getCredentials();
 }
 
 std::string TokenGrabberU1Qt::signUrl (std::string url, std::string type)