Merge lp:~mikemc/ubuntuone-credentials/add-qmlplugin into lp:ubuntuone-credentials

[Mike McCracken]

Add QML plugin that wraps login/register and signUrl functionality of libubuntuoneauth, and accompanying QML UI prototype

Add QML plugin that wraps login/register and signUrl functionality of libubuntuoneauth, and accompanying QML UI prototype

The plugin functionality is the main purpose of this branch. The UI is not final, hasn't had design review, and will probably require some refactoring to be useful for its final purpose of being embedded into client apps.

The functionality can be tested by doing the following from a fresh branch:

mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX:PATH=/tmp/installtemp ..
make all install
cd ..
LD_LIBRARY_PATH=/tmp/installtemp/lib/ qmlscene -I /tmp/installtemp/lib/qt5/qml/ qml-credentials-service/CredentialsUI.qml

-------

One question to consider while reviewing:

- Should the name of the QML module be "UbuntuOne" or "something.ubuntu.com" as per http://qt-project.org/doc/qt-5.0/qtqml/qtqml-modules-identifiedmodules.html ? (if we use reverse DNS, what should 'something' be? one? login?

[Diego Sarmentero (diegosarmentero)]

+1
I understand the UI of this is in early stages and waiting for some definitions from Design, but just a reminder when that come, the Login and Register screen should be tested in different form factors and maybe improve a little bit the proportions between the elements. Also if would probably be useful to have the grids inside a Flickable element for situations where the screen is small or the phone/tablet is rotated.

review: Approve

[dobey (dobey)]

+set (QML_MODULE_INSTALL_DIR ${QML_MODULE_NAME} ) # TODO

What exactly is TODO here?

review: Needs Fixing

[dobey (dobey)]

99 +find_package(Qt5Core REQUIRED)
100 +find_package(Qt5Widgets REQUIRED)

Only one of these needs to be here. After one find_package() call for a Qt5 lib, you can then use the qt5_use_modules() method.

[dobey (dobey)]

10 +set (PLUGIN_VERSION 0.1.0)
11 +set (PLUGIN_SOVERSION 0)

Also, I think these are not needed, as the plug-in is a MODULE and not a normal library?

[Mike McCracken (mikemc)]

The last rev removes the unnecessary commands mentioned in the last two comments.

We need to fix the install path / packaging story within the next couple days, so I'd like to suggest that the TODO can stand until the branch that fixes that..

For reference, the TODO reflects the fact that I don't yet know where we should install this thing.

[Mike McCracken (mikemc)]

rev 42 fixes the install step so that the component is installed into CMAKE_INSTALL_PREFIX/LIB_INSTALL_DIR/qt5/qml , and the built plugin module has correct rpath entries to link to libubuntuoneauth when installed.

[Mike McCracken (mikemc)]

Updated the MP change description with notes on how to run with new install setup.

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mikemc/ubuntuone-credentials/add-qmlplugin into lp:ubuntuone-credentials 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 module 'libsecret-1'
-- found libsecret-1, version 0.15
-- checking for module 'oauth'
-- found oauth, version 1.0.1
-- Configuring incomplete, errors occurred!

CMake Warning at /usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreMacros.cmake:237 (find_package):
  Could not find a package configuration file provided by "Qt5Quick" with any
  of the following names:

    Qt5QuickConfig.cmake
    qt5quick-config.cmake

  Add the installation prefix of "Qt5Quick" to CMAKE_PREFIX_PATH or set
  "Qt5Quick_DIR" to a directory containing one of the above files. If
  "Qt5Quick" provides a separate development package or SDK, be sure it has
  been installed.
Call Stack (most recent call first):
  qml-credentials-service/CMakeLists.txt:17 (qt5_use_modules)

CMake Error at /usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreMacros.cmake:239 (message):
  Can not use "Quick" module which has not yet been found.
Call Stack (most recent call first):
  qml-credentials-service/CMakeLists.txt:17 (qt5_use_modules)

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mikemc/ubuntuone-credentials/add-qmlplugin into lp:ubuntuone-credentials 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 module 'libsecret-1'
-- found libsecret-1, version 0.15
-- checking for module 'oauth'
-- found oauth, version 1.0.1
-- Configuring incomplete, errors occurred!

CMake Warning at /usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreMacros.cmake:237 (find_package):
  Could not find a package configuration file provided by "Qt5Quick" with any
  of the following names:

    Qt5QuickConfig.cmake
    qt5quick-config.cmake

  Add the installation prefix of "Qt5Quick" to CMAKE_PREFIX_PATH or set
  "Qt5Quick_DIR" to a directory containing one of the above files. If
  "Qt5Quick" provides a separate development package or SDK, be sure it has
  been installed.
Call Stack (most recent call first):
  qml-credentials-service/CMakeLists.txt:17 (qt5_use_modules)

CMake Error at /usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreMacros.cmake:239 (message):
  Can not use "Quick" module which has not yet been found.
Call Stack (most recent call first):
  qml-credentials-service/CMakeLists.txt:17 (qt5_use_modules)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-05-28 21:31:26 +0000
+++ CMakeLists.txt	2013-07-11 22:40:31 +0000
@@ -15,6 +15,11 @@
 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 (PLUGIN_API_VERSION 1.0)
+set (PLUGIN_NAME UbuntuOneCredentialsPlugin-${PLUGIN_API_VERSION})
+
 # 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 +28,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/${QML_MODULE_NAME} )
+
 include_directories(${CMAKE_SOURCE_DIR}/libubuntuoneauth
   ${CMAKE_SOURCE_DIR}/libubuntuoneauthui)
 
@@ -38,6 +45,7 @@
 add_subdirectory(libubuntuoneauth)
 add_subdirectory(libubuntuoneauthui)
 add_subdirectory(music-login)
+add_subdirectory(qml-credentials-service)
 
 # 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.

=== modified file 'libubuntuoneauth/ssoservice.cpp'
--- libubuntuoneauth/ssoservice.cpp	2013-06-28 23:44:14 +0000
+++ libubuntuoneauth/ssoservice.cpp	2013-07-11 22:40:31 +0000
@@ -88,7 +88,7 @@
 
     void SSOService::handleTokenStored()
     {
-        emit credentialsStored(_pendingPing); 
+        emit credentialsStored(); 
         _pendingPing = Token();
     }
 

=== modified file 'libubuntuoneauth/ssoservice.h'
--- libubuntuoneauth/ssoservice.h	2013-06-20 19:21:02 +0000
+++ libubuntuoneauth/ssoservice.h	2013-07-11 22:40:31 +0000
@@ -49,7 +49,7 @@
 
     signals:
         void credentialsDeleted();
-        void credentialsStored(const Token& token);
+        void credentialsStored();
         void credentialsFound(const Token& token);
         void credentialsNotFound();
         void requestFailed(const ErrorResponse& error);

=== modified file 'music-login/ssowizard.cpp'
--- music-login/ssowizard.cpp	2013-07-02 18:59:41 +0000
+++ music-login/ssowizard.cpp	2013-07-11 22:40:31 +0000
@@ -81,8 +81,8 @@
     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)));
 
@@ -142,7 +142,7 @@
     this->_service.login(email, password);
 }
 
-void SSOWizard::accountAuthenticated(Token token)
+void SSOWizard::accountAuthenticated()
 {
     this->_service.getCredentials();
 }

=== modified file 'music-login/ssowizard.h'
--- music-login/ssowizard.h	2013-07-02 18:59:41 +0000
+++ music-login/ssowizard.h	2013-07-11 22:40:31 +0000
@@ -67,7 +67,7 @@
     void registerAndBuy(QString email, QString password, QString name);
     void showPageLogin();
 
-    void accountAuthenticated(Token);
+    void accountAuthenticated();
     void openUrlAndFinish(Token);
     void serviceFailed(const ErrorResponse&);
 

=== 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-07-11 22:40:31 +0000
@@ -0,0 +1,26 @@
+# Qt5 bits
+set (CMAKE_INCLUDE_CURRENT_DIR ON)
+set (CMAKE_AUTOMOC ON)
+find_package(Qt5Core REQUIRED)
+
+file (GLOB CPP_SOURCES *.cpp)
+file (GLOB QML_SOURCES *.qml)
+
+configure_file (qmldir.template qmldir)
+
+add_library (${PLUGIN_NAME} MODULE ${CPP_SOURCES})
+
+target_link_libraries (${PLUGIN_NAME} 
+  ${AUTH_LIB_NAME}
+)
+
+qt5_use_modules (${PLUGIN_NAME} Core Widgets Quick Qml )
+
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/qmldir DESTINATION ${QML_MODULE_INSTALL_DIR})
+
+install (TARGETS ${PLUGIN_NAME} 
+  LIBRARY DESTINATION ${QML_MODULE_INSTALL_DIR}
+  NAMELINK_SKIP
+)
+
+install (FILES ${QML_SOURCES} DESTINATION ${QML_MODULE_INSTALL_DIR})

=== added file 'qml-credentials-service/CredentialsUI.qml'
--- qml-credentials-service/CredentialsUI.qml	1970-01-01 00:00:00 +0000
+++ qml-credentials-service/CredentialsUI.qml	2013-07-11 22:40:31 +0000
@@ -0,0 +1,192 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import UbuntuOne 1.0
+
+Rectangle {
+    id: main
+    width: 400
+    height: 600
+    gradient: Gradient {
+         GradientStop { position: 0.0; color: "#863636" }
+         GradientStop { position: 0.5; color: "#5b2235" }
+         GradientStop { position: 1.0; color: "#2b0f21" }
+     }
+
+    property bool loginActive: true
+
+     UbuntuOneCredentialsService {
+         id: u1credservice
+ 
+         onCredentialsFound: {
+             console.log("Credentials Found");
+             signUrl("http://server", "GET");
+         }
+
+         onLoginOrRegisterSuccess: {
+             console.log(" login success.");
+             signUrl("http://server", "GET");
+             login_successful();
+         }
+
+
+        onUrlSigned: {
+                console.log("signed url is "+ signedUrl);
+        }
+
+        onUrlSigningError: {
+                console.log("signing error.");
+                console.log(errorMessage);
+         }
+
+         onCredentialsNotFound: {
+             console.log("\nCredentials NOT FOUND");
+                     signUrl("http://server", "GET"); // xfail
+         }
+
+         onLoginOrRegisterError: {
+             console.log("getting credentials failed");
+                 console.log(errorMessage);
+             error();
+         }
+     }
+ 
+    Label {
+        id: title
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.margins: units.gu(1)
+        fontSize: "x-large"
+        color: "#e5d8ce"
+        text: "Ubuntu Sign In"
+    }
+
+    UbuntuShape {
+        anchors.left: parent.left
+        anchors.top: title.bottom
+        anchors.topMargin: units.gu(3)
+        width: parent.width
+        height: parent.height - y - buttons.height - units.gu(2)
+
+        LoginForm {
+            id: loginForm
+            x: 0
+            anchors.top: parent.top
+            width: parent.width
+
+            Behavior on x { PropertyAnimation { duration: 300 } }
+        }
+
+        RegisterForm {
+            id: registerForm
+            x: parent.width
+            anchors.top: parent.top
+            width: parent.width
+
+            Behavior on x { PropertyAnimation { duration: 300 } }
+        }
+
+        SuccessScreen {
+            id: successScreen
+            x: parent.width
+            anchors.top: parent.top
+            width: parent.width
+
+            Behavior on x { PropertyAnimation { duration: 300 } }
+        }
+    }
+
+    Row {
+        id: buttons
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+        anchors.margins: units.gu(1)
+        width: parent.width
+        height: units.gu(5)
+        spacing: units.gu(1)
+
+        Button {
+            id: btnCancel
+            text: "Check existing creds"
+            color: "#1c091a"
+            height: parent.height
+            width: (parent.width / 2) - parent.anchors.margins - parent.spacing
+            onClicked: {
+                    console.debug("checking for creds in keyring:");
+                    u1credservice.checkCredentials();
+                }
+        }
+        Button {
+            id: btnContinue
+            text: "Continue"
+            color: "#cc3300"
+            height: parent.height
+            width: (parent.width / 2) - parent.anchors.margins - parent.spacing
+
+            onClicked: { 
+                    console.log("Continue clicked")
+                    process_form();
+                }
+
+        }
+    }
+
+    Rectangle {
+        id: loading
+        anchors.fill: parent
+        opacity: 0.6
+        visible: false
+
+        ActivityIndicator {
+            id: activity
+            anchors.centerIn: parent
+            running: true
+        }
+    }
+
+    function switch_form(){
+        if(loginActive){
+            registerForm.new_switch.checked = loginForm.new_switch.checked;
+            loginForm.x = -main.width;
+            registerForm.x = 0;
+            loginActive = false;
+        }else{
+            loginForm.new_switch.checked = registerForm.new_switch.checked;
+            loginForm.x = 0;
+            registerForm.x = main.width;
+            loginActive = true;
+        }
+    }
+
+    function process_form(){
+        if(loginActive){
+            loading.visible = true;
+            var email = loginForm.email;
+            var password = loginForm.password;
+            u1credservice.login(email, password);
+        }else{
+            loading.visible = true;
+            var email = registerForm.email;
+            var password = registerForm.password;
+            var display_name = registerForm.display_name;
+            u1credservice.registerUser(email, password, display_name);
+        }
+    }
+
+    function login_successful(){
+        if(loginActive){
+            loginForm.x = -main.width;
+            successScreen.x = 0;
+            btnContinue.visible = false;
+            loading.visible = false;
+        }else{
+            registerForm.x = -main.width;
+            successScreen.x = 0;
+            btnContinue.visible = false;
+            loading.visible = false;
+        }
+    }
+
+    function error(){
+        loading.visible = false;
+    }
+}

=== added file 'qml-credentials-service/LoginForm.qml'
--- qml-credentials-service/LoginForm.qml	1970-01-01 00:00:00 +0000
+++ qml-credentials-service/LoginForm.qml	2013-07-11 22:40:31 +0000
@@ -0,0 +1,90 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    color: "transparent"
+
+    property alias new_switch: newSwitch
+    property alias email: txtEmail.text
+    property alias password: txtPassword.text
+
+    Label {
+        id: subtitle
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.topMargin: units.gu(1)
+        anchors.leftMargin: units.gu(2)
+        fontSize: "large"
+        color: "white"
+        text: "Please type your email:"
+    }
+
+    Grid {
+        anchors.fill: parent
+        anchors.topMargin: units.gu(8)
+        anchors.margins: units.gu(2)
+        columns: 2
+        spacing: units.gu(2)
+
+        Label{
+            text: "Your email"
+            color: "white"
+            fontSize: "large"
+        }
+        TextField {
+            id: txtEmail
+            placeholderText: "Your email"
+        }
+
+        Label{
+            text: " "
+        }
+        Label{
+            text: "Enter the email address you use to log into your Ubuntu One account. If you don't have an account yet, don't worry we'll create one for you."
+            color: "white"
+            fontSize: "small"
+            width: txtEmail.width
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+        }
+
+        Label{
+            text: "New Customer"
+            color: "white"
+            fontSize: "large"
+        }
+        Switch {
+            id: newSwitch
+            checked: false
+
+            onCheckedChanged: {
+                main.switch_form();
+            }
+        }
+
+        Label{
+            text: "Your Password"
+            color: "white"
+            fontSize: "large"
+        }
+        TextField {
+            id: txtPassword
+            placeholderText: "Your password"
+            echoMode: TextInput.Password
+        }
+
+        Label{
+            text: " "
+        }
+        Label{
+            text: '<a href="https://login.ubuntu.com/+forgot_password"><span style="color: #dd4814;">Forgotten your password?</span></a>'
+            textFormat: Text.RichText
+            color: "white"
+            fontSize: "small"
+            width: txtEmail.width
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+            onLinkActivated: { Qt.openUrlExternally(link); }
+        }
+
+    }
+
+}

=== added file 'qml-credentials-service/RegisterForm.qml'
--- qml-credentials-service/RegisterForm.qml	1970-01-01 00:00:00 +0000
+++ qml-credentials-service/RegisterForm.qml	2013-07-11 22:40:31 +0000
@@ -0,0 +1,102 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    color: "transparent"
+
+    property alias new_switch: newSwitch
+    property alias email: txtEmail.text
+    property alias password: txtPassword.text
+    property alias display_name: txtName.text
+
+    Label {
+        id: subtitle
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.topMargin: units.gu(1)
+        anchors.leftMargin: units.gu(2)
+        fontSize: "large"
+        color: "white"
+        text: "Please tell us your name and choose a password"
+        width: parent.width
+        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+    }
+
+    Grid {
+        anchors.fill: parent
+        anchors.topMargin: units.gu(10)
+        anchors.margins: units.gu(1)
+        columns: 2
+        spacing: units.gu(1)
+
+        Label{
+            text: "Your email"
+            color: "white"
+            fontSize: "large"
+        }
+        TextField {
+            id: txtEmail
+            placeholderText: "Your email"
+        }
+
+        Label{
+            text: "Your name"
+            color: "white"
+            fontSize: "large"
+        }
+        TextField {
+            id: txtName
+            placeholderText: "Your name"
+        }
+
+        Label{
+            id: lblChoose
+            text: "Choose a password"
+            color: "white"
+            fontSize: "large"
+        }
+        TextField {
+            id: txtPassword
+            placeholderText: "At list 8 characters"
+            echoMode: TextInput.Password
+        }
+
+        Label{
+            text: "Confirm password"
+            color: "white"
+            fontSize: "large"
+        }
+        TextField {
+            id: txtConfirmPassword
+            placeholderText: "Re-type your password"
+            echoMode: TextInput.Password
+        }
+
+        Label{
+            text: "New Customer"
+            color: "white"
+            fontSize: "large"
+        }
+        Switch {
+            id: newSwitch
+            checked: false
+
+            onCheckedChanged: {
+                main.switch_form();
+            }
+        }
+
+        Label{
+            text: "I agree to the Ubuntu One Terms and Conditions"
+            color: "white"
+            fontSize: "medium"
+            width: lblChoose.width
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+        }
+        CheckBox {
+            checked: true
+        }
+
+    }
+
+}

=== added file 'qml-credentials-service/SuccessScreen.qml'
--- qml-credentials-service/SuccessScreen.qml	1970-01-01 00:00:00 +0000
+++ qml-credentials-service/SuccessScreen.qml	2013-07-11 22:40:31 +0000
@@ -0,0 +1,20 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    color: "transparent"
+
+    Rectangle{
+        anchors.fill: parent
+        anchors.leftMargin: units.gu(4)
+        anchors.topMargin: units.gu(20)
+        Label {
+            font.bold: true
+            fontSize: "x-large"
+            width: parent.width
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+            color: "#dd4814"
+            text: "LOGIN SUCCESSFUL!"
+        }
+    }
+}

=== 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-07-11 22:40:31 +0000
@@ -0,0 +1,3 @@
+module @QML_MODULE_NAME@
+plugin @PLUGIN_NAME@
+typeinfo UbuntuOneCredentials.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-07-11 22:40:31 +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-07-11 22:40:31 +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-07-11 22:40:31 +0000
@@ -0,0 +1,125 @@
+#include "ubuntuone_credentials_service.h"
+#include <QDebug>
+
+UbuntuOneCredentialsService::UbuntuOneCredentialsService(QQuickItem *parent):
+    QQuickItem(parent)
+{
+    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(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::login(QString email, QString password)
+{
+    Q_ASSERT(_state == IDLE);
+    _state = LOGIN;
+    _service.login(email, password);
+}
+
+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::handleError(const ErrorResponse& error)
+{
+    qDebug() << "in handleError\n";
+    _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-07-11 22:40:31 +0000
@@ -0,0 +1,56 @@
+#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
+};
+
+class UbuntuOneCredentialsService : public QQuickItem
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(UbuntuOneCredentialsService)
+
+public:
+    UbuntuOneCredentialsService(QQuickItem *parent = 0);
+    ~UbuntuOneCredentialsService();
+
+    Q_INVOKABLE void checkCredentials();
+    Q_INVOKABLE void login(QString email, QString password);
+    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 loginOrRegisterSuccess();
+    void loginOrRegisterError(QString errorMessage);
+    void urlSigned(QString signedUrl);
+    void urlSigningError(QString errorMessage);
+
+private slots:
+    void handleCredentialsFound(const Token&);
+    void handleCredentialsNotFound();
+    void handleCredentialsStored();
+    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
+