Merge lp:~mikemc/ubuntuone-credentials/slot-and-signal-improvements into lp:ubuntuone-credentials

[Mike McCracken]

Improvements to available slots and signals on ssoservice object.

Improvements to available slots and signals on ssoservice object.

- connect credentialsNotFound signal
- change credentialsStored signal to include token, and do not clear _pendingPing until after tokenStored signal, so clients can access new tokens created by login/register as well as old ones found in keyring
- rename slots to be clearer what they are connected to and avoid needing to use lots of synonyms
- also improve logging to make control flow obvious

[dobey (dobey)]

review: Approve

[lp:~mikemc/ubuntuone-credentials/slot-and-signal-improvements]

31. By Mike McCracken on 2013-06-28

merge with trunk, fix conflict

[dobey (dobey)]

The fixes to code in music-login to deal with the signal/slots API changes in here, will need to be done in this branch as well, so we don't end up with a broken app in the interim.

review: Needs Fixing

[lp:~mikemc/ubuntuone-credentials/slot-and-signal-improvements]

32. By Mike McCracken on 2013-07-02

Fix broken signals in music store login app

[Mike McCracken (mikemc)]

rev 32 fixes the music login app

[dobey (dobey)]

The conversion from "const Token&" -> "Token" in the signal/slot handling to update the music-login app for the changes is a bit weird, but if it works, it works.

review: Approve

=== modified file 'libubuntuoneauth/identityprovider.cpp'
--- libubuntuoneauth/identityprovider.cpp	2013-07-02 19:12:47 +0000
+++ libubuntuoneauth/identityprovider.cpp	2013-07-02 19:12:47 +0000
@@ -60,31 +60,32 @@
 
 void IdentityProvider::OnOAuthTokenGranted(const OAuthTokenResponse& token)
 {
+    qWarning() << "OAuth token received for " << token.token_name();
+
     emit OAuthTokenGranted(token);
-
-    qWarning() << "OAuth token received for " << token.token_name();
 }
 
 void IdentityProvider::OnPasswordTokenGranted(const PasswordTokenResponse& token)
 {
+    qWarning() << "Password token received for " << token.email();
+
     emit PasswordTokenGranted(token);
-
-    qWarning() << "Password token received for " << token.email();
 }
 
 void IdentityProvider::OnAccountGranted(const AccountResponse& account)
 {
+    qWarning() << "Account created for " << account.email(); 
+
     emit AccountGranted(account);
-
-    qWarning() << "Account created for " << account.email();
 }
 
 void IdentityProvider::OnErrorOccurred(const ErrorResponse& error)
 {
-    emit ErrorOccurred(error);
-
     qWarning("Error occurred creating account: %d (%s)",
              error.code(), error.message().toUtf8().data());
+
+    emit ErrorOccurred(error);
+
 }
 
 } /* end UbuntuOne namespace */

=== modified file 'libubuntuoneauth/keyring.cpp'
--- libubuntuoneauth/keyring.cpp	2013-05-28 13:28:49 +0000
+++ libubuntuoneauth/keyring.cpp	2013-07-02 19:12:47 +0000
@@ -54,7 +54,7 @@
 
         if (error != NULL) {
             QString message(error->message);
-            qCritical() << message;
+            qCritical() << "Error in secret_password_lookup: " <<  message;
             emit keyring->keyringError(message);
             g_error_free(error);
         } else if (password == NULL) {

=== modified file 'libubuntuoneauth/ssoservice.cpp'
--- libubuntuoneauth/ssoservice.cpp	2013-07-02 19:12:47 +0000
+++ libubuntuoneauth/ssoservice.cpp	2013-07-02 19:12:47 +0000
@@ -48,11 +48,14 @@
         _nam = new QNetworkAccessManager(this);
 
         connect(_keyring, SIGNAL(tokenFound(const Token&)),
-                this, SLOT(credentialsAcquired(const Token&)));
+                this, SLOT(handleCredentialsFound(const Token&)));
+        connect(_keyring, SIGNAL(tokenNotFound()),
+                this, SLOT(handleCredentialsNotFound()));
+
         connect(_keyring, SIGNAL(tokenStored()),
-                this, SLOT(credentialsSet()));
+                this, SLOT(handleTokenStored()));
         connect(_keyring, SIGNAL(tokenDeleted()),
-                this, SLOT(credentialsCleared()));
+                this, SLOT(handleTokenDeleted()));
 
         connect(&(_provider),
                 SIGNAL(OAuthTokenGranted(const OAuthTokenResponse&)),
@@ -70,9 +73,20 @@
         _keyring->findToken();
     }
 
-    void SSOService::credentialsAcquired(const Token& token)
-    {
-        emit this->credentialsFound(token);
+    void SSOService::handleCredentialsNotFound()
+    {
+        emit credentialsNotFound();
+    }
+    
+    void SSOService::handleCredentialsFound(const Token& token)
+    {
+        emit credentialsFound(token);
+    }
+
+    void SSOService::handleTokenStored()
+    {
+        emit credentialsStored(_pendingPing); 
+        _pendingPing = Token();
     }
 
     void SSOService::registerUser(QString email, QString password,
@@ -168,7 +182,6 @@
             _keyring->storeToken(_pendingPing);
 
         reply->deleteLater();
-        _pendingPing = Token();
     }
 
     void SSOService::invalidateCredentials()

=== modified file 'libubuntuoneauth/ssoservice.h'
--- libubuntuoneauth/ssoservice.h	2013-07-02 19:12:47 +0000
+++ libubuntuoneauth/ssoservice.h	2013-07-02 19:12:47 +0000
@@ -49,16 +49,17 @@
 
     signals:
         void credentialsDeleted();
-        void credentialsStored();
+        void credentialsStored(const Token& token);
         void credentialsFound(const Token& token);
-        void credentialsNotFound(QString id);
+        void credentialsNotFound();
         void requestFailed(const ErrorResponse& error);
 
         private slots:
             void accountPinged(QNetworkReply*);
-            void credentialsSet() { emit credentialsStored(); };
-            void credentialsCleared() { emit credentialsDeleted(); };
-            void credentialsAcquired(const Token& token);
+            void handleTokenStored();
+            void handleTokenDeleted() { emit credentialsDeleted(); };
+            void handleCredentialsFound(const Token& token);
+            void handleCredentialsNotFound();
             void tokenReceived(const OAuthTokenResponse& token);
             void accountRegistered(const AccountResponse& account);
             void errorOcurred(const ErrorResponse&);

=== modified file 'music-login/ssowizard.cpp'
--- music-login/ssowizard.cpp	2013-07-02 19:12:47 +0000
+++ music-login/ssowizard.cpp	2013-07-02 19:12:47 +0000
@@ -81,8 +81,8 @@
     QObject::connect(&(this->downloader), SIGNAL(fileDownloaded(QString&)),
                      this, SLOT(imageDownloaded(QString&)));
 
-    QObject::connect(&(this->_service), SIGNAL(credentialsStored()),
-                     this, SLOT(accountAuthenticated()));
+    QObject::connect(&(this->_service), SIGNAL(credentialsStored(const Token&)),
+                     this, SLOT(accountAuthenticated(Token)));
     QObject::connect(&(this->_service), SIGNAL(credentialsFound(const Token&)),
                      this, SLOT(openUrlAndFinish(Token)));
 
@@ -142,7 +142,7 @@
     this->_service.login(email, password);
 }
 
-void SSOWizard::accountAuthenticated()
+void SSOWizard::accountAuthenticated(Token token)
 {
     this->_service.getCredentials();
 }

=== modified file 'music-login/ssowizard.h'
--- music-login/ssowizard.h	2013-05-24 21:09:26 +0000
+++ music-login/ssowizard.h	2013-07-02 19:12:47 +0000
@@ -67,7 +67,7 @@
     void registerAndBuy(QString email, QString password, QString name);
     void showPageLogin();
 
-    void accountAuthenticated();
+    void accountAuthenticated(Token);
     void openUrlAndFinish(Token);
     void serviceFailed(const ErrorResponse&);