Merge lp:~dobey/ubuntuone-credentials/announce-errors-rtm into lp:ubuntuone-credentials/rtm-14.09

[dobey]

Handle keyringError from the keyring, by deleting token.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-rtm-14.09-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-rtm-14.09-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-rtm-14.09-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-rtm-14.09-ci/2/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-rtm-14.09-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-rtm-14.09-14.09-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-rtm-14.09-14.09-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-rtm-14.09-ci/4/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

=== modified file 'debian/libubuntuoneauth-2.0-0.symbols'
--- debian/libubuntuoneauth-2.0-0.symbols	2014-09-09 13:53:07 +0000
+++ debian/libubuntuoneauth-2.0-0.symbols	2015-01-21 23:20:15 +0000
@@ -35,6 +35,7 @@
  (c++)"UbuntuOne::SSOService::handleCredentialsFound(UbuntuOne::Token const&)@Base" 13.08
  (c++)"UbuntuOne::SSOService::handleCredentialsNotFound()@Base" 13.08
  (c++)"UbuntuOne::SSOService::handleTwoFactorAuthRequired()@Base" 13.08
+ (c++)"UbuntuOne::SSOService::handleKeyringError(QString)@Base" 14.04+14.10.20140910bzr164
  (c++)"UbuntuOne::SSOService::login(QString, QString, QString)@Base" 13.08
  (c++)"UbuntuOne::SSOService::SSOService(QObject*)@Base" 13.08
  (c++)"UbuntuOne::SSOService::SSOService(QObject*)@Base" 13.08
@@ -117,6 +118,7 @@
  (c++)"UbuntuOne::Keyring::tokenFound(UbuntuOne::Token const&)@Base" 13.08
  (c++)"UbuntuOne::Keyring::deleteToken()@Base" 13.08
  (c++)"UbuntuOne::Keyring::handleError(SignOn::Error const&)@Base" 13.08
+ (c++)"UbuntuOne::Keyring::handleDeleteError(SignOn::Error const&)@Base" 14.04+14.10.20140910bzr165
  (c++)"UbuntuOne::Keyring::qt_metacall(QMetaObject::Call, int, void**)@Base" 13.08
  (c++)"UbuntuOne::Keyring::qt_metacast(char const*)@Base" 13.08
  (c++)"UbuntuOne::Keyring::tokenStored()@Base" 13.08

=== modified file 'libubuntuoneauth/keyring.cpp'
--- libubuntuoneauth/keyring.cpp	2014-08-13 16:10:46 +0000
+++ libubuntuoneauth/keyring.cpp	2015-01-21 23:20:15 +0000
@@ -169,6 +169,12 @@
         emit tokenDeleted();
     }
 
+    void Keyring::handleDeleteError(const SignOn::Error &error)
+    {
+        // Just log the error here, as we don't want to infinite loop.
+        qWarning() << "Error deleting token:" << error.message();
+    }
+
     void Keyring::deleteToken()
     {
         QString _acctName("ubuntuone");
@@ -183,7 +189,7 @@
             connect(account, SIGNAL(removed()),
                     this, SLOT(handleAccountRemoved()));
             connect(identity, SIGNAL(error(const SignOn::Error&)),
-                    this, SLOT(handleError(const SignOn::Error&)));
+                    this, SLOT(handleDeleteError(const SignOn::Error&)));
 
             identity->remove();
             account->remove();

=== modified file 'libubuntuoneauth/keyring.h'
--- libubuntuoneauth/keyring.h	2014-08-12 20:38:39 +0000
+++ libubuntuoneauth/keyring.h	2015-01-21 23:20:15 +0000
@@ -53,6 +53,7 @@
         void handleSessionData(const SignOn::SessionData &data);
         void handleCredentialsStored(const quint32 id);
         void handleAccountRemoved();
+        void handleDeleteError(const SignOn::Error &error);
 
     private:
         Accounts::Manager _manager;

=== modified file 'libubuntuoneauth/ssoservice.cpp'
--- libubuntuoneauth/ssoservice.cpp	2014-09-08 22:10:44 +0000
+++ libubuntuoneauth/ssoservice.cpp	2015-01-21 23:20:15 +0000
@@ -57,6 +57,9 @@
         connect(_keyring, SIGNAL(tokenDeleted()),
                 this, SLOT(handleTokenDeleted()));
 
+        connect(_keyring, SIGNAL(keyringError(QString)),
+                this, SLOT(handleKeyringError(QString)));
+
         connect(_nam, SIGNAL(finished(QNetworkReply*)),
                 this, SLOT(accountPinged(QNetworkReply*)));
 
@@ -166,4 +169,12 @@
         emit requestFailed(error);
     }
 
+    void SSOService::handleKeyringError(QString message)
+    {
+        _tempPassword = "";
+        /* Treat keyring errors as invalid/expired token.
+           Delete the token and act like it wasn't found. */
+        invalidateCredentials();
+        emit credentialsNotFound();
+    }
 }

=== modified file 'libubuntuoneauth/ssoservice.h'
--- libubuntuoneauth/ssoservice.h	2013-07-04 07:43:16 +0000
+++ libubuntuoneauth/ssoservice.h	2015-01-21 23:20:15 +0000
@@ -65,6 +65,7 @@
             void accountRegistered(const AccountResponse& account);
             void errorOccurred(const ErrorResponse&);
             void handleTwoFactorAuthRequired();
+            void handleKeyringError(QString message);
 
     private:
             Keyring *_keyring;