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

[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.

[Alejandro J. Cura (alecu)]

Code looks good. Since the CI jenkins seems not to be working, I'll be testing the package with this branch from the silo.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/pay-service-ci/46/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-amd64-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-armhf-ci/47/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-ci/46/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/pay-service-ci/47/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-amd64-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-armhf-ci/48/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-ci/47/rebuild

review: Needs Fixing (continuous-integration)

[Alejandro J. Cura (alecu)]

The CI jenkins is trying to run "make coverage-xml", and failing:

+ make -n coverage-xml
+ grep 'No rule to make target'
make: *** No rule to make target 'coverage-xml'. Stop.
+ gcovr --xml -r
/tmp/buildd/pay-service-2.0.0+14.10.20140801.1bzr42pkg0utopic48 -o
/iSCSI/storage/jenkins/workspace/pay-service-utopic-amd64-ci/work/results/coverage.xml
'--exclude=.*test.*' '--exclude=.*gmock.*'
Build timed out (after 120 minutes). Marking the build as failed.
java.lang.InterruptedException
Build step 'Debian PBuilder NG' marked build as failure
/usr/bin/pdebuild: line 39: 35730 Terminated tee
"${PBUILDER_BUILD_LOGFILE}"
Archiving artifacts
Skipping Cobertura coverage report as build was not UNSTABLE or better ...
Sending e-mails to: <email address hidden>
Build was marked for publishing on https://jenkins.qa.ubuntu.com/
Finished: FAILURE

On Thu, Aug 7, 2014 at 11:28 PM, PS Jenkins bot
<email address hidden> wrote:
> Review: Needs Fixing continuous-integration
>
> FAILED: Continuous integration, rev:42
> http://jenkins.qa.ubuntu.com/job/pay-service-ci/47/
> Executed test runs:
> FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-amd64-ci/48/console
> FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-armhf-ci/48/console
>
> Click here to trigger a rebuild:
> http://s-jenkins.ubuntu-ci:8080/job/pay-service-ci/47/rebuild
>
> --
> https://code.launchpad.net/~ted/pay-service/lp1348231-account-creation/+merge/229956
> You are reviewing the proposed merge of lp:~ted/pay-service/lp1348231-account-creation into lp:pay-service.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-07 15:20:27 +0000
+++ CMakeLists.txt	2014-08-07 15:20:27 +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-07 15:20:27 +0000
+++ debian/control	2014-08-07 15:20:27 +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:20:27 +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)