Merge lp:~mardy/ubuntu-system-settings-online-accounts/request-by-service into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Create version 0.2 of the Ubuntu.OnlineAccounts.Client module

Add a new "serviceId" property to the Ubuntu.OnlineAccounts.Client Setup class. Fix shadow builds.

Create version 0.2 of the Ubuntu.OnlineAccounts.Client module

Add a new "serviceId" property to the Ubuntu.OnlineAccounts.Client Setup class, which will be used also by the V2 daemon. Fix shadow builds.

[Alexandre Abreu (abreu-alexandre)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:277
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/214/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/166/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/165/console

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

review: Needs Fixing (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/request-by-service]

278. By Alberto Mardegan on 2015-06-24

fix tests in pbuilder

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:278
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/215/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/178/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/3
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/120/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/178
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21434

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

review: Needs Fixing (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/request-by-service]

279. By Alberto Mardegan on 2015-06-24

Fix missing provider ID

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:279
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/216/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/187
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/187/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21446

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

review: Approve (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/request-by-service]

280. By Alberto Mardegan on 2015-07-31

Add API to forward client pid

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:280
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/224/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/471
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/342
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/471
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/471/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22252

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

review: Approve (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/request-by-service]

281. By Alberto Mardegan on 2015-08-03

Allow unconfined clients to override requestor PID

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/225/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/475
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/475/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22283

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

review: Approve (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/request-by-service]

282. By Alberto Mardegan on 2015-08-04

fix copypaste

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:282
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/226/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/345
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/481
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/481/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22303

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

review: Approve (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/request-by-service]

283. By Alberto Mardegan on 2015-08-06

from trunk

* Resync trunk.
* No-change test rebuild for g++5 ABI transition
[ Andreas Pokorny ]
* rebuild for libmirclient9 part of mir release 0.14.0 - removes
  architecture restrictions imposed by previous mir releases.
[ CI Train Bot ]
* Resync trunk. added: po/cy.po
[ Alberto Mardegan ]
* Inject the APP_ID into the child process's environment. (LP:
  #1468792)
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Alberto Mardegan ]
* Fix build with Qt 5.5 (LP: #1387537, #1421009, #1448878, #1447175)
* Return the error name to the client (LP: #1441873)
[ CI Train Bot ]
* New rebuild forced.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/229/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/500/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/17
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/348/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/500
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/500/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22369

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

review: Needs Fixing (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2015-02-02 15:21:40 +0000
+++ .bzrignore	2015-08-06 12:32:34 +0000
@@ -55,6 +55,7 @@
 /tests/online-accounts-ui/tst_access_model
 /tests/online-accounts-ui/tst_browser_request
 /tests/online-accounts-ui/tst_notification
+/tests/online-accounts-ui/tst_provider_request
 /tests/online-accounts-ui/tst_signonui_request
 /tests/plugin/tst_application_manager
 /tests/system-settings-plugin/tst_plugin

=== added file '.qmake.conf'
--- .qmake.conf	1970-01-01 00:00:00 +0000
+++ .qmake.conf	2015-08-06 12:32:34 +0000
@@ -0,0 +1,2 @@
+TOP_SRC_DIR = $$PWD
+TOP_BUILD_DIR = $$shadowed($$PWD)

=== modified file 'client/OnlineAccountsClient/setup.cpp'
--- client/OnlineAccountsClient/setup.cpp	2015-05-12 12:56:03 +0000
+++ client/OnlineAccountsClient/setup.cpp	2015-08-06 12:32:34 +0000
@@ -30,7 +30,6 @@
 #include <QGuiApplication>
 #include <QWindow>
 #include <climits>
-#include <unistd.h>
 
 using namespace OnlineAccountsClient;
 using namespace com::ubuntu;
@@ -55,8 +54,10 @@
 private:
     OnlineAccountsUi m_onlineAccountsUi;
     QString m_applicationId;
+    QString m_serviceId;
     QString m_serviceTypeId;
     QString m_providerId;
+    pid_t m_clientPid;
     mutable Setup *q_ptr;
 };
 
@@ -67,6 +68,7 @@
     m_onlineAccountsUi(OAU_SERVICE_NAME,
                        OAU_OBJECT_PATH,
                        QDBusConnection::sessionBus()),
+    m_clientPid(0),
     q_ptr(setup)
 {
     m_onlineAccountsUi.setTimeout(INT_MAX);
@@ -76,7 +78,8 @@
 {
     QVariantMap options;
 
-    options.insert(OAU_KEY_PID, uint(getpid()));
+    options.insert(OAU_KEY_PID,
+                   uint(m_clientPid != 0 ? m_clientPid : getpid()));
 
     QWindow *window = clientWindow();
     if (window) {
@@ -95,6 +98,10 @@
         options.insert(OAU_KEY_APPLICATION, m_applicationId);
     }
 
+    if (!m_serviceId.isEmpty()) {
+        options.insert(OAU_KEY_SERVICE_ID, m_serviceId);
+    }
+
     if (!m_serviceTypeId.isEmpty()) {
         options.insert(OAU_KEY_SERVICE_TYPE, m_serviceTypeId);
     }
@@ -214,6 +221,25 @@
 }
 
 /*!
+ * \qmlproperty string Setup::serviceId
+ * If set to a valid service ID, the user will be asked to create an Online
+ * Account which provides this service.
+ */
+void Setup::setServiceId(const QString &serviceId)
+{
+    Q_D(Setup);
+    if (serviceId == d->m_serviceId) return;
+    d->m_serviceId = serviceId;
+    Q_EMIT serviceIdChanged();
+}
+
+QString Setup::serviceId() const
+{
+    Q_D(const Setup);
+    return d->m_serviceId;
+}
+
+/*!
  * \qmlproperty string Setup::serviceTypeId
  * If set to a valid service type, the user will be asked to create an Online
  * Account which supports this service type.
@@ -251,6 +277,15 @@
     return d->m_providerId;
 }
 
+/* At the moment this method is meant to be used by unconfined services, when
+ * forwarding a request from their client.
+ */
+void Setup::setClientPid(pid_t clientPid)
+{
+    Q_D(Setup);
+    d->m_clientPid = clientPid;
+}
+
 /*!
  * \qmlmethod void Setup::exec()
  * Launches the Online Accounts panel.

=== modified file 'client/OnlineAccountsClient/setup.h'
--- client/OnlineAccountsClient/setup.h	2014-09-15 12:16:50 +0000
+++ client/OnlineAccountsClient/setup.h	2015-08-06 12:32:34 +0000
@@ -26,6 +26,8 @@
 #include "global.h"
 #include <QObject>
 #include <QVariantMap>
+#include <sys/types.h>
+#include <unistd.h>
 
 namespace OnlineAccountsClient {
 
@@ -35,6 +37,8 @@
     Q_OBJECT
     Q_PROPERTY(QString applicationId READ applicationId \
                WRITE setApplicationId NOTIFY applicationIdChanged)
+    Q_PROPERTY(QString serviceId READ serviceId \
+               WRITE setServiceId NOTIFY serviceIdChanged REVISION 2)
     Q_PROPERTY(QString serviceTypeId READ serviceTypeId \
                WRITE setServiceTypeId NOTIFY serviceTypeIdChanged)
     Q_PROPERTY(QString providerId READ providerId \
@@ -47,16 +51,23 @@
     void setApplicationId(const QString &applicationId);
     QString applicationId() const;
 
+    void setServiceId(const QString &serviceId);
+    QString serviceId() const;
+
     void setServiceTypeId(const QString &serviceTypeId);
     QString serviceTypeId() const;
 
     void setProviderId(const QString &providerId);
     QString providerId() const;
 
+    // Intentionally not exposed to QML; see the source code for the reason
+    void setClientPid(pid_t clientPid);
+
     Q_INVOKABLE void exec();
 
 Q_SIGNALS:
     void applicationIdChanged();
+    Q_REVISION(2) void serviceIdChanged();
     void serviceTypeIdChanged();
     void providerIdChanged();
     void finished(QVariantMap reply);

=== modified file 'client/module/module.pro'
--- client/module/module.pro	2013-08-07 13:30:41 +0000
+++ client/module/module.pro	2015-08-06 12:32:34 +0000
@@ -5,9 +5,9 @@
 TARGET = OnlineAccountsClient
 
 API_URI = "Ubuntu.OnlineAccounts.Client"
-API_VER = 0.1
+API_VER = 0.2
 
-DESTDIR = $$replace(API_URI, \\., /).$$API_VER
+DESTDIR = $$replace(API_URI, \\., /)
 PLUGIN_INSTALL_BASE = $$[QT_INSTALL_QML]/$${DESTDIR}
 
 CONFIG += \
@@ -34,13 +34,7 @@
 QMAKE_SUBSTITUTES += qmldir.in
 OTHER_FILES += qmldir.in
 
-copy2build.output = $${DESTDIR}/${QMAKE_FILE_IN}
-copy2build.input = QMLDIR_FILES
-copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-copy2build.name = COPY ${QMAKE_FILE_IN}
-copy2build.variable_out = PRE_TARGETDEPS
-copy2build.CONFIG += no_link
-QMAKE_EXTRA_COMPILERS += copy2build
+QMAKE_POST_LINK += $$QMAKE_COPY $${QMLDIR_FILES} $$DESTDIR
 
 target.path = $${PLUGIN_INSTALL_BASE}
 INSTALLS += target

=== modified file 'client/module/plugin.cpp'
--- client/module/plugin.cpp	2013-07-31 11:49:18 +0000
+++ client/module/plugin.cpp	2015-08-06 12:32:34 +0000
@@ -31,4 +31,5 @@
 {
     qDebug() << Q_FUNC_INFO << uri;
     qmlRegisterType<Setup>(uri, 0, 1, "Setup");
+    qmlRegisterType<Setup,2>(uri, 0, 2, "Setup");
 }

=== modified file 'common-project-config.pri'
--- common-project-config.pri	2014-08-06 13:49:45 +0000
+++ common-project-config.pri	2015-08-06 12:32:34 +0000
@@ -7,8 +7,10 @@
 # Disable RTTI
 QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
 
-TOP_SRC_DIR = $$PWD
-TOP_BUILD_DIR = $${TOP_SRC_DIR}/$(BUILD_DIR)
+!defined(TOP_SRC_DIR, var) {
+    TOP_SRC_DIR = $$PWD
+    TOP_BUILD_DIR = $${TOP_SRC_DIR}/$(BUILD_DIR)
+}
 
 include(coverage.pri)
 

=== modified file 'common-vars.pri'
--- common-vars.pri	2015-01-13 13:59:48 +0000
+++ common-vars.pri	2015-08-06 12:32:34 +0000
@@ -13,6 +13,6 @@
 # Project version
 # remember to update debian/* files if you changes this
 #-----------------------------------------------------------------------------
-PROJECT_VERSION = 0.6
+PROJECT_VERSION = 0.7
 
 # End of File

=== modified file 'coverage.pri'
--- coverage.pri	2014-08-29 13:18:54 +0000
+++ coverage.pri	2015-08-06 12:32:34 +0000
@@ -2,7 +2,6 @@
 CONFIG(coverage) {
     OBJECTS_DIR =
     MOC_DIR =
-    TOP_SRC_DIR = $$PWD
 
     LIBS += -lgcov
     QMAKE_CXXFLAGS += --coverage

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-04 09:05:45 +0000
+++ debian/changelog	2015-08-06 12:32:34 +0000
@@ -1,3 +1,12 @@
+ubuntu-system-settings-online-accounts (0.7-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New release
+    - Add new "serviceId" property to the Ubuntu.OnlineAccounts.Client Setup
+      class.
+    - Support shadow builds
+
+ -- Alberto Mardegan <[e-mail]>  Tue, 23 Jun 2015 17:38:21 +0300
+
 ubuntu-system-settings-online-accounts (0.6+15.10.20150804-0ubuntu1) wily; urgency=medium
 
   * Resync trunk.

=== modified file 'online-accounts-service/request.cpp'
--- online-accounts-service/request.cpp	2014-12-08 15:18:18 +0000
+++ online-accounts-service/request.cpp	2015-08-06 12:32:34 +0000
@@ -23,6 +23,8 @@
 #include "request.h"
 #include "utils.h"
 
+#include <Accounts/Manager>
+#include <Accounts/Service>
 #include <SignOn/uisessiondata_priv.h>
 
 using namespace OnlineAccountsUi;
@@ -127,6 +129,13 @@
     if (interface() == OAU_INTERFACE) {
         return d->m_parameters.value(OAU_KEY_PID, 0).toUInt();
     } else if (interface() == SIGNONUI_INTERFACE) {
+        if (d->m_clientApparmorProfile == "unconfined") {
+            QVariantMap clientData =
+                d->m_parameters.value(SSOUI_KEY_CLIENT_DATA).toMap();
+            if (clientData.contains("requestorPid")) {
+                return clientData.value("requestorPid").toUInt();
+            }
+        }
         return d->m_parameters.value(SSOUI_KEY_PID, 0).toUInt();
     }
 
@@ -166,7 +175,18 @@
 {
     Q_D(const Request);
     if (interface() == OAU_INTERFACE) {
-        return d->m_parameters.value(OAU_KEY_PROVIDER, 0).toString();
+        QString providerId =
+            d->m_parameters.value(OAU_KEY_PROVIDER).toString();
+        if (providerId.isEmpty() &&
+            d->m_parameters.contains(OAU_KEY_SERVICE_ID)) {
+            Accounts::Manager manager;
+            QString serviceId = d->m_parameters[OAU_KEY_SERVICE_ID].toString();
+            Accounts::Service service = manager.service(serviceId);
+            if (service.isValid()) {
+                providerId = service.provider();
+            }
+        }
+        return providerId;
     } else {
         return QString();
     }

=== modified file 'online-accounts-ui/globals.h'
--- online-accounts-ui/globals.h	2015-01-05 14:26:10 +0000
+++ online-accounts-ui/globals.h	2015-08-06 12:32:34 +0000
@@ -27,6 +27,7 @@
 
 #define OAU_KEY_APPLICATION         QStringLiteral("application")
 #define OAU_KEY_PROVIDER            QStringLiteral("provider")
+#define OAU_KEY_SERVICE_ID          QStringLiteral("serviceId")
 #define OAU_KEY_SERVICE_TYPE        QStringLiteral("serviceType")
 #define OAU_KEY_WINDOW_ID           QStringLiteral("windowId")
 #define OAU_KEY_PID                 QStringLiteral("pid")
@@ -40,6 +41,8 @@
     QStringLiteral(OAU_ERROR_PREFIX "InvalidParameters")
 #define OAU_ERROR_INVALID_APPLICATION \
     QStringLiteral(OAU_ERROR_PREFIX "InvalidApplication")
+#define OAU_ERROR_INVALID_SERVICE \
+    QStringLiteral(OAU_ERROR_PREFIX "InvalidService")
 #define OAU_ERROR_PROMPT_SESSION \
     QStringLiteral(OAU_ERROR_PREFIX "NoPromptSession")
 

=== modified file 'online-accounts-ui/provider-request.cpp'
--- online-accounts-ui/provider-request.cpp	2014-11-26 14:16:20 +0000
+++ online-accounts-ui/provider-request.cpp	2015-08-06 12:32:34 +0000
@@ -23,6 +23,7 @@
 #include "globals.h"
 #include "provider-request.h"
 
+#include <OnlineAccountsPlugin/account-manager.h>
 #include <OnlineAccountsPlugin/application-manager.h>
 #include <QQmlContext>
 #include <QQmlEngine>
@@ -97,7 +98,20 @@
         return;
     }
 
-    QString providerId = q->parameters().value(OAU_KEY_PROVIDER).toString();
+    QString providerId;
+    QString serviceId = q->parameters().value(OAU_KEY_SERVICE_ID).toString();
+    if (!serviceId.isEmpty()) {
+        Accounts::Service service =
+            AccountManager::instance()->service(serviceId);
+        if (Q_UNLIKELY(!service.isValid())) {
+            q->fail(OAU_ERROR_INVALID_SERVICE,
+                    QString("Service %1 not found").arg(serviceId));
+            return;
+        }
+        providerId = service.provider();
+    } else {
+        providerId = q->parameters().value(OAU_KEY_PROVIDER).toString();
+    }
     QVariantMap providerInfo = appManager->providerInfo(providerId);
 
     m_view = new QQuickView;

=== modified file 'online-accounts-ui/request.cpp'
--- online-accounts-ui/request.cpp	2014-11-21 13:50:15 +0000
+++ online-accounts-ui/request.cpp	2015-08-06 12:32:34 +0000
@@ -135,13 +135,8 @@
      * the @parameters argument to figure out which subclass is the most apt to
      * handle the request. */
     if (interface == OAU_INTERFACE) {
-        if (parameters.contains(OAU_KEY_PROVIDER)) {
-            return new ProviderRequest(interface, id, clientProfile,
-                                       parameters, parent);
-        } else {
-            return new PanelRequest(interface, id, clientProfile,
-                                    parameters, parent);
-        }
+        return new ProviderRequest(interface, id, clientProfile,
+                                   parameters, parent);
     } else {
         Q_ASSERT(interface == SIGNONUI_INTERFACE);
         return SignOnUi::Request::newRequest(id, clientProfile,

=== modified file 'tests/client/tst_qml_client.cpp'
--- tests/client/tst_qml_client.cpp	2014-09-15 12:16:50 +0000
+++ tests/client/tst_qml_client.cpp	2015-08-06 12:32:34 +0000
@@ -63,6 +63,8 @@
     void initTestCase();
     void testLoadPlugin();
     void testProperties();
+    void testVersions_data();
+    void testVersions();
     void testExec();
     void testExecWithServiceType();
 
@@ -105,7 +107,7 @@
 {
     QQmlEngine engine;
     QQmlComponent component(&engine);
-    component.setData("import Ubuntu.OnlineAccounts.Client 0.1\n"
+    component.setData("import Ubuntu.OnlineAccounts.Client 0.2\n"
                       "Setup { providerId: \"hello\" }",
                       QUrl());
     QObject *object = component.create();
@@ -120,6 +122,60 @@
     object->setProperty("serviceTypeId", QString("hi"));
     QCOMPARE(object->property("serviceTypeId").toString(), QString("hi"));
 
+    object->setProperty("serviceId", QString("bonjour"));
+    QCOMPARE(object->property("serviceId").toString(), QString("bonjour"));
+
+    delete object;
+}
+
+void SetupTest::testVersions_data()
+{
+    QTest::addColumn<QString>("qmlCode");
+    QTest::addColumn<bool>("mustBuild");
+
+    QTest::newRow("0.1, regular") <<
+        "import Ubuntu.OnlineAccounts.Client 0.1\n"
+        "Setup {\n"
+        "  providerId: \"hello\"\n"
+        "  serviceTypeId: \"something\"\n"
+        "}" <<
+        true;
+
+    QTest::newRow("0.1, newer prop") <<
+        "import Ubuntu.OnlineAccounts.Client 0.1\n"
+        "Setup {\n"
+        "  providerId: \"hello\"\n"
+        "  serviceTypeId: \"something\"\n"
+        "  serviceId: \"wishful\"\n"
+        "}" <<
+        false;
+
+    QTest::newRow("0.2, newer prop") <<
+        "import Ubuntu.OnlineAccounts.Client 0.2\n"
+        "Setup {\n"
+        "  providerId: \"hello\"\n"
+        "  serviceTypeId: \"something\"\n"
+        "  serviceId: \"yes we can\"\n"
+        "}" <<
+        true;
+}
+
+void SetupTest::testVersions()
+{
+    QFETCH(QString, qmlCode);
+    QFETCH(bool, mustBuild);
+
+    if (!mustBuild) {
+        QTest::ignoreMessage(QtWarningMsg,
+                             "QQmlComponent: Component is not ready");
+    }
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData(qmlCode.toUtf8(), QUrl());
+    QObject *object = component.create();
+    QCOMPARE(object != 0, mustBuild);
+
     delete object;
 }
 
@@ -139,6 +195,7 @@
     QVERIFY(finished.wait());
     QCOMPARE(options().contains(OAU_KEY_PROVIDER), false);
     QCOMPARE(options().contains(OAU_KEY_SERVICE_TYPE), false);
+    QCOMPARE(options().contains(OAU_KEY_SERVICE_ID), false);
 }
 
 void SetupTest::testExecWithServiceType()

=== modified file 'tests/online-accounts-service/tst_service.pro'
--- tests/online-accounts-service/tst_service.pro	2014-12-08 16:22:39 +0000
+++ tests/online-accounts-service/tst_service.pro	2015-08-06 12:32:34 +0000
@@ -12,6 +12,7 @@
     testlib
 
 PKGCONFIG += \
+    accounts-qt5 \
     signon-plugins-common
 
 DEFINES += \
@@ -37,6 +38,7 @@
     $${ONLINE_ACCOUNTS_SERVICE_DIR}/utils.h \
 
 INCLUDEPATH += \
+    $${TOP_BUILD_DIR}/online-accounts-service \
     $${ONLINE_ACCOUNTS_SERVICE_DIR} \
     $${COMMON_SRC_DIR}
 

=== modified file 'tests/online-accounts-service/tst_signonui_service.pro'
--- tests/online-accounts-service/tst_signonui_service.pro	2014-12-08 16:22:39 +0000
+++ tests/online-accounts-service/tst_signonui_service.pro	2015-08-06 12:32:34 +0000
@@ -13,6 +13,7 @@
     testlib
 
 PKGCONFIG += \
+    accounts-qt5 \
     signon-plugins-common
 
 DEFINES += \

=== added file 'tests/online-accounts-ui/ProviderRequest.qml'
--- tests/online-accounts-ui/ProviderRequest.qml	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-ui/ProviderRequest.qml	2015-08-06 12:32:34 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * 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
+
+Item {
+    id: root
+
+    property bool wasDenied: false
+
+    signal denied
+    signal allowed(int accountId)
+}

=== added file 'tests/online-accounts-ui/mock/application-manager-mock.cpp'
--- tests/online-accounts-ui/mock/application-manager-mock.cpp	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-ui/mock/application-manager-mock.cpp	2015-08-06 12:32:34 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This file is part of online-accounts-ui
+ *
+ * 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/>.
+ */
+
+#include "application-manager-mock.h"
+
+#include <QDebug>
+
+using namespace OnlineAccountsUi;
+
+ApplicationManager *ApplicationManager::m_instance = 0;
+
+ApplicationManagerPrivate::ApplicationManagerPrivate(ApplicationManager *q):
+    QObject(q),
+    q_ptr(q)
+{
+}
+
+ApplicationManagerPrivate::~ApplicationManagerPrivate()
+{
+}
+
+ApplicationManager::ApplicationManager(QObject *parent):
+    QObject(parent),
+    d_ptr(new ApplicationManagerPrivate(this))
+{
+    m_instance = this;
+}
+
+ApplicationManager::~ApplicationManager()
+{
+    m_instance = 0;
+}
+
+ApplicationManager *ApplicationManager::instance()
+{
+    if (!m_instance) {
+        new ApplicationManager;
+    }
+    return m_instance;
+}
+
+QVariantMap ApplicationManager::applicationInfo(const QString &applicationId,
+                                             const QString &profile)
+{
+    Q_D(ApplicationManager);
+    Q_EMIT d->applicationInfoCalled(applicationId, profile);
+    return d->m_applicationInfo[applicationId];
+}
+
+QVariantMap ApplicationManager::providerInfo(const QString &providerId) const
+{
+    Q_D(const ApplicationManager);
+    return d->m_providerInfo[providerId];
+}

=== added file 'tests/online-accounts-ui/mock/application-manager-mock.h'
--- tests/online-accounts-ui/mock/application-manager-mock.h	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-ui/mock/application-manager-mock.h	2015-08-06 12:32:34 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This file is part of online-accounts-ui
+ *
+ * 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/>.
+ */
+
+#ifndef MOCK_APPLICATION_MANAGER_H
+#define MOCK_APPLICATION_MANAGER_H
+
+#include <OnlineAccountsPlugin/application-manager.h>
+
+#include <QHash>
+#include <QObject>
+
+namespace OnlineAccountsUi {
+
+class ApplicationManagerPrivate: public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PUBLIC(ApplicationManager)
+
+public:
+    ApplicationManagerPrivate(ApplicationManager *q);
+    ~ApplicationManagerPrivate();
+    static ApplicationManagerPrivate *mocked(ApplicationManager *r) { return r->d_ptr; }
+
+    void setApplicationInfo(const QString &applicationId,
+                            const QVariantMap &info) {
+        m_applicationInfo[applicationId] = info;
+    }
+
+    void setProviderInfo(const QString &providerId, const QVariantMap &info) {
+        m_providerInfo[providerId] = info;
+    }
+
+Q_SIGNALS:
+    void applicationInfoCalled(QString applicationId, QString profile);
+
+public:
+    QHash<QString,QVariantMap> m_applicationInfo;
+    QHash<QString,QVariantMap> m_providerInfo;
+    mutable ApplicationManager *q_ptr;
+};
+
+} // namespace
+
+#endif // MOCK_APPLICATION_MANAGER_H

=== modified file 'tests/online-accounts-ui/mock/request-mock.cpp'
--- tests/online-accounts-ui/mock/request-mock.cpp	2014-08-08 11:37:56 +0000
+++ tests/online-accounts-ui/mock/request-mock.cpp	2015-08-06 12:32:34 +0000
@@ -35,6 +35,7 @@
     m_parameters(parameters),
     m_clientApparmorProfile(clientProfile),
     m_window(0),
+    m_delay(0),
     m_inProgress(false)
 {
     Q_UNUSED(interface);
@@ -95,6 +96,18 @@
     return d->m_window;
 }
 
+void Request::setDelay(int delay)
+{
+    Q_D(Request);
+    d->m_delay = delay;
+}
+
+int Request::delay() const
+{
+    Q_D(const Request);
+    return d->m_delay;
+}
+
 void Request::start()
 {
     Q_D(Request);

=== modified file 'tests/online-accounts-ui/mock/request-mock.h'
--- tests/online-accounts-ui/mock/request-mock.h	2014-08-08 11:37:56 +0000
+++ tests/online-accounts-ui/mock/request-mock.h	2015-08-06 12:32:34 +0000
@@ -53,6 +53,7 @@
     QVariantMap m_parameters;
     QString m_clientApparmorProfile;
     QWindow *m_window;
+    int m_delay;
     bool m_inProgress;
 };
 

=== modified file 'tests/online-accounts-ui/online-accounts-ui.pro'
--- tests/online-accounts-ui/online-accounts-ui.pro	2014-10-03 14:56:11 +0000
+++ tests/online-accounts-ui/online-accounts-ui.pro	2015-08-06 12:32:34 +0000
@@ -4,4 +4,5 @@
     tst_access_model.pro \
     tst_browser_request.pro \
     tst_notification.pro \
+    tst_provider_request.pro \
     tst_signonui_request.pro

=== modified file 'tests/online-accounts-ui/qml/qml.pro'
--- tests/online-accounts-ui/qml/qml.pro	2014-10-24 18:21:11 +0000
+++ tests/online-accounts-ui/qml/qml.pro	2015-08-06 12:32:34 +0000
@@ -7,6 +7,7 @@
     warn_on
 
 DEFINES += \
+    SOURCE_MODULE_PATH=\\\"$${PWD}\\\" \
     TEST_DATA_DIR=\\\"$${PWD}/../data\\\"
 
 SOURCES += \

=== modified file 'tests/online-accounts-ui/qml/tst_online_accounts_qml.cpp'
--- tests/online-accounts-ui/qml/tst_online_accounts_qml.cpp	2014-10-24 18:21:11 +0000
+++ tests/online-accounts-ui/qml/tst_online_accounts_qml.cpp	2015-08-06 12:32:34 +0000
@@ -16,5 +16,7 @@
     qputenv("AG_PROVIDERS", TEST_DATA_DIR);
     qputenv("XDG_DATA_HOME", TEST_DATA_DIR);
 
+    qputenv("QML2_IMPORT_PATH", SOURCE_MODULE_PATH);
+
     return quick_test_main(argc, argv, "online_accounts_qml", QUICK_TEST_SOURCE_DIR);
 }

=== added file 'tests/online-accounts-ui/tst_provider_request.cpp'
--- tests/online-accounts-ui/tst_provider_request.cpp	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-ui/tst_provider_request.cpp	2015-08-06 12:32:34 +0000
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This file is part of online-accounts-ui
+ *
+ * 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/>.
+ */
+
+#include "debug.h"
+#include "globals.h"
+#include "mock/application-manager-mock.h"
+#include "mock/request-mock.h"
+#include "mock/ui-server-mock.h"
+#include "provider-request.h"
+
+#include <QDebug>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QQuickView>
+#include <QSignalSpy>
+#include <QTest>
+
+using namespace OnlineAccountsUi;
+
+namespace QTest {
+template<>
+char *toString(const QVariantMap &p)
+{
+    QJsonDocument doc(QJsonObject::fromVariantMap(p));
+    QByteArray ba = doc.toJson(QJsonDocument::Compact);
+    return qstrdup(ba.data());
+}
+} // QTest namespace
+
+class TestRequest: public ProviderRequest
+{
+    Q_OBJECT
+
+public:
+    TestRequest(const QVariantMap &parameters, const QString &profile,
+                QObject *parent = 0):
+        ProviderRequest("interface", 0, profile, parameters, parent)
+    {
+    }
+};
+
+class ProviderRequestTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    ProviderRequestTest();
+
+private Q_SLOTS:
+    void initTestCase();
+    void testParameters_data();
+    void testParameters();
+
+private:
+    UiServer m_uiServer;
+};
+
+ProviderRequestTest::ProviderRequestTest():
+    QObject(),
+    m_uiServer("fake")
+{
+}
+
+void ProviderRequestTest::initTestCase()
+{
+    qputenv("ACCOUNTS", "/tmp/");
+    qputenv("AG_APPLICATIONS", TEST_DATA_DIR);
+    qputenv("AG_SERVICES", TEST_DATA_DIR);
+    qputenv("AG_SERVICE_TYPES", TEST_DATA_DIR);
+    qputenv("AG_PROVIDERS", TEST_DATA_DIR);
+    qputenv("XDG_DATA_HOME", TEST_DATA_DIR);
+}
+
+void ProviderRequestTest::testParameters_data()
+{
+    QTest::addColumn<QVariantMap>("parameters");
+    QTest::addColumn<QString>("profile");
+    QTest::addColumn<QString>("providerId");
+    QTest::addColumn<QVariantMap>("providerInfo");
+    QTest::addColumn<QVariantMap>("applicationInfo");
+    QTest::addColumn<QString>("errorName");
+
+    QTest::newRow("empty") <<
+        QVariantMap() <<
+        QString() <<
+        QString() <<
+        QVariantMap() <<
+        QVariantMap() <<
+        OAU_ERROR_INVALID_APPLICATION;
+
+    QVariantMap parameters;
+    QVariantMap providerInfo;
+    QVariantMap applicationInfo;
+
+    parameters.insert(OAU_KEY_APPLICATION, "Gallery");
+    parameters.insert(OAU_KEY_PROVIDER, "my provider");
+    providerInfo.insert("some", "value");
+    applicationInfo.insert("one", "two");
+    QTest::newRow("confined app") <<
+        parameters <<
+        "my-app" <<
+        "my provider" <<
+        providerInfo <<
+        applicationInfo <<
+        "";
+    parameters.clear();
+    providerInfo.clear();
+    applicationInfo.clear();
+
+    parameters.insert(OAU_KEY_APPLICATION, "Gallery");
+    parameters.insert(OAU_KEY_SERVICE_ID, "coolmail");
+    providerInfo.insert("name", "cool");
+    applicationInfo.insert("one", "two");
+    QTest::newRow("by service ID") <<
+        parameters <<
+        "my-app" <<
+        "cool" <<
+        providerInfo <<
+        applicationInfo <<
+        "";
+    parameters.clear();
+    providerInfo.clear();
+    applicationInfo.clear();
+}
+
+void ProviderRequestTest::testParameters()
+{
+    QFETCH(QVariantMap, parameters);
+    QFETCH(QString, profile);
+    QFETCH(QString, providerId);
+    QFETCH(QVariantMap, providerInfo);
+    QFETCH(QVariantMap, applicationInfo);
+    QFETCH(QString, errorName);
+
+    TestRequest request(parameters, profile);
+    RequestPrivate *mockedRequest = RequestPrivate::mocked(&request);
+    QSignalSpy setWindowCalled(mockedRequest,
+                               SIGNAL(setWindowCalled(QWindow*)));
+    QSignalSpy failCalled(mockedRequest,
+                          SIGNAL(failCalled(const QString&, const QString&)));
+
+    ApplicationManager *appManager = ApplicationManager::instance();
+    ApplicationManagerPrivate *mockedAppManager =
+        ApplicationManagerPrivate::mocked(appManager);
+    mockedAppManager->setApplicationInfo(parameters[OAU_KEY_APPLICATION].toString(),
+                                         applicationInfo);
+    mockedAppManager->setProviderInfo(providerId, providerInfo);
+    QSignalSpy applicationInfoCalled(mockedAppManager,
+                                     SIGNAL(applicationInfoCalled(QString,QString)));
+
+    request.start();
+
+    if (errorName.isEmpty()) {
+        QTRY_COMPARE(setWindowCalled.count(), 1);
+        QQuickView *view = static_cast<QQuickView*>(setWindowCalled.at(0).at(0).value<QWindow*>());
+        QQmlContext *context = view->engine()->rootContext();
+
+        QCOMPARE(applicationInfoCalled.count(), 1);
+        QCOMPARE(applicationInfoCalled.at(0).at(1).toString(), profile);
+
+        QCOMPARE(context->contextProperty("provider").toMap(), providerInfo);
+        QCOMPARE(context->contextProperty("application").toMap(), applicationInfo);
+    } else {
+        QTRY_COMPARE(failCalled.count(), 1);
+        QCOMPARE(failCalled.at(0).at(0).toString(), errorName);
+    }
+}
+
+QTEST_MAIN(ProviderRequestTest);
+
+#include "tst_provider_request.moc"

=== added file 'tests/online-accounts-ui/tst_provider_request.pro'
--- tests/online-accounts-ui/tst_provider_request.pro	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-ui/tst_provider_request.pro	2015-08-06 12:32:34 +0000
@@ -0,0 +1,52 @@
+include(online-accounts-ui.pri)
+
+TARGET = tst_provider_request
+
+CONFIG += \
+    link_pkgconfig
+
+QT += \
+    gui \
+    quick
+
+PKGCONFIG += \
+    accounts-qt5
+
+INCLUDEPATH += \
+    $${TOP_SRC_DIR}/plugins
+QMAKE_LIBDIR = $${TOP_BUILD_DIR}/plugins/OnlineAccountsPlugin
+LIBS += -lonline-accounts-plugin
+
+DEFINES += \
+    NO_REQUEST_FACTORY \
+    OAU_PLUGIN_DIR=\\\"/tmp\\\" \
+    PLUGIN_PRIVATE_MODULE_DIR=\\\"/tmp\\\" \
+    TEST_DATA_DIR=\\\"$${PWD}/data\\\"
+
+
+SOURCES += \
+    $${ONLINE_ACCOUNTS_UI_DIR}/access-model.cpp \
+    $${ONLINE_ACCOUNTS_UI_DIR}/debug.cpp \
+    $${ONLINE_ACCOUNTS_UI_DIR}/i18n.cpp \
+    $${ONLINE_ACCOUNTS_UI_DIR}/provider-request.cpp \
+    mock/application-manager-mock.cpp \
+    mock/request-mock.cpp \
+    mock/ui-server-mock.cpp \
+    tst_provider_request.cpp
+
+HEADERS += \
+    $${ONLINE_ACCOUNTS_UI_DIR}/access-model.h \
+    $${ONLINE_ACCOUNTS_UI_DIR}/i18n.h \
+    $${ONLINE_ACCOUNTS_UI_DIR}/provider-request.h \
+    $${ONLINE_ACCOUNTS_UI_DIR}/request.h \
+    $${ONLINE_ACCOUNTS_UI_DIR}/ui-server.h \
+    mock/application-manager-mock.h \
+    mock/request-mock.h \
+    mock/ui-server-mock.h
+
+RESOURCES += \
+    tst_provider_request.qrc
+
+check.commands += "xvfb-run -s '-screen 0 640x480x24' -a dbus-test-runner -t ./$${TARGET}"
+check.depends = $${TARGET}
+QMAKE_EXTRA_TARGETS += check

=== added file 'tests/online-accounts-ui/tst_provider_request.qrc'
--- tests/online-accounts-ui/tst_provider_request.qrc	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-ui/tst_provider_request.qrc	2015-08-06 12:32:34 +0000
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="qml">
+    <file>ProviderRequest.qml</file>
+</qresource>
+</RCC>