Merge lp:~ken-vandine/ubuntu-system-settings/emit_credentials_deleted into lp:ubuntu-system-settings

[Ken VanDine]

emit credentialsDeleted when the U1 token expired

emit credentialsDeleted when the U1 token expired

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1508
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2338/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3832
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/522
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3829
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3829/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22773

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2338/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/emit_credentials_deleted]

1509. By Ken VanDine on 2015-08-24

invalidateCredentials on credentialError

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1509
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2342/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3838
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/526
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3835
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3835/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22786

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2342/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1508
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2343/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3841
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/527
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3838
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3838/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22798

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2343/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1508
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2344/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3844
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/528
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3841
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3841/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22802

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2344/rebuild

review: Needs Fixing (continuous-integration)

[Manuel de la Peña (mandel)]

Approving with a small inline comment.

review: Approve

[lp:~ken-vandine/ubuntu-system-settings/emit_credentials_deleted]

1510. By Ken VanDine on 2015-08-25

Simplify by calling invalidateCredentials on credentialError instead of adding a new slot

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1510
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2350/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3852
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/534
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3849
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3849/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22814

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2350/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/emit_credentials_deleted]

1511. By Ken VanDine on 2015-08-26

revert

=== modified file 'plugins/system-update/network/network.cpp'
--- plugins/system-update/network/network.cpp	2015-08-26 10:06:32 +0000
+++ plugins/system-update/network/network.cpp	2015-08-26 10:06:32 +0000
@@ -151,6 +151,11 @@
 
     int httpStatus = statusAttr.toInt();
 
+    if (httpStatus == 401 || httpStatus == 403) {
+        Q_EMIT credentialError();
+        return;
+    }
+
     if (httpStatus == 200 || httpStatus == 201) {
         if (reply->hasRawHeader(X_CLICK_TOKEN)) {
             auto app = qobject_cast<Update*>(reply->request().originatingObject());

=== modified file 'plugins/system-update/network/network.h'
--- plugins/system-update/network/network.h	2015-08-26 10:06:32 +0000
+++ plugins/system-update/network/network.h	2015-08-26 10:06:32 +0000
@@ -61,6 +61,7 @@
     void networkError();
     void serverError();
     void clickTokenObtained(Update *app, const QString &clickToken);
+    void credentialError();
 
 private Q_SLOTS:
     void onReplyFinished();

=== modified file 'plugins/system-update/update_manager.cpp'
--- plugins/system-update/update_manager.cpp	2015-02-18 19:55:52 +0000
+++ plugins/system-update/update_manager.cpp	2015-08-26 10:06:32 +0000
@@ -81,6 +81,8 @@
                   this, SIGNAL(networkError()));
     QObject::connect(&m_network, SIGNAL(serverError()),
                   this, SIGNAL(serverError()));
+    QObject::connect(&m_network, SIGNAL(credentialError()),
+                     this, SLOT(handleCredentialsFailed()));
     QObject::connect(&m_network,
                      SIGNAL(clickTokenObtained(Update*, const QString&)),
                      this, SLOT(clickTokenReceived(Update*, const QString&)));
@@ -169,6 +171,11 @@
     m_process.start(command, args);
 }
 
+void UpdateManager::handleCredentialsFailed()
+{
+    m_service.invalidateCredentials();
+}
+
 QString UpdateManager::getClickCommand()
 {
     QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();

=== modified file 'plugins/system-update/update_manager.h'
--- plugins/system-update/update_manager.h	2015-07-13 18:26:10 +0000
+++ plugins/system-update/update_manager.h	2015-08-26 10:06:32 +0000
@@ -138,6 +138,7 @@
     void processUpdates();
     void downloadApp(Update *app);
     void handleCredentialsFound(Token token);
+    void handleCredentialsFailed();
     void clickTokenReceived(Update *app, const QString &clickToken);
 
 private:

=== modified file 'tests/plugins/system-update/fakenetwork.h'
--- tests/plugins/system-update/fakenetwork.h	2014-10-23 13:27:05 +0000
+++ tests/plugins/system-update/fakenetwork.h	2015-08-26 10:06:32 +0000
@@ -42,6 +42,7 @@
     void errorOccurred();
     void networkError();
     void serverError();
+    void credentialError();
     void downloadUrlFound(const QString& packagename, const QString& url);
     void clickTokenObtained(Update* app, const QString& clickToken);
 };

=== modified file 'tests/plugins/system-update/fakessoservice.cpp'
--- tests/plugins/system-update/fakessoservice.cpp	2015-02-18 19:55:52 +0000
+++ tests/plugins/system-update/fakessoservice.cpp	2015-08-26 10:06:32 +0000
@@ -8,6 +8,10 @@
 {
 }
 
+void FakeSsoService::invalidateCredentials()
+{
+}
+
 void FakeSsoService::getCredentials()
 {
     if(m_validCredentials) {

=== modified file 'tests/plugins/system-update/fakessoservice.h'
--- tests/plugins/system-update/fakessoservice.h	2015-02-18 19:55:52 +0000
+++ tests/plugins/system-update/fakessoservice.h	2015-08-26 10:06:32 +0000
@@ -15,6 +15,7 @@
     explicit FakeSsoService(QObject *parent = 0);
 
     void getCredentials();
+    void invalidateCredentials();
 
     void setValidCredentials(bool value) { m_validCredentials = value; }
     void setDeletedCredentials(bool value) { m_deletedCredentials = value; }