Merge lp:~dobey/ubuntu-system-settings/token-deleted into lp:ubuntu-system-settings

[dobey]

Handle the credentialsDeleted signal appropriately.

To test this is a bit difficult. You will need a U1 account on the phone, which is not added to the "unconfined" ACL. This can be done on the latest images, by manually deleting the ACL entry in the database after creating an account.

Close system settings.
Open the terminal app or use phablet-shell to perform the sqlite work.

First get the account ID:

# account-console list

That will print a list of account IDs and their provider. Take a note of the "ubuntuone" account, and use it as a parameter for the next command:

# account-console show <account-id>

Look for the "CredentialsId" field; let's call its value $ACCOUNT_ID.
Then you need to delete the entry from the ACL table in the signon database.

# sqlite3 .config/signond/signon.db
sqlite> delete from ACL where identity_id=$ACCOUNT_ID;
sqlite> delete from OWNER where identity_id=$ACCOUNT_ID;

Now, open system settings, and go to the Updates page. Without this branch, you should see the button requesting you to log in to U1 to get app updates. With this branch, the online accounts UI should pop up directly to the U1 page requesting to log in again.

[Ken VanDine (ken-vandine)]

Please include steps to manually test

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1316
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1981/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1425
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/251
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1423
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1423/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18175

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1316
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1992/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1459
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/262
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1293
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1457
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1457/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18219

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good and works as described, thanks!

review: Approve

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2015-01-30 18:09:06 +0000
+++ plugins/system-update/PageComponent.qml	2015-02-18 19:56:56 +0000
@@ -204,6 +204,11 @@
             credentialsNotification.visible = true;
         }
 
+        onCredentialsDeleted: {
+            credentialsNotification.visible = false;
+            uoaConfig.exec();
+        }
+
         onSystemUpdateDownloaded: {
             root.installAll = false;
         }

=== modified file 'plugins/system-update/update_manager.cpp'
--- plugins/system-update/update_manager.cpp	2015-01-23 10:01:34 +0000
+++ plugins/system-update/update_manager.cpp	2015-02-18 19:56:56 +0000
@@ -63,6 +63,10 @@
                      this, SIGNAL(credentialsNotFound()));
     QObject::connect(&m_service, SIGNAL(credentialsNotFound()),
                   this, SLOT(clickUpdateNotAvailable()));
+    QObject::connect(&m_service, SIGNAL(credentialsDeleted()),
+                     this, SIGNAL(credentialsDeleted()));
+    QObject::connect(&m_service, SIGNAL(credentialsDeleted()),
+                  this, SLOT(clickUpdateNotAvailable()));
     // PROCESS
     QObject::connect(&m_process, SIGNAL(finished(int)),
                   this, SLOT(processOutput()));

=== modified file 'plugins/system-update/update_manager.h'
--- plugins/system-update/update_manager.h	2014-12-09 21:01:36 +0000
+++ plugins/system-update/update_manager.h	2015-02-18 19:56:56 +0000
@@ -68,6 +68,7 @@
     void modelChanged();
     void updatesNotFound();
     void credentialsNotFound();
+    void credentialsDeleted();
     void updateAvailableFound(bool downloading);
     void errorFound();
     void networkError();

=== modified file 'tests/plugins/system-update/fakessoservice.cpp'
--- tests/plugins/system-update/fakessoservice.cpp	2014-05-07 15:37:22 +0000
+++ tests/plugins/system-update/fakessoservice.cpp	2015-02-18 19:56:56 +0000
@@ -13,6 +13,8 @@
     if(m_validCredentials) {
         Token token("token_key", "token_secret", "consumer_key", "consumer_secret");
         emit this->credentialsFound(token);
+    } else if (m_deletedCredentials) {
+        emit this->credentialsDeleted();
     } else {
         emit this->credentialsNotFound();
     }

=== modified file 'tests/plugins/system-update/fakessoservice.h'
--- tests/plugins/system-update/fakessoservice.h	2014-05-05 18:18:37 +0000
+++ tests/plugins/system-update/fakessoservice.h	2015-02-18 19:56:56 +0000
@@ -17,13 +17,16 @@
     void getCredentials();
 
     void setValidCredentials(bool value) { m_validCredentials = value; }
+    void setDeletedCredentials(bool value) { m_deletedCredentials = value; }
     
 signals:
     void credentialsFound(const Token&);
     void credentialsNotFound();
+    void credentialsDeleted();
 
 private:
     bool m_validCredentials;
+    bool m_deletedCredentials;
 };
 
 }