Merge lp:~dobey/ubuntuone-credentials/update-13-10 into lp:ubuntuone-credentials/stable-13-10

[dobey]

Rodney Dawes <email address hidden>

    Switch from using using the keyring, to storing tokens in online-accounts.
    Add necessary data files for online-accounts storage.
    Add the beginnings of a signon plugin for u1.
    Always print critical/fatal messages to stderr.
    When debug is enabled, also print debug messages to stderr.
    Add ctors for network requests to use the SSO_AUTH_BASE_URL value.
    Change usage of SSO_*_BASE_URL values to not require ending /.
    Restructure API URL constants to separate path from base URL.
    Only export the UbuntuOne namespace symbols in the shared library.

Michael McCracken <email address hidden>

    Add UOA provider plug-in to house login/register UI.
    Ensure initial value of _state variable is IDLE.
    Set signon plugin name to 'ubuntuoneplugin' as required by the signond plugin loader.
    Add cmake rule to generate qmltypes file for qtcreator integration.
    Validate input and show error messages for invalid email, short password, etc…
    Fix credential deletion and expose it via QML plugin.
    Improve UI, better support embedding into external QML, and add embedding example code.
    Add error signal for failure cases in Network class - covers connection failures.
    Add support for two-factor auth to the ssoservice and QML plugin (LP: #1197081)
    Add QML plugin that wraps login/register and signUrl functionality of libubuntuoneauth.

Diego Sarmentero <email address hidden>

    Fix UI flow requested by design for Returning Customers.

[Roberto Alsina (ralsina)]

+1 exhausted

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-credentials/update-13-10 into lp:ubuntuone-credentials/stable-13-10 failed. Below is the output from the failed tests.

-- The C compiler identification is GNU 4.8.1
-- The CXX compiler identification is GNU 4.8.1
-- Check for working C compiler: /usr/bin/cc
-- Check for working C compiler: /usr/bin/cc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Found PkgConfig: /usr/bin/pkg-config (found version "0.26")
-- checking for modules 'libsignon-qt5;accounts-qt5'
-- package 'libsignon-qt5' not found
-- package 'accounts-qt5' not found
-- Configuring incomplete, errors occurred!

CMake Error at /usr/share/cmake-2.8/Modules/FindPkgConfig.cmake:279 (message):
  A required package was not found
Call Stack (most recent call first):
  /usr/share/cmake-2.8/Modules/FindPkgConfig.cmake:333 (_pkg_check_modules_internal)
  CMakeLists.txt:28 (pkg_check_modules)

CMake Error at libubuntuoneauth/CMakeLists.txt:4 (find_package):
  By not providing "FindQt5Core.cmake" in CMAKE_MODULE_PATH this project has
  asked CMake to find a package configuration file provided by "Qt5Core", but
  CMake did not find one.

  Could not find a package configuration file provided by "Qt5Core" with any
  of the following names:

    Qt5CoreConfig.cmake
    qt5core-config.cmake

  Add the installation prefix of "Qt5Core" to CMAKE_PREFIX_PATH or set
  "Qt5Core_DIR" to a directory containing one of the above files. If
  "Qt5Core" provides a separate development package or SDK, be sure it has
  been installed.

[lp:~dobey/ubuntuone-credentials/update-13-10]

29. By Mike McCracken on 2013-08-28

Rodney Dawes <email address hidden>

    Switch from using using the keyring, to storing tokens in online-accounts.
    Add necessary data files for online-accounts storage.
    Add the beginnings of a signon plugin for u1.
    Always print critical/fatal messages to stderr.
    When debug is enabled, also print debug messages to stderr.
    Add ctors for network requests to use the SSO_AUTH_BASE_URL value.
    Change usage of SSO_*_BASE_URL values to not require ending /.
    Restructure API URL constants to separate path from base URL.
    Only export the UbuntuOne namespace symbols in the shared library.

Michael McCracken <email address hidden>

    Add UOA provider plug-in to house login/register UI.
    Ensure initial value of _state variable is IDLE.
    Set signon plugin name to 'ubuntuoneplugin' as required by the signond plugin loader.
    Add cmake rule to generate qmltypes file for qtcreator integration.
    Validate input and show error messages for invalid email, short password, etc…
    Fix credential deletion and expose it via QML plugin.
    Improve UI, better support embedding into external QML, and add embedding example code.
    Add error signal for failure cases in Network class - covers connection failures.
    Add support for two-factor auth to the ssoservice and QML plugin (LP: #1197081)
    Add QML plugin that wraps login/register and signUrl functionality of libubuntuoneauth.

Diego Sarmentero <email address hidden>

    Fix UI flow requested by design for Returning Customers.

=== modified file '.bzrignore'
--- .bzrignore	2013-05-01 15:39:22 +0000
+++ .bzrignore	2013-08-27 20:30:52 +0000
@@ -10,6 +10,7 @@
 test-ubuntuoneauthui
 ubuntuone-music-login
 moc_*.cpp
+qmldir
 ui_*.h
 *_automoc.cpp
 *_resources.cpp

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-08 14:34:25 +0000
+++ CMakeLists.txt	2013-08-27 20:30:52 +0000
@@ -15,6 +15,19 @@
 SET (AUTHUI_LIB_API_VERSION 2.0)
 SET (AUTHUI_LIB_NAME ubuntuoneauthui-${AUTHUI_LIB_API_VERSION})
 
+# these names are also used in qml-credentials-service/qmldir, be sure to change them in both places
+SET (QML_MODULE_NAME UbuntuOne)
+SET (QML_PLUGIN_API_VERSION 1.0)
+SET (QML_PLUGIN_NAME UbuntuOneCredentialsPlugin-${QML_PLUGIN_API_VERSION})
+
+# For the signon plug-in module
+SET (SIGNON_PLUGIN_NAME ubuntuoneplugin)
+
+# Need to get libsignon/accounts here, as they get exposed in headers
+find_package (PkgConfig REQUIRED)
+pkg_check_modules(LIBSIGNON REQUIRED libsignon-qt5 accounts-qt5)
+add_definitions(${LIBSIGNON_CFLAGS} ${LIBSIGNON_CFLAGS_OTHER})
+
 # Some default CFLAGS
 SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -g -Wall -Werror -fPIC")
 SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -O2 -g -Wall -Werror -fPIC")
@@ -23,6 +36,8 @@
 SET (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name.")
 SET (LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
 
+set (QML_MODULE_INSTALL_DIR ${LIB_INSTALL_DIR}/qt5/qml )
+
 include_directories(${CMAKE_SOURCE_DIR}/libubuntuoneauth
   ${CMAKE_SOURCE_DIR}/libubuntuoneauthui)
 
@@ -35,9 +50,13 @@
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
 
+add_subdirectory(data)
 add_subdirectory(libubuntuoneauth)
 add_subdirectory(libubuntuoneauthui)
 add_subdirectory(music-login)
+add_subdirectory(signon-plugin)
+add_subdirectory(qml-credentials-service)
+add_subdirectory(online-accounts-provider)
 
 # We need to add these here which simply depend on other test rules, as
 # CMake doesn't allow defining a "check" rule in multiple places.

=== added directory 'data'
=== added file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/CMakeLists.txt	2013-08-27 20:30:52 +0000
@@ -0,0 +1,7 @@
+file (GLOB PROVIDER_FILES *.provider)
+file (GLOB SERVICE_FILES *.service)
+file (GLOB SERVICE_TYPE_FILES *.service-type)
+
+install (FILES ${PROVIDER_FILES} DESTINATION share/accounts/providers/)
+install (FILES ${SERVICE_FILES} DESTINATION share/accounts/services/)
+install (FILES ${SERVICE_TYPE_FILES} DESTINATION share/accounts/service_types/)

=== added file 'data/ubuntuone.provider'
--- data/ubuntuone.provider	1970-01-01 00:00:00 +0000
+++ data/ubuntuone.provider	2013-08-27 20:30:52 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="ubuntuone">
+  <name>Ubuntu One</name>
+  <icon>ubuntuone</icon>
+  <plugin>ubuntuone</plugin>
+  <translations>ubuntuone-credentials</translations>
+
+  <template>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
+  </template>
+</provider>

=== added file 'data/ubuntuone.service'
--- data/ubuntuone.service	1970-01-01 00:00:00 +0000
+++ data/ubuntuone.service	2013-08-27 20:30:52 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service id="ubuntuone">
+  <type>ubuntuone</type>
+  <name>Ubuntu One</name>
+  <icon>ubuntuone</icon>
+  <provider>ubuntuone</provider>
+
+</service>

=== added file 'data/ubuntuone.service-type'
--- data/ubuntuone.service-type	1970-01-01 00:00:00 +0000
+++ data/ubuntuone.service-type	2013-08-27 20:30:52 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service-type id="ubuntuone">
+  <name>Ubuntu One</name>
+  <description>Integrate with Ubuntu One</description>
+  <icon>ubuntuone</icon>
+  <translations>ubuntuone-credentials</translations>
+</service-type>

=== modified file 'libubuntuoneauth/CMakeLists.txt'
--- libubuntuoneauth/CMakeLists.txt	2013-06-14 22:30:19 +0000
+++ libubuntuoneauth/CMakeLists.txt	2013-08-27 20:30:52 +0000
@@ -18,10 +18,7 @@
 # HEADERS only includes the public headers for installation.
 FILE (GLOB HEADERS *.h)
 
-find_package (PkgConfig REQUIRED)
-pkg_check_modules(LIBSECRET REQUIRED libsecret-1)
 pkg_check_modules(OAUTH REQUIRED oauth)
-add_definitions(${LIBSECRET_CFLAGS} ${LIBSECRET_CFLAGS_OTHER})
 add_definitions(${OAUTH_CFLAGS} ${OAUTH_CFLAGS_OTHER})
 
 # Need the project version here
@@ -30,8 +27,9 @@
 add_library (${AUTH_LIB_NAME} ${LIB_TYPE} ${SOURCES})
 qt5_use_modules (${AUTH_LIB_NAME} Core DBus Xml Network)
 target_link_libraries (${AUTH_LIB_NAME}
-  ${LIBSECRET_LDFLAGS}
+  ${LIBSIGNON_LDFLAGS}
   ${OAUTH_LDFLAGS}
+  -Wl,--version-script -Wl,${CMAKE_CURRENT_SOURCE_DIR}/libubuntuoneauth.symbols
 )
 
 SET_TARGET_PROPERTIES(${AUTH_LIB_NAME} PROPERTIES

=== modified file 'libubuntuoneauth/identityprovider.cpp'
--- libubuntuoneauth/identityprovider.cpp	2013-06-20 19:17:09 +0000
+++ libubuntuoneauth/identityprovider.cpp	2013-08-27 20:30:52 +0000
@@ -19,6 +19,7 @@
 
 #include "identityprovider.h"
 #include "responses.h"
+#include "errormessages.h"
 
 
 namespace UbuntuOne {
@@ -81,10 +82,16 @@
 
 void IdentityProvider::OnErrorOccurred(const ErrorResponse& error)
 {
-    qWarning("Error occurred creating account: %d (%s)",
-             error.code(), error.message().toUtf8().data());
-
-    emit ErrorOccurred(error);
+    if (error.code() == CODE_TWOFACTOR_REQUIRED){
+        emit TwoFactorAuthRequired();
+
+    }else{
+
+        qWarning("Error occurred creating token: %d (%s)",
+                 error.code(), error.message().toUtf8().data());
+
+        emit ErrorOccurred(error);
+    }
 
 }
 

=== modified file 'libubuntuoneauth/identityprovider.h'
--- libubuntuoneauth/identityprovider.h	2013-06-14 22:39:59 +0000
+++ libubuntuoneauth/identityprovider.h	2013-08-27 20:30:52 +0000
@@ -42,6 +42,7 @@
     void PasswordTokenGranted(const PasswordTokenResponse& token);
     void AccountGranted(const AccountResponse& account);
     void ErrorOccurred(const ErrorResponse& error);
+    void TwoFactorAuthRequired();
 
 public slots:
     void OnOAuthTokenGranted(const OAuthTokenResponse& token);

=== modified file 'libubuntuoneauth/keyring.cpp'
--- libubuntuoneauth/keyring.cpp	2013-06-20 19:17:09 +0000
+++ libubuntuoneauth/keyring.cpp	2013-08-27 20:30:52 +0000
@@ -15,122 +15,182 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#include <libsecret/secret.h>
+#include <Accounts/Account>
+#include <Accounts/AccountService>
+#include <Accounts/Service>
+#include <Accounts/ServiceType>
+#include <SignOn/Identity>
 
 #include <QDebug>
 
 #include "keyring.h"
 
-#define TOKEN_KEY_TYPE "Ubuntu SSO credentials"
-#define TOKEN_ATTR_TYPE_KEY "key-type"
-#define TOKEN_ATTR_NAME_KEY "token-name"
+using namespace Accounts;
+using namespace SignOn;
+
 
 namespace UbuntuOne {
 
     Keyring::Keyring(QObject *parent)
-        : QObject(parent)
-    {
-    }
-
-    static const SecretSchema *_getTokenSchema()
-    {
-        static const SecretSchema schema = {
-            "com.ubuntu.one.Token", SECRET_SCHEMA_DONT_MATCH_NAME,
-            {
-                { TOKEN_ATTR_TYPE_KEY, SECRET_SCHEMA_ATTRIBUTE_STRING },
-                { TOKEN_ATTR_NAME_KEY, SECRET_SCHEMA_ATTRIBUTE_STRING },
-            }
-        };
-
-        return &schema;
-    }
-
-    static void _onPasswordLookup(GObject *source, GAsyncResult *result,
-                                  Keyring *keyring)
-    {
-        GError *error = NULL;
-
-        gchar *password = secret_password_lookup_finish(result, &error);
-
-        if (error != NULL) {
-            QString message(error->message);
-            qCritical() << "Error in secret_password_lookup: " <<  message;
-            emit keyring->keyringError(message);
-            g_error_free(error);
-        } else if (password == NULL) {
-            emit keyring->tokenNotFound();
+        : QObject(parent),
+          _manager()
+    {
+    }
+
+    void Keyring::handleError(const SignOn::Error &error)
+    {
+        qCritical() << "Error:" << error.message();
+        emit keyringError(error.message());
+    }
+
+    void Keyring::handleSessionData(const SignOn::SessionData &data)
+    {
+        QString secret = data.Secret();
+
+        if (secret.length() == 0) {
+            QString msg("Could not read credentials secret value.");
+            qCritical() << msg;
+            emit keyringError(msg);
+            return;
+        }
+
+        Token *token = Token::fromQuery(secret);
+        if (token->isValid()) {
+            emit tokenFound(*token);
         } else {
-            QString query(password);
-            Token *token = Token::fromQuery(query);
-            if (token->isValid()) {
-                emit keyring->tokenFound(*token);
-            } else {
-                QString message("Faild to convert result to Token object.");
-                qCritical() << message;
-                emit keyring->keyringError(message);
-            }
-            delete token;
-            secret_password_free(password);
+            QString message("Failed to convert result to Token object.");
+            qCritical() << message;
+            emit keyringError(message);
         }
+        delete token;
     }
 
     void Keyring::findToken()
     {
-        secret_password_lookup(_getTokenSchema(), NULL,
-                               (GAsyncReadyCallback)_onPasswordLookup, this,
-                               TOKEN_ATTR_TYPE_KEY, TOKEN_KEY_TYPE,
-                               TOKEN_ATTR_NAME_KEY, Token::buildTokenName().toUtf8().data(),
-                               NULL);
+        QString _acctName("ubuntuone");
+        AccountIdList _ids = _manager.accountList(_acctName);
+        Identity *identity;
+        Account *account;
+
+        if (_ids.length() > 0) {
+            if (_ids.length() > 1) {
+                qDebug() << "findToken(): Found '" << _ids.length() << "' accounts. Using first.";
+            }
+            account = _manager.account(_ids[0]);
+            qDebug() << "findToken(): Using Ubuntu One account '" << _ids[0] << "'.";
+            identity = Identity::existingIdentity(account->credentialsId());
+            AuthSession *session = identity->createSession(QStringLiteral("password"));
+            if (session != NULL) {
+                connect(session, SIGNAL(response(const SignOn::SessionData&)),
+                        this, SLOT(handleSessionData(const SignOn::SessionData&)));
+                connect(session, SIGNAL(error(const SignOn::Error&)),
+                        this, SLOT(handleError(const SignOn::Error&)));
+                session->process(SessionData(), QStringLiteral("password"));
+                return;
+            }
+            qCritical() << "Unable to create AuthSession.";
+        }
+        emit tokenNotFound();
     }
 
-    static void _onPasswordStored(GObject *source, GAsyncResult *result,
-                                  Keyring *keyring)
+    void Keyring::handleCredentialsStored(const quint32 id)
     {
-        GError *error = NULL;
-
-        secret_password_store_finish (result, &error);
-        if (error != NULL) {
-            QString message(error->message);
-            qCritical() << "Error storing token: " << message;
-            emit keyring->keyringError(message);
-            g_error_free(error);
+        QString _acctName("ubuntuone");
+        AccountIdList _ids = _manager.accountList(_acctName);
+        Account *account;
+
+        if (_ids.length() > 0) {
+            if (_ids.length() > 1) {
+                qDebug() << "handleCredentialsStored(): Found '" << _ids.length() << "' accounts. Using first.";
+            }
+            account = _manager.account(_ids[0]);
+            qDebug() << "handleCredentialsStored(): Using Ubuntu One account '" << _ids[0] << "'.";
+            account->selectService();
+            account->setCredentialsId(id);
+
+            ServiceList services = account->services(_acctName);
+            if (services.length() > 0) {
+                account->selectService(services[0]);
+            } else {
+                QString errMsg("Unable to enable 'ubuntuone' service.");
+                emit keyringError(errMsg);
+            }
+            account->setEnabled(true);
+            account->sync();
+            emit tokenStored();
             return;
         }
-        emit keyring->tokenStored();
+        emit keyringError(QStringLiteral("Could not sync credentials ID."));
     }
 
     void Keyring::storeToken(Token token)
     {
-        secret_password_store(_getTokenSchema(), SECRET_COLLECTION_DEFAULT,
-                              TOKEN_ID, token.toQuery().toUtf8().data(), NULL,
-                              (GAsyncReadyCallback)_onPasswordStored, this,
-                              TOKEN_ATTR_TYPE_KEY, TOKEN_KEY_TYPE,
-                              TOKEN_ATTR_NAME_KEY, Token::buildTokenName().toUtf8().data(),
-                              NULL);
-    }
-
-    static void _onPasswordCleared(GObject *source, GAsyncResult *result,
-                                   Keyring *keyring)
-    {
-        GError *error = NULL;
-
-        secret_password_store_finish (result, &error);
-        if (error != NULL) {
-            QString message(error->message);
-            qDebug() << message;
-            emit keyring->keyringError(message);
-            g_error_free(error);
+        QString _acctName("ubuntuone");
+        AccountIdList _ids = _manager.accountList(_acctName);
+        Identity *identity;
+        Account *account;
+
+        if (_ids.length() > 0) {
+            if (_ids.length() > 1) {
+                qDebug() << "storeToken(): Found '" << _ids.length() << "' accounts. Using first.";
+            }
+            account = _manager.account(_ids[0]);
+            qDebug() << "storeToken(): Using Ubuntu One account '" << _ids[0] << "'.";
+            identity = Identity::existingIdentity(account->credentialsId());
+        } else {
+            account = _manager.createAccount(_acctName);
+
+            ServiceList services = account->services(_acctName);
+            if (services.length() > 0) {
+                account->selectService(services[0]);
+            } else {
+                QString errMsg("Unable to enable 'ubuntuone' service.");
+                emit keyringError(errMsg);
+            }
+
+            identity = Identity::newIdentity();
+            account->setEnabled(true);
+            account->sync();
         }
-        emit keyring->tokenDeleted();
+
+        connect(identity, SIGNAL(error(const SignOn::Error&)),
+                this, SLOT(handleError(const SignOn::Error&)));
+        connect(identity, SIGNAL(credentialsStored(const quint32)),
+                this, SLOT(handleCredentialsStored(const quint32)));
+
+        IdentityInfo info = IdentityInfo();
+
+        info.setSecret(token.toQuery(), true);
+        identity->storeCredentials(info);
+    }
+
+    void Keyring::handleAccountRemoved()
+    {
+        emit tokenDeleted();
     }
 
     void Keyring::deleteToken()
     {
-        secret_password_clear(_getTokenSchema(), NULL,
-                              (GAsyncReadyCallback)_onPasswordCleared, this,
-                              TOKEN_ATTR_TYPE_KEY, TOKEN_KEY_TYPE,
-                              TOKEN_ATTR_NAME_KEY, Token::buildTokenName().toUtf8().data(),
-                              NULL);
+        QString _acctName("ubuntuone");
+        AccountIdList _ids = _manager.accountList(_acctName);
+        if (_ids.length() > 0) {
+            if (_ids.length() > 1) {
+                qDebug() << "deleteToken(): Found '" << _ids.length() << "' accounts. Using first.";
+            }
+            Account *account = _manager.account(_ids[0]);
+            qDebug() << "deleteToken(): Using Ubuntu One account '" << _ids[0] << "'.";
+            Identity *identity = Identity::existingIdentity(account->credentialsId());
+            connect(account, SIGNAL(removed()),
+                    this, SLOT(handleAccountRemoved()));
+            connect(identity, SIGNAL(error(const SignOn::Error&)),
+                    this, SLOT(handleError(const SignOn::Error&)));
+
+            identity->remove();
+            account->remove();
+            account->sync();
+            return;
+        }
+        emit tokenNotFound();
     }
 
 } // namespace UbuntuOne

=== modified file 'libubuntuoneauth/keyring.h'
--- libubuntuoneauth/keyring.h	2013-05-24 19:10:54 +0000
+++ libubuntuoneauth/keyring.h	2013-08-27 20:30:52 +0000
@@ -18,6 +18,9 @@
 #ifndef _U1_KEYRING_H_
 #define _U1_KEYRING_H_
 
+#include <Accounts/Manager>
+#include <SignOn/Identity>
+
 #include <QObject>
 
 #include "token.h"
@@ -42,6 +45,15 @@
         void tokenDeleted();
 
         void keyringError(QString message);
+
+    private Q_SLOTS:
+        void handleError(const SignOn::Error &error);
+        void handleSessionData(const SignOn::SessionData &data);
+        void handleCredentialsStored(const quint32 id);
+        void handleAccountRemoved();
+
+    private:
+        Accounts::Manager _manager;
     };
 
 } /* namespace UbuntuOne */

=== added file 'libubuntuoneauth/libubuntuoneauth.symbols'
--- libubuntuoneauth/libubuntuoneauth.symbols	1970-01-01 00:00:00 +0000
+++ libubuntuoneauth/libubuntuoneauth.symbols	2013-08-27 20:30:52 +0000
@@ -0,0 +1,9 @@
+{
+  global:
+    extern "C++" {
+      *UbuntuOne::*;
+    };
+    qt_*;
+  local:
+    *;
+};

=== modified file 'libubuntuoneauth/logging.cpp'
--- libubuntuoneauth/logging.cpp	2013-05-01 15:39:22 +0000
+++ libubuntuoneauth/logging.cpp	2013-08-27 20:30:52 +0000
@@ -114,7 +114,23 @@
         if (type < _logLevel)
             return;
 
-        _logStream << QDateTime::currentDateTime().toString(_datetimeFormat).toUtf8().data() << " - " << getMessageTypeString(type).toUtf8().data() << " - " << message.toUtf8().data() << "\n";
+        QString logMessage;
+        QTextStream _logMessage(&logMessage);
+        _logMessage << QDateTime::currentDateTime().toString(_datetimeFormat).toUtf8().data() << " - " << getMessageTypeString(type).toUtf8().data() << " - " << message.toUtf8().data() << "\n";
+
+        QTextStream _stdErr(stderr, QIODevice::WriteOnly);
+        switch (type) {
+        case QtDebugMsg:
+        case QtCriticalMsg:
+        case QtFatalMsg:
+            _stdErr << logMessage;
+            break;
+        default:
+            break;
+        }
+        _stdErr.device()->close();
+
+        _logStream << logMessage;
         _logStream.flush();
 
         if (type == QtFatalMsg)

=== modified file 'libubuntuoneauth/network.cpp'
--- libubuntuoneauth/network.cpp	2013-06-14 22:39:59 +0000
+++ libubuntuoneauth/network.cpp	2013-08-27 20:30:52 +0000
@@ -23,10 +23,12 @@
 
 #include <QStringList>
 
+#include "errormessages.h"
 #include "network.h"
 #include "responses.h"
 #include "requests.h"
 
+#define NO_HTTP_REASON QString("No HTTP error reason")
 
 namespace UbuntuOne {
 
@@ -51,30 +53,35 @@
     /* TODO: see if we really need to do this check, we could just operate
        on a bad value as being an error rather than the extra check? */
     if (!statusAttr.isValid()) {
-        qDebug() << "Invalid status received!";
+        QString errmsg = QString("Invalid status attribute in Network::OnReply");
+        // Use login failed code, which results in generic error message:
+        emit ErrorOccurred(ErrorResponse(0, NO_HTTP_REASON, LOGIN_FAILED, errmsg));
         return;
     }
 
     int httpStatus = statusAttr.toInt();
 
-    qDebug() << "Network::OnReply from " << reply->url();
-    qDebug() << "Network::OnReply status: " << httpStatus;
+    qDebug() << "Network::OnReply from " << reply->url()
+             << " status: " << httpStatus;
     
     QByteArray payload = reply->readAll();
     if (payload.isEmpty()) {
-        qDebug() << "empty payload";
-        return; /* TODO: Do something to signal we're having a bad time. */
+        QString errmsg = QString("Network::OnReply: empty payload, giving up.");
+        emit ErrorOccurred(ErrorResponse(0, NO_HTTP_REASON, LOGIN_FAILED, errmsg));
+        return;
     }
  
     QJsonDocument document = QJsonDocument::fromJson(payload);
-    /* TODO: add logging or raise some type of error signal? */
+
     if (document.isEmpty()) {
-        qDebug() << "oops, received empty document";
+        QString errmsg = QString("Network::OnReply received empty document");
+        emit ErrorOccurred(ErrorResponse(0, NO_HTTP_REASON, LOGIN_FAILED, errmsg));
         return;
     }
 
     if (!document.isObject()) {
-        qDebug() << "uh oh, this isn't good.";
+        QString errmsg = QString("Network::OnReply received invalid QJsonDocument");
+        emit ErrorOccurred(ErrorResponse(0, NO_HTTP_REASON, LOGIN_FAILED, errmsg));
         return;
     }
     
@@ -82,17 +89,18 @@
 
     /* TODO: map out urls to reply parsers */
     if (httpStatus == 200 || httpStatus == 201) {
-        if (reply->url() == OAUTH_API)
+        if (reply->url().path() == OAUTH_PATH)
             ProcessOAuthTokenReply(object);
-        else if (reply->url() == PASSWORD_API)
+        else if (reply->url().path() == PASSWORD_PATH)
             ProcessPasswordTokenReply(object);
-        else if (reply->url() == ACCOUNTS_API)
+        else if (reply->url().path() == ACCOUNTS_PATH)
             ProcessAccountsReply(object);
     } else /* Statuses outside 200, 201 are fails */ {
         QVariant phraseAttr = reply->attribute(
                             QNetworkRequest::HttpReasonPhraseAttribute);
         if (!phraseAttr.isValid()) {
-            qDebug() << "got a bad HTTP reason";
+            QString errmsg = QString("HTTP reason phrase is invalid");
+            emit ErrorOccurred(ErrorResponse(httpStatus, NO_HTTP_REASON, LOGIN_FAILED, errmsg));
             return;
         }
         QString httpReason = phraseAttr.toString();

=== modified file 'libubuntuoneauth/network.h'
--- libubuntuoneauth/network.h	2013-06-14 22:39:59 +0000
+++ libubuntuoneauth/network.h	2013-08-27 20:30:52 +0000
@@ -28,8 +28,6 @@
 
 namespace UbuntuOne {
 
-//static QString API_BASE = "https://login.ubuntu.com/api/v2/";
-
 class Network : public QObject
 {
     Q_OBJECT

=== modified file 'libubuntuoneauth/requests.cpp'
--- libubuntuoneauth/requests.cpp	2013-06-14 22:39:59 +0000
+++ libubuntuoneauth/requests.cpp	2013-08-27 20:30:52 +0000
@@ -40,13 +40,20 @@
 {
 }
 
+OAuthTokenRequest::OAuthTokenRequest(QString base_url,
+                                     QString email, QString password,
+                                     QString name, QString otp)
+    : RequestInterface(base_url + OAUTH_PATH),
+      _email(email), _password(password), _name(name), _otp(otp)
+{
+}
+
 QByteArray OAuthTokenRequest::serialize() const
 {
     QJsonObject serializer;
     serializer.insert("email", this->email());
     serializer.insert("password", this->password());
     serializer.insert("token_name", this->name());
-    /* TODO: check for null */
     if (!this->otp().isEmpty())
         serializer.insert("otp", this->otp());
 
@@ -73,6 +80,17 @@
 {
 }
 
+AccountRequest::AccountRequest(QString base_url,
+                               QString email, QString password, QString name,
+                               QString captchaId, QString captchaSolution,
+                               bool createCaptcha)
+    : RequestInterface(base_url + ACCOUNTS_PATH),
+      _email(email), _password(password), _name(name),
+      _captchaId(captchaId), _captchaSolution(captchaSolution),
+      _createCaptcha(createCaptcha)
+{
+}
+
 QByteArray AccountRequest::serialize() const
 {
     QJsonObject data;
@@ -97,6 +115,11 @@
 {
 }
 
+PasswordTokenRequest::PasswordTokenRequest(QString base_url, QString email)
+    : RequestInterface(base_url + PASSWORD_PATH), _email(email)
+{
+}
+
 QByteArray PasswordTokenRequest::serialize() const
 {
     QJsonObject data;

=== modified file 'libubuntuoneauth/requests.h'
--- libubuntuoneauth/requests.h	2013-06-14 22:39:59 +0000
+++ libubuntuoneauth/requests.h	2013-08-27 20:30:52 +0000
@@ -24,10 +24,14 @@
 
 namespace UbuntuOne {
 
-static QString API_BASE = "https://login.ubuntu.com/api/v2/";
-static QString OAUTH_API = API_BASE + "tokens/oauth";
-static QString PASSWORD_API = API_BASE + "tokens/password";
-static QString ACCOUNTS_API = API_BASE + "accounts";
+static QString API_VERSION = "/api/v2";
+static QString API_BASE = "https://login.ubuntu.com/";
+static QString OAUTH_PATH = API_VERSION + "/tokens/oauth";
+static QString OAUTH_API = API_BASE + OAUTH_PATH;
+static QString PASSWORD_PATH = API_VERSION + "/tokens/password";
+static QString PASSWORD_API = API_BASE + PASSWORD_PATH;
+static QString ACCOUNTS_PATH = API_VERSION + "/accounts";
+static QString ACCOUNTS_API = API_BASE + ACCOUNTS_PATH;
 
 class RequestInterface
 {
@@ -47,6 +51,9 @@
     OAuthTokenRequest();
     OAuthTokenRequest(QString email, QString password,
                       QString token, QString otp);
+    OAuthTokenRequest(QString base_url,
+                      QString email, QString password,
+                      QString token, QString otp);
 
     QByteArray serialize() const;
 
@@ -71,6 +78,10 @@
     AccountRequest(QString email, QString password, QString name,
                    QString captchaId, QString captchaSolution,
                    bool createCaptcha = true);
+    AccountRequest(QString base_url,
+                   QString email, QString password, QString name,
+                   QString captchaId, QString captchaSolution,
+                   bool createCaptcha);
 
     QByteArray serialize() const;
 
@@ -98,6 +109,7 @@
 public:
     PasswordTokenRequest();
     PasswordTokenRequest(QString email);
+    PasswordTokenRequest(QString base_url, QString email);
 
     QByteArray serialize() const;
 

=== modified file 'libubuntuoneauth/ssoservice.cpp'
--- libubuntuoneauth/ssoservice.cpp	2013-06-28 23:44:14 +0000
+++ libubuntuoneauth/ssoservice.cpp	2013-08-27 20:30:52 +0000
@@ -67,8 +67,11 @@
                 SIGNAL(AccountGranted(const AccountResponse&)),
                 this, SLOT(accountRegistered(const AccountResponse&)));
         connect(&(_provider),
+                SIGNAL(TwoFactorAuthRequired()),
+                this, SLOT(handleTwoFactorAuthRequired()));
+        connect(&(_provider),
                 SIGNAL(ErrorOccurred(const ErrorResponse&)),
-                this, SLOT(errorOcurred(const ErrorResponse&)));
+                this, SLOT(errorOccurred(const ErrorResponse&)));
     }
 
     void SSOService::getCredentials()
@@ -88,14 +91,15 @@
 
     void SSOService::handleTokenStored()
     {
-        emit credentialsStored(_pendingPing); 
+        emit credentialsStored(); 
         _pendingPing = Token();
     }
 
     void SSOService::registerUser(QString email, QString password,
                                   QString display_name)
     {
-        AccountRequest request(email, password, display_name, NULL, NULL);
+        AccountRequest request(getAuthBaseUrl(),
+                               email, password, display_name, NULL, NULL);
 
         _tempPassword = password;
         _tempEmail = email;
@@ -108,14 +112,21 @@
         _tempPassword = "";
     }
 
-    void SSOService::login(QString email, QString password)
+    void SSOService::login(QString email, QString password, QString twoFactorCode)
     {
-        OAuthTokenRequest request(email, password, Token::buildTokenName(), NULL);
+        OAuthTokenRequest request(getAuthBaseUrl(),
+                                  email, password,
+                                  Token::buildTokenName(), twoFactorCode);
         _tempEmail = email;
 
         _provider.GetOAuthToken(request);
     }
 
+    void SSOService::handleTwoFactorAuthRequired()
+    {
+        emit twoFactorAuthRequired();
+    }
+
     static QString _getPlatformDataParams()
     {
         struct utsname _platData;
@@ -128,7 +139,7 @@
         params->addQueryItem("client_version", PROJECT_VERSION);
 
         QString result = params->toString();
-        qDebug() << "Ping parameters:" << result;
+
         return result;
     }
 
@@ -136,7 +147,7 @@
     {
         QString baseUrl = qgetenv("SSO_AUTH_BASE_URL");
         if (baseUrl.isEmpty())
-            baseUrl = QStringLiteral("https://login.ubuntu.com/");
+            baseUrl = QStringLiteral("https://login.ubuntu.com");
         return baseUrl;
     }
 
@@ -144,7 +155,7 @@
     {
         QString baseUrl = qgetenv("SSO_UONE_BASE_URL");
         if (baseUrl.isEmpty())
-            baseUrl = QStringLiteral("https://one.ubuntu.com/");
+            baseUrl = QStringLiteral("https://one.ubuntu.com");
         return baseUrl;
     }
 
@@ -152,7 +163,7 @@
     {
         Token realToken = Token(token.token_key(), token.token_secret(),
                                 token.consumer_key(), token.consumer_secret());
-        QString urlToSign = getUOneBaseUrl() + "oauth/sso-finished-so-get-tokens/" + _tempEmail + "?" + _getPlatformDataParams();
+        QString urlToSign = getUOneBaseUrl() + "/oauth/sso-finished-so-get-tokens/" + _tempEmail + "?" + _getPlatformDataParams();
         QString authHeader = realToken.signUrl(urlToSign,
                                                QStringLiteral("GET"));
         QNetworkRequest *_request = new QNetworkRequest();
@@ -189,7 +200,7 @@
         _keyring->deleteToken();
     }
 
-    void SSOService::errorOcurred(const ErrorResponse& error)
+    void SSOService::errorOccurred(const ErrorResponse& error)
     {
         _tempPassword = "";
         emit requestFailed(error);

=== modified file 'libubuntuoneauth/ssoservice.h'
--- libubuntuoneauth/ssoservice.h	2013-06-20 19:21:02 +0000
+++ libubuntuoneauth/ssoservice.h	2013-08-27 20:30:52 +0000
@@ -40,7 +40,7 @@
 
         void invalidateCredentials();
         void getCredentials();
-        void login(QString email, QString password);
+        void login(QString email, QString password, QString twoFactorCode = QString());
         void registerUser(QString email, QString password,
                           QString display_name);
 
@@ -49,10 +49,11 @@
 
     signals:
         void credentialsDeleted();
-        void credentialsStored(const Token& token);
+        void credentialsStored();
         void credentialsFound(const Token& token);
         void credentialsNotFound();
         void requestFailed(const ErrorResponse& error);
+        void twoFactorAuthRequired();
 
         private slots:
             void accountPinged(QNetworkReply*);
@@ -62,7 +63,8 @@
             void handleCredentialsNotFound();
             void tokenReceived(const OAuthTokenResponse& token);
             void accountRegistered(const AccountResponse& account);
-            void errorOcurred(const ErrorResponse&);
+            void errorOccurred(const ErrorResponse&);
+            void handleTwoFactorAuthRequired();
 
     private:
             Keyring *_keyring;

=== modified file 'libubuntuoneauth/token.h'
--- libubuntuoneauth/token.h	2013-06-25 15:52:14 +0000
+++ libubuntuoneauth/token.h	2013-08-27 20:30:52 +0000
@@ -49,4 +49,4 @@
 
 } /* namespace UbuntuOne */
 
-#endif /* _U1_KEYRING_H_ */
+#endif /* _U1_TOKEN_H_ */

=== modified file 'music-login/CMakeLists.txt'
--- music-login/CMakeLists.txt	2013-05-09 12:19:06 +0000
+++ music-login/CMakeLists.txt	2013-08-27 20:30:52 +0000
@@ -46,8 +46,8 @@
 qt5_use_modules (${MUSIC_LOGIN_LIB} Core DBus Gui Widgets Network)
 qt5_use_modules (${MUSIC_LOGIN_EXE} DBus Widgets Network)
 target_link_libraries (${MUSIC_LOGIN_EXE}
-  -Wl,-rpath,${CMAKE_BINARY_DIR}/lib
-  -L${CMAKE_BINARY_DIR}/lib
+  -Wl,-rpath,${CMAKE_BINARY_DIR}/libubuntuoneauth
+  -L${CMAKE_BINARY_DIR}/libubuntuoneauth
   ${AUTH_LIB_NAME}
   ${MUSIC_LIB_NAME}
 )

=== modified file 'music-login/loginform.cpp'
--- music-login/loginform.cpp	2013-06-14 22:30:19 +0000
+++ music-login/loginform.cpp	2013-08-27 20:30:52 +0000
@@ -71,13 +71,15 @@
 
 void LoginForm::validateForm()
 {
-    bool value = this->checkEmail() && this->checkPassword() && this->_sessionActive;
+    bool passwordCheck = this->ui->radioNewCustomer->isChecked() || this->checkPassword();
+    bool value = this->checkEmail() && passwordCheck && this->_sessionActive;
     this->ui->btnProceed->setEnabled(value);
 }
 
 bool LoginForm::checkEmail()
 {
-    bool value = !this->ui->lineEmail->text().isEmpty() && this->ui->lineEmail->text().contains("@");
+    QRegExp mailRE(".+@.+");
+    bool value = mailRE.exactMatch(this->ui->lineEmail->text());
     this->ui->lineEmail->setProperty("error", !value);
     this->style()->unpolish(this->ui->lineEmail);
     this->style()->polish(this->ui->lineEmail);
@@ -86,7 +88,10 @@
 
 bool LoginForm::checkPassword()
 {
-    bool value = this->ui->linePassword->text().length() > 7;
+    bool value = true;
+    if(this->ui->radioReturningCustomer->isChecked()){
+        value = this->ui->linePassword->text().length() > 7;
+    }
     this->ui->linePassword->setProperty("error", !value);
     this->style()->unpolish(this->ui->linePassword);
     this->style()->polish(this->ui->linePassword);
@@ -121,11 +126,15 @@
 void LoginForm::on_radioNewCustomer_clicked()
 {
     this->ui->btnProceed->setText(tr("Continue"));
+    this->validateForm();
+    this->checkPassword();
+    this->ui->lblPasswordError->setVisible(false);
 }
 
 void LoginForm::on_radioReturningCustomer_clicked()
 {
     this->ui->btnProceed->setText(tr("Proceed to Checkout"));
+    this->validateForm();
 }
 
 void LoginForm::showEmailWarning()
@@ -135,5 +144,7 @@
 
 void LoginForm::showPasswordWarning()
 {
-    this->ui->lblPasswordError->setVisible(!this->checkPassword());
+    if(this->ui->radioReturningCustomer->isChecked()){
+        this->ui->lblPasswordError->setVisible(!this->checkPassword());
+    }
 }

=== modified file 'music-login/registerform.cpp'
--- music-login/registerform.cpp	2013-06-14 22:30:19 +0000
+++ music-login/registerform.cpp	2013-08-27 20:30:52 +0000
@@ -104,7 +104,8 @@
 
 bool RegisterForm::checkEmail()
 {
-    bool value = !this->ui->lineEmail->text().isEmpty() && this->ui->lineEmail->text().contains("@");
+    QRegExp mailRE(".+@.+");
+    bool value = mailRE.exactMatch(this->ui->lineEmail->text());
     this->ui->lineEmail->setProperty("error", !value);
     this->style()->unpolish(this->ui->lineEmail);
     this->style()->polish(this->ui->lineEmail);

=== modified file 'music-login/ssowizard.cpp'
--- music-login/ssowizard.cpp	2013-07-02 18:59:41 +0000
+++ music-login/ssowizard.cpp	2013-08-27 20:30:52 +0000
@@ -81,11 +81,14 @@
     QObject::connect(&(this->downloader), SIGNAL(fileDownloaded(QString&)),
                      this, SLOT(imageDownloaded(QString&)));
 
-    QObject::connect(&(this->_service), SIGNAL(credentialsStored(const Token&)),
-                     this, SLOT(accountAuthenticated(Token)));
+    QObject::connect(&(this->_service), SIGNAL(credentialsStored()),
+                     this, SLOT(accountAuthenticated()));
     QObject::connect(&(this->_service), SIGNAL(credentialsFound(const Token&)),
                      this, SLOT(openUrlAndFinish(Token)));
 
+    QObject::connect(&(this->_service), SIGNAL(twoFactorAuthRequired()),
+                     this, SLOT(handleTwoFactorAuthRequired()));
+
     QObject::connect(&(this->_service), SIGNAL(requestFailed(const ErrorResponse&)),
                      this, SLOT(serviceFailed(const ErrorResponse&)));
     QObject::connect(this->ui->pageLogin, SIGNAL(newCustomerSelected(QString,QString)),
@@ -142,7 +145,7 @@
     this->_service.login(email, password);
 }
 
-void SSOWizard::accountAuthenticated(Token token)
+void SSOWizard::accountAuthenticated()
 {
     this->_service.getCredentials();
 }
@@ -172,6 +175,12 @@
     this->ui->stackedWidget->setCurrentIndex(0);
 }
 
+void SSOWizard::handleTwoFactorAuthRequired()
+{
+    this->_overlay->hide();
+    this->showError(ErrorResponse(401, QString(), TWOFACTOR_REQUIRED, QString()));
+}
+
 void SSOWizard::serviceFailed(const ErrorResponse& error)
 {
     this->_overlay->hide();

=== modified file 'music-login/ssowizard.h'
--- music-login/ssowizard.h	2013-07-02 18:59:41 +0000
+++ music-login/ssowizard.h	2013-08-27 20:30:52 +0000
@@ -67,8 +67,9 @@
     void registerAndBuy(QString email, QString password, QString name);
     void showPageLogin();
 
-    void accountAuthenticated(Token);
+    void accountAuthenticated();
     void openUrlAndFinish(Token);
+    void handleTwoFactorAuthRequired();
     void serviceFailed(const ErrorResponse&);
 
 private:

=== modified file 'music-login/tests/CMakeLists.txt'
--- music-login/tests/CMakeLists.txt	2013-05-27 02:26:03 +0000
+++ music-login/tests/CMakeLists.txt	2013-08-27 20:30:52 +0000
@@ -20,8 +20,8 @@
 qt5_use_modules (${UI_TESTS_TARGET} Test DBus Network Widgets)
 add_dependencies (${UI_TESTS_TARGET} ${MUSIC_LOGIN_LIB})
 target_link_libraries (${UI_TESTS_TARGET}
-  -Wl,-rpath,${CMAKE_BINARY_DIR}/lib
-  -L${CMAKE_BINARY_DIR}/lib
+  -Wl,-rpath,${CMAKE_BINARY_DIR}/libubuntuoneauth
+  -L${CMAKE_BINARY_DIR}/libubuntuoneauth
   ${AUTH_LIB_NAME}
   ${MUSIC_LOGIN_LIB}
 )

=== modified file 'music-login/tests/testloginform.cpp'
--- music-login/tests/testloginform.cpp	2013-06-14 22:30:19 +0000
+++ music-login/tests/testloginform.cpp	2013-08-27 20:30:52 +0000
@@ -51,6 +51,7 @@
     this->loginForm.ui->btnProceed->setEnabled(false);
     this->loginForm.ui->lblEmailError->setVisible(false);
     this->loginForm.ui->lblPasswordError->setVisible(false);
+    this->loginForm.ui->btnProceed->setText(QString("Proceed to Checkout"));
 }
 
 void TestLoginForm::cleanup()
@@ -83,7 +84,7 @@
     QVERIFY(this->loginForm.checkPassword());
 }
 
-void TestLoginForm::testValidateForm()
+void TestLoginForm::testValidateFormWithPassword()
 {
     QVERIFY(!this->loginForm.ui->btnProceed->isEnabled());
     this->loginForm.ui->lineEmail->setText("[e-mail]");
@@ -92,6 +93,15 @@
     QVERIFY(this->loginForm.ui->btnProceed->isEnabled());
 }
 
+void TestLoginForm::testValidateFormWithoutPassword()
+{
+    QVERIFY(!this->loginForm.ui->btnProceed->isEnabled());
+    this->loginForm.ui->lineEmail->setText("[e-mail]");
+    QVERIFY(!this->loginForm.ui->btnProceed->isEnabled());
+    this->loginForm.ui->radioNewCustomer->click();
+    QVERIFY(this->loginForm.ui->btnProceed->isEnabled());
+}
+
 void TestLoginForm::testCheckEmailWarnings()
 {
     this->loginForm.show();
@@ -104,9 +114,10 @@
     QVERIFY(!this->loginForm.ui->lblEmailError->isVisible());
 }
 
-void TestLoginForm::testCheckPasswordWarnings()
+void TestLoginForm::testCheckPasswordWarningsReturningCustomer()
 {
     this->loginForm.show();
+    this->loginForm.ui->radioReturningCustomer->setChecked(true);
     QVERIFY(!this->loginForm.ui->lblPasswordError->isVisible());
     this->loginForm.ui->linePassword->setText("pass");
     this->loginForm.ui->linePassword->editingFinished();
@@ -116,6 +127,19 @@
     QVERIFY(!this->loginForm.ui->lblPasswordError->isVisible());
 }
 
+void TestLoginForm::testCheckPasswordWarningsNewCustomer()
+{
+    this->loginForm.show();
+    this->loginForm.ui->radioNewCustomer->setChecked(true);
+    QVERIFY(!this->loginForm.ui->lblPasswordError->isVisible());
+    this->loginForm.ui->linePassword->setText("pass");
+    this->loginForm.ui->linePassword->editingFinished();
+    QVERIFY(!this->loginForm.ui->lblPasswordError->isVisible());
+    this->loginForm.ui->linePassword->setText("password");
+    this->loginForm.ui->linePassword->editingFinished();
+    QVERIFY(!this->loginForm.ui->lblPasswordError->isVisible());
+}
+
 void TestLoginForm::testButtonProceed()
 {
     QVERIFY(!this->_newCustomerEmitted);

=== modified file 'music-login/tests/testloginform.h'
--- music-login/tests/testloginform.h	2013-05-08 14:36:08 +0000
+++ music-login/tests/testloginform.h	2013-08-27 20:30:52 +0000
@@ -47,9 +47,11 @@
     void init();
     void testCheckEmail();
     void testCheckPassword();
-    void testValidateForm();
+    void testValidateFormWithPassword();
+    void testValidateFormWithoutPassword();
     void testCheckEmailWarnings();
-    void testCheckPasswordWarnings();
+    void testCheckPasswordWarningsReturningCustomer();
+    void testCheckPasswordWarningsNewCustomer();
     void testButtonProceed();
     void testButtonText();
     void testShowErrorTipsAlreadyRegistered();

=== added directory 'online-accounts-provider'
=== added file 'online-accounts-provider/CMakeLists.txt'
--- online-accounts-provider/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/CMakeLists.txt	2013-08-27 20:30:52 +0000
@@ -0,0 +1,6 @@
+file (GLOB QML_PLUGIN_FILES *.qml)
+
+# The path (including plug-in name) where the QML files are installed
+set (QML_PLUGIN_INSTALL_DIR share/accounts/qml-plugins/ubuntuone/)
+
+install (FILES ${QML_PLUGIN_FILES} DESTINATION ${QML_PLUGIN_INSTALL_DIR})

=== added file 'online-accounts-provider/ExistingAccount.qml'
--- online-accounts-provider/ExistingAccount.qml	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/ExistingAccount.qml	2013-08-27 20:30:52 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.OnlineAccounts 0.1
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+Column {
+    id: root
+
+    property variant __account: account
+
+    signal finished
+
+    anchors.left: parent.left
+    anchors.right: parent.right
+
+    ListItem.SingleValue {
+        text: "User Name"
+        value: account.displayName
+    }
+
+    ListItem.SingleValue {
+        text: "Token Name"
+        value: account.displayName
+    }
+
+    ServiceSwitches {
+        account: __account
+        enabled: __account.enabled
+        opacity: enabled ? 1 : 0.5
+    }
+
+    // TOFIX: use ListItem.SingleControl when lp #1194844 is fixed
+    ListItem.Base {
+        Button {
+            anchors {
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+                left: parent.left
+            }
+            text: "Remove account…"
+            onClicked: PopupUtils.open(removalConfirmationComponent); // huh? , removeBtn)
+        }
+        showDivider: false
+    }
+
+   Component {
+        id: removalConfirmationComponent  
+        Dialog {
+            id: dialog
+
+            property bool confirmed: false
+
+            title: "Remove Credentials"
+            text: "Removing the Ubuntu One credentials will prevent any applications on this device from accessing your account. You can authorize the device again by providing your username and password."
+
+            Button {
+                text: "Remove"
+                onClicked: {
+                    PopupUtils.close(dialog);
+                    console.log("Removing account: " + __account);
+                    account.removed.connect(root.finished);
+                    account.remove(Account.RemoveCredentials);
+                }
+
+            }
+
+            Button {
+                text: "Cancel"
+                onClicked: {
+                    console.log("User cancelled account removal");
+                    PopupUtils.close(dialog);
+                }
+            }
+        } // Dialog
+   } //Component
+}

=== added file 'online-accounts-provider/LoginForm.qml'
--- online-accounts-provider/LoginForm.qml	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/LoginForm.qml	2013-08-27 20:30:52 +0000
@@ -0,0 +1,100 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    // Set a non-zero height and width so that the parent Column in
+    // CredentialsUI lays out correctly. Set matching color so we
+    // don't see a line.
+    height: 0.001
+    width: main.width
+    color: main.parent.color 
+
+    property alias password: passwordTextField.text
+    property alias twoFactorVisible: twoFactorUI.visible
+    property alias twoFactorCode: twoFactorTextField.text
+
+    Column {
+        spacing: units.gu(2)
+
+        Label {
+            text: "I am a returning user and my password is:"
+            fontSize: "small"
+        }
+        TextField {
+            id: passwordTextField
+
+            placeholderText: "Your password"
+            echoMode: TextInput.Password
+            width: main.width - (2 * main.anchors.margins)
+
+            Keys.onReturnPressed: main.processForm();
+        }
+
+        Label {
+            text: '<a href="https://login.ubuntu.com/+forgot_password"><span style="color: #dd4814;">Forgotten your password?</span></a>'
+            textFormat: Text.RichText
+            fontSize: "small"
+            onLinkActivated: { Qt.openUrlExternally(link); }
+        }
+
+        
+        Column {
+            id: twoFactorUI
+            spacing: units.gu(2)
+            height: 1
+            width: parent.width
+            visible: false
+
+            Label {
+                text: "Type your verification code:"
+                fontSize: "small"
+            }
+
+            TextField {
+                id: twoFactorTextField
+                placeholderText: "2-factor device code"
+                echoMode: TextInput.Password
+                focus: true
+                width: main.width - (2 * main.anchors.margins)
+                Keys.onReturnPressed: {
+                    main.processForm();
+                }
+            }
+
+            Label {
+                text: '<a href="https://login.ubuntu.com/+device-help"><span style="color: #dd4814;">Authentication Device Help</span></a>'
+                textFormat: Text.RichText
+                fontSize: "small"
+                onLinkActivated: { Qt.openUrlExternally(link); }
+            }
+
+        } // Rectangle : twoFactorUI
+
+
+    }// Column
+
+    function resetUI() {
+        twoFactorUI.visible = false;
+        twoFactorTextField.text = "";
+        passwordTextField.text = "";
+    }
+
+    function validateInput() {
+        var passwordLongEnough = passwordTextField.text.length > 7;
+        passwordTextField.errorHighlight = !passwordLongEnough;
+        if (!passwordLongEnough) {
+            main.showError("Password must be at least 8 characters long.");
+        }
+
+        if (!twoFactorUI.visible) {
+            return passwordLongEnough;
+        }
+        
+        var twoFactorLongEnough = twoFactorTextField.text.length > 0;
+        twoFactorTextField.errorHighlight = !twoFactorLongEnough;
+        if(!twoFactorLongEnough){
+            main.showError("Please enter your two-factor device code.");
+        }
+        return passwordLongEnough && twoFactorLongEnough;
+    }
+}

=== added file 'online-accounts-provider/Main.qml'
--- online-accounts-provider/Main.qml	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/Main.qml	2013-08-27 20:30:52 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.OnlineAccounts 0.1
+
+Flickable {
+    id: root
+
+    property url newAccountUrl: "NewAccount.qml"
+    property url existingAccountUrl: "ExistingAccount.qml"
+    property Component newAccountComponent: null
+    property Component existingAccountComponent: null
+
+    property alias source: loader.source
+
+    signal finished
+
+    anchors.left: parent.left
+    anchors.right: parent.right
+    contentHeight: contentItem.childrenRect.height
+
+    Loader {
+        id: loader
+        anchors.left: parent.left
+        anchors.right: parent.right
+        source: sourceComponent === null ? (account.accountId != 0 ? existingAccountUrl : newAccountUrl) : ""
+        sourceComponent: account.accountId != 0 ? existingAccountComponent : newAccountComponent
+
+        Connections {
+            target: loader.item
+            onFinished: root.finished()
+        }
+    }
+}

=== added file 'online-accounts-provider/NewAccount.qml'
--- online-accounts-provider/NewAccount.qml	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/NewAccount.qml	2013-08-27 20:30:52 +0000
@@ -0,0 +1,257 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import UbuntuOne 1.0
+import Ubuntu.OnlineAccounts 0.1
+
+
+Column {
+    id: main
+
+    //property variant authenticationParameters: null
+
+    property bool isNewAccount: false
+    property variant __account: account
+// unneeded:?    property alias globalAccountService: globalAccountSettings
+
+
+    state: "login" // or "register" or "twofactor"
+    property var currentVisible: loginForm
+    property var formValid: false
+
+    signal finished
+
+    anchors.left: parent.left
+    anchors.right: parent.right
+
+    Component.onCompleted: {
+        isNewAccount = (account.accountId === 0);
+        resetUI();
+    }
+
+    Label {
+        id: title
+        text: "One account to log in to everything on Ubuntu"
+        fontSize: "medium"
+        color: UbuntuColors.coolGrey
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.margins: parent.anchors.margins
+    }
+
+    Label {
+        id: errorLabel
+        text: ""
+        font.bold: true
+        color: "red"
+        visible: false
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.margins: parent.anchors.margins
+
+    }
+
+    Label {
+        text: "Please type your email:"
+        fontSize: "large"
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.margins: parent.anchors.margins
+    }
+
+    TextField {
+        id: emailTextField
+        placeholderText: "Your email"
+        focus: true;
+
+        width: main.width - (2 * main.anchors.margins)
+        anchors.left: parent.left
+        anchors.margins: parent.anchors.margins
+    }
+
+    Row {
+        spacing: units.gu(2)
+        Switch {
+            id: newUserToggleSwitch
+            checked: false
+
+            onCheckedChanged: {
+                toggleNewUser();
+            }
+        }
+        Label {
+            anchors.verticalCenter: newUserToggleSwitch.verticalCenter
+            text: "I am a new Ubuntu One user"
+            fontSize: "large"
+        }
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.margins: parent.anchors.margins
+
+    } // Row
+
+    LoginForm {
+        id: loginForm
+        visible: true
+        
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.margins: parent.anchors.margins
+    }
+
+    RegisterForm {
+        id: registerForm
+        visible: false
+        
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.margins: parent.anchors.margins
+    }
+
+    Rectangle {
+        id: loadingOverlay
+        opacity: 0.6
+        color: "white"
+        visible: false
+        width: main.width
+        height: main.height
+        //TODO: anchors.centerIn: main.parent
+
+        ActivityIndicator {
+            id: activity
+          //TODO:  anchors.centerIn: parent
+            running: true
+        }
+    }
+
+    // -------------------------------------------------
+
+    UbuntuOneCredentialsService {
+        id: u1credservice
+
+        onLoginOrRegisterSuccess: {
+            handleSuccess();
+        }
+
+        onTwoFactorAuthRequired: {
+            showTwoFactorUI();
+        }
+
+        onLoginOrRegisterError: {
+            if (errorMessage == "Invalid request data") {
+                errorMessage = "Please enter a valid email address.";
+            }
+            showError(errorMessage);
+        }
+    }
+
+    function resetUI() {
+        errorLabel.visible = false;
+        emailTextField.text = "";
+        loginForm.resetUI()
+        registerForm.resetUI();
+        newUserToggleSwitch.checked = false;
+        state = "login";
+        switchTo(loginForm);
+        formValid = false;
+    }
+
+    function showError(message) {
+        errorLabel.text = message;
+        errorLabel.visible = true;
+        loadingOverlay.visible = false;
+    }
+
+    function switchTo(newVisible) {
+        currentVisible.visible = false;
+        newVisible.visible = true;
+        currentVisible = newVisible;
+    }
+
+    function toggleNewUser() {
+        if(state == "login") {
+            switchTo(registerForm)
+            state = "register";
+        } else if(state == "register") {
+            switchTo(loginForm)
+            state = "login";
+        } else {
+            console.debug("unexpected state" + state + "in toggleNewUser");
+        }
+    }
+
+    function processForm() {
+        validateInput();
+        if (!formValid) {
+            return;
+        }
+        loadingOverlay.visible = true;
+        if(state == "login") {
+            var password = loginForm.password;
+            u1credservice.login(emailTextField.text, password);
+        } else if(state == "register") {
+            var password = registerForm.password;
+            var display_name = registerForm.display_name;
+            u1credservice.registerUser(emailTextField.text, password, display_name);
+        } else if(state == "twofactor") {
+            u1credservice.login(emailTextField.text, loginForm.password, loginForm.twoFactorCode);
+        }
+    }
+
+    function handleSuccess() {
+        loadingOverlay.visible = false;
+        errorLabel.visible = false;
+        resetUI();
+        finished();
+    }
+
+    function showTwoFactorUI() {
+        loadingOverlay.visible = false;
+        if(state != "login") {
+            console.log("Error: did not expect two factor request from register");
+            showError("An internal error occurred. Please try again later.");
+            return;
+        }
+        errorLabel.visible = false;
+        state = "twofactor";
+        loginForm.twoFactorVisible = true;
+        formValid = false;
+    }
+
+    function validateInput() {
+        formValid = emailTextField.acceptableInput;
+        if(!formValid) {
+            showError("Please enter a valid email address.");
+            return;
+        }
+
+        if(state == "login" || state == "twofactor") {
+            formValid &= loginForm.validateInput();
+        } else {
+            formValid &= registerForm.validateInput();
+        }
+        
+        if(formValid) {
+            errorLabel.visible = false;
+        }
+    }
+
+}

=== added file 'online-accounts-provider/RegisterForm.qml'
--- online-accounts-provider/RegisterForm.qml	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/RegisterForm.qml	2013-08-27 20:30:52 +0000
@@ -0,0 +1,97 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    // Set a non-zero height and width so that the parent Column in
+    // CredentialsUI lays out correctly. Set matching color so we
+    // don't see a 1px line.
+    height: 0.001
+    width: main.width
+    color: main.parent.color
+
+    property alias password: passwordTextField.text
+    property alias display_name: nameTextField.text
+
+
+    Column {
+        spacing: units.gu(2)
+
+        Label {
+            id: subtitle
+            fontSize: "small"
+            text: "Please tell us your name and choose a password."
+        }
+        
+        TextField {
+            id: nameTextField
+            placeholderText: "Your name"
+            width: main.width - (2 * main.anchors.margins)
+        }
+
+        TextField {
+            id: passwordTextField
+            placeholderText: "Password with at least 8 characters"
+            echoMode: TextInput.Password
+            width: main.width - (2 * main.anchors.margins)
+        }
+
+        TextField {
+            id: confirmPasswordTextField
+            placeholderText: "Re-type password"
+            echoMode: TextInput.Password
+            width: main.width - (2 * main.anchors.margins)
+        }
+        Row {
+            spacing: units.gu(2)
+            CheckBox {
+                id: termsAndConditionsCheckBox
+                checked: false
+            }
+
+            Label {
+                anchors.verticalCenter: termsAndConditionsCheckBox.verticalCenter
+                text: "I agree to the <a href='http://one.ubuntu.com/terms/'>Ubuntu One Terms and Conditions</a>"
+                fontSize: "small"
+                onLinkActivated: { Qt.openUrlExternally(link); }
+            }
+        }
+    }
+
+    function resetUI() {
+        termsAndConditionsCheckBox.checked = false;
+        nameTextField.text = "";
+        passwordTextField.text = "";
+        confirmPasswordTextField.text = "";
+    }
+    
+    function validateInput() {
+        var valid = termsAndConditionsCheckBox.checked;
+        if (!valid) {
+            main.showError("Please accept the terms and conditions by checking the box.");
+            return false;
+        }
+
+        var nameOK = (nameTextField.text != "");
+        nameTextField.errorHighlight = !nameOK;
+        if (!nameOK) {
+            main.showError("Please enter a name.");
+            return false;
+        }
+
+        var passwordLongEnough = passwordTextField.length > 7;
+        passwordTextField.errorHighlight = !passwordLongEnough;
+        if (!passwordLongEnough) {
+            main.showError("Your password must be at least 8 characters long.");
+            return false;
+        }
+
+        var passwordsMatch = (passwordTextField.text == confirmPasswordTextField.text);
+        confirmPasswordTextField.errorHighlight = !passwordsMatch;
+        if (!passwordsMatch) {
+            main.showError("The passwords do not match.");
+            return false;
+        }
+
+        return true;
+    }
+}

=== added directory 'qml-credentials-service'
=== added file 'qml-credentials-service/CMakeLists.txt'
--- qml-credentials-service/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ qml-credentials-service/CMakeLists.txt	2013-08-27 20:30:52 +0000
@@ -0,0 +1,25 @@
+# Qt5 bits
+set (CMAKE_INCLUDE_CURRENT_DIR ON)
+set (CMAKE_AUTOMOC ON)
+find_package(Qt5Core REQUIRED)
+
+file (GLOB CPP_SOURCES *.cpp)
+
+configure_file (qmldir.template qmldir)
+
+add_library (${QML_PLUGIN_NAME} MODULE ${CPP_SOURCES})
+qt5_use_modules (${QML_PLUGIN_NAME} Core Widgets Quick Qml )
+target_link_libraries (${QML_PLUGIN_NAME}
+  -Wl,-rpath,${CMAKE_BINARY_DIR}/libubuntuoneauth
+  -L${CMAKE_BINARY_DIR}/libubuntuoneauth
+  ${AUTH_LIB_NAME}
+)
+
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/qmldir DESTINATION ${QML_MODULE_INSTALL_DIR}/${QML_MODULE_NAME} )
+
+install (TARGETS ${QML_PLUGIN_NAME} 
+  LIBRARY DESTINATION ${QML_MODULE_INSTALL_DIR}/${QML_MODULE_NAME}
+  NAMELINK_SKIP
+)
+
+install (CODE "execute_process(COMMAND qmlplugindump ${QML_MODULE_NAME} ${QML_PLUGIN_API_VERSION} ${CMAKE_INSTALL_PREFIX}/${QML_MODULE_INSTALL_DIR} OUTPUT_FILE ${CMAKE_INSTALL_PREFIX}/${QML_MODULE_INSTALL_DIR}/${QML_MODULE_NAME}/${QML_MODULE_NAME}.qmltypes)")

=== added file 'qml-credentials-service/README'
--- qml-credentials-service/README	1970-01-01 00:00:00 +0000
+++ qml-credentials-service/README	2013-08-27 20:30:52 +0000
@@ -0,0 +1,31 @@
+
+Ubuntu One Credentials QML Plugin
+
+This plugin provides the UbuntuOne QML Component, which exposes the
+CredentialsService plugin, allowing you to display login/register UI
+and check for credentials and sign URLs.
+
+
+HACKING
+
+An example for embedding the UI provided by the plugin is in examples/embedding.qml
+
+The CMake setup only builds the complete QML component at install, and
+the qmltypes file required by qtcreator is also only built at install,
+so to test without installing to a system location, you will need to
+do something like the following:
+
+mkdir -p build 
+cd build
+cmake -D .. -DCMAKE_INSTALL_PREFIX:PATH=/tmp/installtemp .. 
+make all install
+
+Then, when running, point LD_LIBRARY_PATH to the install lib dir so
+that libubuntuonecredentials is discoverable. Here's an example of running qmlscene to try the example code:
+
+LD_LIBRARY_PATH=/tmp/installtemp/lib/ qmlscene -I /tmp/installtemp/lib/qt5/qml/ qml-credentials-service/examples/embeddingMain.qml
+
+
+
+
+

=== added directory 'qml-credentials-service/examples'
=== added file 'qml-credentials-service/examples/embeddingMain.qml'
--- qml-credentials-service/examples/embeddingMain.qml	1970-01-01 00:00:00 +0000
+++ qml-credentials-service/examples/embeddingMain.qml	2013-08-27 20:30:52 +0000
@@ -0,0 +1,129 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import UbuntuOne 1.0
+
+Rectangle {
+    id: exampleMain
+    width: units.gu(100)
+    height: units.gu(120)
+    color: UbuntuColors.coolGrey
+
+    Column {
+        spacing: units.gu(2)
+        anchors.fill: parent
+
+        add: Transition {
+            NumberAnimation { properties: "opacity"; easing.type: Easing.OutQuad; duration: 1000}
+        }
+
+        Row {
+            anchors.left: parent.left
+            anchors.margins: units.gu(2)
+            spacing: units.gu(2)
+
+            Switch {
+                id: showCredsUISwitch
+                checked: true
+            }
+
+            Label {
+                id: label
+                color: "white"
+                text: "Show Creds UI"
+                anchors.verticalCenter: showCredsUISwitch.verticalCenter
+            }
+
+            Label {
+                id: statusLabel
+                color: "white"
+                text: ""
+                anchors.verticalCenter: showCredsUISwitch.verticalCenter
+            }
+        }
+
+        // Here is where we've embedded the UI for UbuntuOne login and register.
+        // Note that you must declare some width and height for the layout to work.
+
+        CredentialsUI {
+            id: credsUI
+
+            width: parent.width * 0.80
+            height: (parent.height - showCredsUISwitch.height) * 0.80
+            anchors.horizontalCenter: parent.horizontalCenter 
+            visible: showCredsUISwitch.checked
+
+            onUserCancelled: {
+                showCredsUISwitch.checked = false;
+                statusLabel.text = "Login/Register cancelled by user";
+                credsUI.resetUI();
+            }
+
+            onSucceeded: {
+                showCredsUISwitch.checked = false;
+                statusLabel.text = "Login/Register succeeded";
+                credsUI.resetUI();
+            }
+        }
+
+        Label {
+            id: infoLabel
+            text: "Press this button to check for credentials in local keyring:"
+            color: "white"
+        }
+
+        Button {
+            id: btnCancel
+            text: "Check existing creds"
+            color: "#1c091a"
+            onClicked: {
+                u1credservice.checkCredentials();
+            }
+        }
+
+        Label {
+            id: revokeLabel
+            text: "Press this button to delete the credentials in local keyring:"
+            color: "white"
+        }
+
+        Button {
+            id: btnRevoke
+            text: "Invalidate existing creds"
+            color: "#1c091a"
+            onClicked: {
+                u1credservice.invalidateCredentials();
+            }
+        }
+
+    } // Column
+
+    /* Below, an example of how to use the service without showing UI,
+       just to test if there is a local credential already, and sign a
+       url with it, if it does exist.*/
+
+    UbuntuOneCredentialsService {
+        id: u1credservice
+        
+        onCredentialsFound: {
+            infoLabel.text = "Credentials Found. signing a url.";
+            signUrl("http://server", "GET");
+        }
+
+        onUrlSigned: {
+            infoLabel.text = "signed url is "+ signedUrl;
+        }
+
+        onUrlSigningError: {
+            infoLabel.text = "signing error:" + errorMessage;
+        }
+
+        onCredentialsNotFound: {
+            infoLabel.text = "No Credentials Found.";
+            signUrl("http://server", "GET"); // xfail
+        }
+        
+        onCredentialsDeleted: {
+            revokeLabel.text = "Deleted Credentials successfully";
+        }
+    }
+} // UbuntuShape

=== added file 'qml-credentials-service/qmldir.template'
--- qml-credentials-service/qmldir.template	1970-01-01 00:00:00 +0000
+++ qml-credentials-service/qmldir.template	2013-08-27 20:30:52 +0000
@@ -0,0 +1,3 @@
+module @QML_MODULE_NAME@
+plugin @QML_PLUGIN_NAME@
+typeinfo @QML_MODULE_NAME@.qmltypes

=== added file 'qml-credentials-service/ubuntuone_credentials_plugin.cpp'
--- qml-credentials-service/ubuntuone_credentials_plugin.cpp	1970-01-01 00:00:00 +0000
+++ qml-credentials-service/ubuntuone_credentials_plugin.cpp	2013-08-27 20:30:52 +0000
@@ -0,0 +1,11 @@
+#include "ubuntuone_credentials_plugin.h"
+#include "ubuntuone_credentials_service.h"
+
+#include <qqml.h>
+
+void UbuntuOneCredentialsPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterType<UbuntuOneCredentialsService>(uri, 1, 0, "UbuntuOneCredentialsService");
+}
+
+

=== added file 'qml-credentials-service/ubuntuone_credentials_plugin.h'
--- qml-credentials-service/ubuntuone_credentials_plugin.h	1970-01-01 00:00:00 +0000
+++ qml-credentials-service/ubuntuone_credentials_plugin.h	2013-08-27 20:30:52 +0000
@@ -0,0 +1,16 @@
+#ifndef UBUNTUONECREDENTIALS_PLUGIN_H
+#define UBUNTUONECREDENTIALS_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class UbuntuOneCredentialsPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+    
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // UBUNTUONECREDENTIALS_PLUGIN_H
+

=== added file 'qml-credentials-service/ubuntuone_credentials_service.cpp'
--- qml-credentials-service/ubuntuone_credentials_service.cpp	1970-01-01 00:00:00 +0000
+++ qml-credentials-service/ubuntuone_credentials_service.cpp	2013-08-27 20:30:52 +0000
@@ -0,0 +1,157 @@
+#include "ubuntuone_credentials_service.h"
+#include <QDebug>
+
+UbuntuOneCredentialsService::UbuntuOneCredentialsService(QQuickItem *parent):
+    QQuickItem(parent)
+{
+    _state = IDLE;
+    QObject::connect(&(this->_service), SIGNAL(credentialsFound(Token)),
+                     this, SLOT(handleCredentialsFound(Token)));
+    QObject::connect(&(this->_service), SIGNAL(credentialsNotFound()),
+                     this, SLOT(handleCredentialsNotFound()));
+    QObject::connect(&(this->_service), SIGNAL(credentialsStored()),
+                     this, SLOT(handleCredentialsStored()));
+    QObject::connect(&(this->_service), SIGNAL(credentialsDeleted()),
+                     this, SLOT(handleCredentialsDeleted()));
+
+    QObject::connect(&(this->_service), SIGNAL(twoFactorAuthRequired()),
+                     this, SLOT(handleTwoFactorAuthRequired()));
+
+    QObject::connect(&(this->_service), SIGNAL(requestFailed(ErrorResponse)),
+                     this, SLOT(handleError(ErrorResponse)));
+}
+
+UbuntuOneCredentialsService::~UbuntuOneCredentialsService()
+{
+}
+
+
+// public API (Q_INVOKABLE)
+
+void UbuntuOneCredentialsService::checkCredentials()
+{
+    Q_ASSERT(_state == IDLE);
+    _state = CHECK;
+    _service.getCredentials();
+}
+
+void UbuntuOneCredentialsService::invalidateCredentials()
+{
+    Q_ASSERT(_state == IDLE);
+    _state = DELETE;
+    _service.invalidateCredentials();
+}
+
+void UbuntuOneCredentialsService::login(QString email, QString password, QString twoFactorCode)
+{
+    Q_ASSERT(_state == IDLE);
+    _state = LOGIN;
+    _service.login(email, password, twoFactorCode);
+}
+
+void UbuntuOneCredentialsService::registerUser(QString email, QString password, QString name)
+{
+    Q_ASSERT(_state == IDLE);
+    _state = REGISTER;
+    _service.registerUser(email, password, name);
+}
+
+// calling signUrl with no credentials stored will emit an error
+void UbuntuOneCredentialsService::signUrl(const QString url, const QString method, bool asQuery)
+{
+    Q_ASSERT(_state == IDLE);
+    _state = SIGN;
+    _sign_url = url;
+    _sign_method = method;
+    _sign_asQuery = asQuery;
+    _service.getCredentials();
+}
+
+// signal handlers
+
+// credentials found is only sent by _service.getCredentials(), not login or register
+void UbuntuOneCredentialsService::handleCredentialsFound(const Token& token)
+{
+    QString signedUrl;
+
+    qDebug() << "in UbuntuOneCredentialsService::handleCredentialsFound";
+
+    // set state before emitting any signals, as signals happen 'after' transition
+    CredentialsServiceState calledState = _state;
+    _state = IDLE;
+
+    switch(calledState){
+    case CHECK:
+        emit credentialsFound();   
+        break;
+    case SIGN:
+        signedUrl = token.signUrl(_sign_url, _sign_method, _sign_asQuery);
+        emit urlSigned(signedUrl);
+        break;
+    default:
+        qDebug() << "UbuntuOneCredentialsService did not expect credentialsFound in state " << calledState;
+    }
+  
+}
+
+void UbuntuOneCredentialsService::handleCredentialsNotFound()
+{
+    qDebug() << "in UbuntuOneCredentialsService::handleCredentialsNotFound";
+    
+    // set state before emitting any signals, as signals happen 'after' transition
+    CredentialsServiceState calledState = _state;
+    _state = IDLE;
+
+    switch(calledState){
+    case CHECK:
+        emit credentialsNotFound();
+        break;
+    case SIGN:
+        emit urlSigningError(QString("Attempt to sign without credentials in keyring"));
+        break;
+    default:
+        qDebug() << "UbuntuOneCredentialsService did not expect credentialsNotFound in state " << calledState;
+    }
+}
+
+// Credentials stored is signaled when the u1 ping is done after login/register
+void UbuntuOneCredentialsService::handleCredentialsStored()
+{
+    qDebug() << "in UbuntuOneCredentialsService::handleCredentialsStored";
+
+    // set state before emitting any signals, as signals happen 'after' transition
+    CredentialsServiceState calledState = _state;
+    _state = IDLE;
+
+    if (calledState == LOGIN || calledState == REGISTER){
+        emit loginOrRegisterSuccess();
+    }else{
+        qDebug() << "UbuntuOneCredentialsService did not expect credentialsStored in state " << calledState;
+    }
+}
+
+void UbuntuOneCredentialsService::handleCredentialsDeleted()
+{
+    qDebug() << "in UbuntuOneCredentialsService::handleCredentialsDeleted";
+
+    // set state before emitting any signals, as signals happen 'after' transition
+    CredentialsServiceState calledState = _state;
+    _state = IDLE;
+
+    if (calledState == DELETE){
+        emit credentialsDeleted();
+    }else{
+        qDebug() << "UbuntuOneCredentialsService did not expect credentialsDeleted in state " << calledState;
+    }
+}
+
+void UbuntuOneCredentialsService::handleTwoFactorAuthRequired(){
+    _state = IDLE;
+    emit twoFactorAuthRequired();
+}
+
+void UbuntuOneCredentialsService::handleError(const ErrorResponse& error)
+{
+    _state = IDLE;
+    emit loginOrRegisterError(error.message());
+}

=== added file 'qml-credentials-service/ubuntuone_credentials_service.h'
--- qml-credentials-service/ubuntuone_credentials_service.h	1970-01-01 00:00:00 +0000
+++ qml-credentials-service/ubuntuone_credentials_service.h	2013-08-27 20:30:52 +0000
@@ -0,0 +1,62 @@
+#ifndef UBUNTUONE_CREDENTIALS_SERVICE_H
+#define UBUNTUONE_CREDENTIALS_SERVICE_H
+
+#include <QQuickItem>
+#include "ssoservice.h"
+
+using namespace UbuntuOne;
+
+enum CredentialsServiceState{
+    IDLE = 0,
+    CHECK,
+    LOGIN,
+    REGISTER,
+    SIGN,
+    DELETE
+};
+
+class UbuntuOneCredentialsService : public QQuickItem
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(UbuntuOneCredentialsService)
+
+public:
+    UbuntuOneCredentialsService(QQuickItem *parent = 0);
+    ~UbuntuOneCredentialsService();
+
+    Q_INVOKABLE void checkCredentials();
+    Q_INVOKABLE void invalidateCredentials();
+    Q_INVOKABLE void login(QString email, QString password, QString twoFactorCode = QString());
+    Q_INVOKABLE void registerUser(QString email, QString password, QString name);
+    Q_INVOKABLE void signUrl(QString url, QString method, bool asQuery = false);
+
+signals:
+    void credentialsFound();
+    void credentialsNotFound();
+    void credentialsDeleted();
+    void loginOrRegisterSuccess();
+    void loginOrRegisterError(QString errorMessage);
+    void twoFactorAuthRequired();
+    void urlSigned(QString signedUrl);
+    void urlSigningError(QString errorMessage);
+
+private slots:
+    void handleCredentialsFound(const Token&);
+    void handleCredentialsNotFound();
+    void handleCredentialsStored();
+    void handleCredentialsDeleted();
+    void handleTwoFactorAuthRequired();
+    void handleError(const ErrorResponse&);
+
+private:
+    SSOService _service;
+    CredentialsServiceState _state;
+    QString _sign_url;
+    QString _sign_method;
+    bool _sign_asQuery;
+};
+
+QML_DECLARE_TYPE(UbuntuOneCredentialsService)
+
+#endif // UBUNTUONE_CREDENTIALS_SERVICE_H
+

=== added directory 'signon-plugin'
=== added file 'signon-plugin/CMakeLists.txt'
--- signon-plugin/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ signon-plugin/CMakeLists.txt	2013-08-27 20:30:52 +0000
@@ -0,0 +1,37 @@
+# Qt5 bits
+SET (CMAKE_INCLUDE_CURRENT_DIR ON)
+SET (CMAKE_AUTOMOC ON)
+find_package(Qt5Core REQUIRED)
+
+# The sources for building the library
+FILE (GLOB SOURCES *.cpp)
+# HEADERS only includes the public headers for installation.
+FILE (GLOB HEADERS *.h)
+
+find_package (PkgConfig REQUIRED)
+pkg_check_modules(SIGNON REQUIRED signon-plugins)
+add_definitions(${SIGNON_CFLAGS} ${SIGNON_CFLAGS_OTHER})
+
+# Workaround for cmake not adding these to automoc properly
+SET (CMAKE_AUTOMOC_MOC_OPTIONS "${SIGNON_CFLAGS} ${CMAKE_AUTOMOC_MOC_OPTIONS}")
+
+# Need the project version here
+add_definitions("-DPROJECT_VERSION=\"${PROJECT_VERSION}\"")
+
+add_library (${SIGNON_PLUGIN_NAME} MODULE ${SOURCES})
+qt5_use_modules (${SIGNON_PLUGIN_NAME} Core Xml Network)
+target_link_libraries (${SIGNON_PLUGIN_NAME}
+  -Wl,-rpath,${CMAKE_BINARY_DIR}/libubuntuoneauth
+  -L${CMAKE_BINARY_DIR}/libubuntuoneauth
+  ${AUTH_LIB_NAME}
+  ${SIGNON_PLUGIN_LDFLAGS}
+)
+
+SET (SIGNON_PLUGIN_INSTALL_DIR lib/signon)
+
+INSTALL (
+  TARGETS ${SIGNON_PLUGIN_NAME}
+  LIBRARY DESTINATION ${SIGNON_PLUGIN_INSTALL_DIR}
+)
+
+#add_subdirectory(tests)

=== added file 'signon-plugin/ubuntuone-plugin.cpp'
--- signon-plugin/ubuntuone-plugin.cpp	1970-01-01 00:00:00 +0000
+++ signon-plugin/ubuntuone-plugin.cpp	2013-08-27 20:30:52 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#include <token.h>
+
+#include "ubuntuone-plugin.h"
+
+
+namespace UbuntuOne {
+
+    SignOnPlugin::SignOnPlugin(QObject *parent)
+        : AuthPluginInterface(parent)
+    {
+    }
+
+    SignOnPlugin::~SignOnPlugin()
+    {
+    }
+
+    QString SignOnPlugin::type() const
+    {
+        return QLatin1String("ubuntuone");
+    }
+
+    QStringList SignOnPlugin::mechanisms() const
+    {
+        QStringList res = QStringList(QLatin1String("ubuntuone"));
+
+        return res;
+    }
+
+    void SignOnPlugin::cancel()
+    {
+    }
+
+    void SignOnPlugin::process(const SignOn::SessionData &inData,
+                               const QString &mechanism)
+    {
+        Q_UNUSED(mechanism);
+        PluginData response;
+        m_data = inData.data<PluginData>();
+
+        if (!inData.Secret().isEmpty()) {
+            response.setConsumer(m_data.Consumer());
+            response.setConsumerSecret(m_data.ConsumerSecret());
+            response.setToken(m_data.Token());
+            response.setTokenSecret(m_data.TokenSecret());
+
+            response.setName(Token::buildTokenName());
+
+            emit result(response);
+            return;
+        }
+
+        SignOn::UiSessionData data;
+        data.setRealm(inData.Realm());
+        data.setShowRealm(!data.Realm().isEmpty());
+        emit userActionRequired(data);
+    }
+
+    void SignOnPlugin::userActionFinished(const SignOn::UiSessionData &data)
+    {
+    }
+
+    SIGNON_DECL_AUTH_PLUGIN(SignOnPlugin)
+} // namespace UbuntuOne

=== added file 'signon-plugin/ubuntuone-plugin.h'
--- signon-plugin/ubuntuone-plugin.h	1970-01-01 00:00:00 +0000
+++ signon-plugin/ubuntuone-plugin.h	2013-08-27 20:30:52 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef _UBUNTUONE_PLUGIN_H_
+#define _UBUNTUONE_PLUGIN_H_
+
+#include <QtCore>
+
+#include <SignOn/AuthPluginInterface>
+#include <SignOn/Error>
+#include <SignOn/SessionData>
+#include <SignOn/UiSessionData>
+
+#include "ubuntuonedata.h"
+
+
+namespace UbuntuOne {
+
+    class SignOnPlugin : public AuthPluginInterface
+    {
+        Q_OBJECT
+        Q_INTERFACES(AuthPluginInterface)
+
+    public:
+        SignOnPlugin(QObject *parent = 0);
+        virtual ~SignOnPlugin();
+
+    public Q_SLOTS:
+        QString type() const;
+        QStringList mechanisms() const;
+        void cancel();
+        void process(const SignOn::SessionData &inData,
+                     const QString &mechanism = 0);
+        void userActionFinished(const SignOn::UiSessionData &data);
+
+    private:
+        PluginData m_data;
+    };
+
+} // namespace UbuntuOne
+
+#endif

=== added file 'signon-plugin/ubuntuonedata.h'
--- signon-plugin/ubuntuonedata.h	1970-01-01 00:00:00 +0000
+++ signon-plugin/ubuntuonedata.h	2013-08-27 20:30:52 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef _UBUNTUONE_DATA_H_
+#define _UBUNTUONE_DATA_H_
+
+#include <sessiondata.h>
+
+namespace UbuntuOne {
+
+    class PluginData : public SignOn::SessionData
+    {
+    public:
+        // The name of the token
+        SIGNON_SESSION_DECLARE_PROPERTY(QString, Name);
+
+        // The consumer key and secret for signing
+        SIGNON_SESSION_DECLARE_PROPERTY(QString, Consumer);
+        SIGNON_SESSION_DECLARE_PROPERTY(QString, ConsumerSecret);
+
+        // The access token and secret for signing
+        SIGNON_SESSION_DECLARE_PROPERTY(QString, Token);
+        SIGNON_SESSION_DECLARE_PROPERTY(QString, TokenSecret);
+    };
+
+} // namespace UbuntuOne
+
+#endif