Merge lp:~online-accounts/ubuntu-system-settings-online-accounts/master into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

New upstream release

- Make sure app items are not overlaid on top of each other (LP: #1384314)
- Remove snap decision fallback
- Make account plugins confinable (LP: #1219644)

New upstream release

- Make sure app items are not overlaid on top of each other (LP: #1384314)
- Remove snap decision fallback
- Make account plugins confinable

Testing instructions for plugin confinement:
1) Install http://mardy.it/archivos/com.ubuntu.reminders_0.5.latest_armhf.click (it's reminders app with its manifest modified to include an empty apparmor policy file for the evernote account plugin)
2) copy http://paste.ubuntu.com/9729995/ as /var/lib/apparmor/profiles/click_com.ubuntu.reminders_reminders_0.5.latest
3) run
   cd /var/lib/apparmor/profiles/
   sudo apparmor_parser -r \
     click_com.ubuntu.reminders_evernote-account-plugin_0.5.latest
4) Then try creating an Evernote account; it shoudl succeed.

Some apparmor denials (probably from oxide/chromium) appear in the syslog, they'll need to be investigated.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:222
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/191/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/682
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/782
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/782/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17031

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/192/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/799
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/797
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/797/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17068

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:225
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/842
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/735
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/840
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/840/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17163

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

review: Approve (continuous-integration)

[lp:~online-accounts/ubuntu-system-settings-online-accounts/master]

220. By Alberto Mardegan on 2015-01-16

New upstream release

- Make sure app items are not overlaid on top of each other (LP: #1384314)
- Remove snap decision fallback
- Make account plugins confinable (LP: #1219644) Fixes: #1219644, #1376445, #1380914, #1384314
Approved by: PS Jenkins bot

=== modified file '.bzrignore'
--- .bzrignore	2014-10-08 07:12:09 +0000
+++ .bzrignore	2015-01-16 17:10:14 +0000
@@ -47,6 +47,7 @@
 /tests/client/tst_client
 /tests/client/tst_qml_client
 /tests/online-accounts-service/tst_inactivity_timer
+/tests/online-accounts-service/tst_libaccounts_service
 /tests/online-accounts-service/tst_service
 /tests/online-accounts-service/tst_signonui_service
 /tests/online-accounts-service/tst_ui_proxy

=== modified file 'common-vars.pri'
--- common-vars.pri	2014-03-19 12:14:14 +0000
+++ common-vars.pri	2015-01-16 17:10:14 +0000
@@ -13,6 +13,6 @@
 # Project version
 # remember to update debian/* files if you changes this
 #-----------------------------------------------------------------------------
-PROJECT_VERSION = 0.3
+PROJECT_VERSION = 0.6
 
 # End of File

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-09 13:45:40 +0000
+++ debian/changelog	2015-01-16 17:10:14 +0000
@@ -1,3 +1,12 @@
+ubuntu-system-settings-online-accounts (0.6) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Make sure app items are not overlaid on top of each other (LP: #1384314)
+    - Remove snap decision fallback
+    - Make account plugins confinable (LP: #1219644)
+
+ -- Alberto Mardegan <[e-mail]>  Tue, 13 Jan 2015 14:56:51 +0100
+
 ubuntu-system-settings-online-accounts (0.5+15.04.20141209-0ubuntu1) vivid; urgency=low
 
   [ Ubuntu daily release ]

=== added file 'online-accounts-service/libaccounts-service.cpp'
--- online-accounts-service/libaccounts-service.cpp	1970-01-01 00:00:00 +0000
+++ online-accounts-service/libaccounts-service.cpp	2015-01-16 17:10:14 +0000
@@ -0,0 +1,257 @@
+/*
+ * 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 "libaccounts-service.h"
+#include "utils.h"
+
+#include <Accounts/Account>
+#include <Accounts/Manager>
+#include <Accounts/Service>
+#include <QDBusArgument>
+#include <QDBusConnection>
+#include <QVariantMap>
+
+using namespace OnlineAccountsUi;
+
+static QString stripVersion(const QString &appId)
+{
+    QStringList components = appId.split('_');
+    if (components.count() != 3) return appId;
+
+    /* Click packages have a profile of the form
+     *  $name_$application_$version
+     * (see https://wiki.ubuntu.com/SecurityTeam/Specifications/ApplicationConfinement/Manifest#Click)
+     *
+     * We assume that this is a click package, and strip out the last part.
+     */
+    components.removeLast();
+    return components.join('_');
+}
+
+namespace OnlineAccountsUi {
+
+struct ServiceChanges {
+    QString service;
+    QString serviceType;
+    quint32 serviceId;
+    QVariantMap settings;
+    QStringList removedKeys;
+};
+
+struct AccountChanges {
+    quint32 accountId;
+    bool created;
+    bool deleted;
+    QString provider;
+    QList<ServiceChanges> serviceChanges;
+};
+
+struct PendingWrite {
+    PendingWrite(const QDBusConnection &c, const QDBusMessage &m):
+        message(m), connection(c) {}
+    QDBusMessage message;
+    QDBusConnection connection;
+};
+
+class LibaccountsServicePrivate: public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PUBLIC(LibaccountsService)
+
+public:
+    LibaccountsServicePrivate(LibaccountsService *q);
+    ~LibaccountsServicePrivate() {};
+
+    void writeChanges(const AccountChanges &changes);
+
+private Q_SLOTS:
+    void onAccountSynced();
+    void onAccountError(Accounts::Error error);
+
+private:
+    Accounts::Manager m_manager;
+    QHash<Accounts::Account *,PendingWrite> m_pendingWrites;
+    mutable LibaccountsService *q_ptr;
+};
+
+} // namespace
+
+LibaccountsServicePrivate::LibaccountsServicePrivate(LibaccountsService *q):
+    QObject(q),
+    m_manager(new Accounts::Manager(this)),
+    q_ptr(q)
+{
+}
+
+void LibaccountsServicePrivate::writeChanges(const AccountChanges &changes)
+{
+    Q_Q(LibaccountsService);
+
+    Accounts::Account *account;
+
+    if (changes.created) {
+        account = m_manager.createAccount(changes.provider);
+    } else {
+        account = m_manager.account(changes.accountId);
+        if (Q_UNLIKELY(!account)) {
+            qWarning() << "Couldn't load account" << changes.accountId;
+            return;
+        }
+    }
+
+    Q_ASSERT(account);
+
+    if (changes.deleted) {
+        account->remove();
+    } else {
+        Q_FOREACH(const ServiceChanges &sc, changes.serviceChanges) {
+            if (sc.service == "global") {
+                account->selectService();
+            } else {
+                Accounts::Service service = m_manager.service(sc.service);
+                if (Q_UNLIKELY(!service.isValid())) {
+                    qWarning() << "Invalid service" << sc.service;
+                    continue;
+                }
+
+                account->selectService(service);
+            }
+
+            QMapIterator<QString, QVariant> it(sc.settings);
+            while (it.hasNext()) {
+                it.next();
+                account->setValue(it.key(), it.value());
+            }
+
+            Q_FOREACH(const QString &key, sc.removedKeys) {
+                account->remove(key);
+            }
+        }
+    }
+
+    m_pendingWrites.insert(account,
+                           PendingWrite(q->connection(), q->message()));
+    QObject::connect(account, SIGNAL(synced()),
+                     this, SLOT(onAccountSynced()));
+    QObject::connect(account, SIGNAL(error(Accounts::Error)),
+                     this, SLOT(onAccountError(Accounts::Error)));
+    account->sync();
+}
+
+void LibaccountsServicePrivate::onAccountSynced()
+{
+    Q_Q(LibaccountsService);
+
+    Accounts::Account *account = qobject_cast<Accounts::Account*>(sender());
+    uint accountId = account->id();
+    account->deleteLater();
+
+    QHash<Accounts::Account*,PendingWrite>::iterator i =
+        m_pendingWrites.find(account);
+    if (Q_LIKELY(i != m_pendingWrites.end())) {
+        PendingWrite &w = i.value();
+        w.connection.send(w.message.createReply(accountId));
+        m_pendingWrites.erase(i);
+    }
+}
+
+void LibaccountsServicePrivate::onAccountError(Accounts::Error error)
+{
+    Q_Q(LibaccountsService);
+
+    Accounts::Account *account = qobject_cast<Accounts::Account*>(sender());
+    account->deleteLater();
+
+    QHash<Accounts::Account*,PendingWrite>::iterator i =
+        m_pendingWrites.find(account);
+    if (Q_LIKELY(i != m_pendingWrites.end())) {
+        PendingWrite &w = i.value();
+        QDBusMessage reply =
+            w.message.createErrorReply(QDBusError::InternalError,
+                                       error.message());
+        w.connection.send(reply);
+        m_pendingWrites.erase(i);
+    }
+}
+
+LibaccountsService::LibaccountsService(QObject *parent):
+    QObject(parent),
+    d_ptr(new LibaccountsServicePrivate(this))
+{
+}
+
+LibaccountsService::~LibaccountsService()
+{
+    delete d_ptr;
+}
+
+void LibaccountsService::store(const QDBusMessage &msg)
+{
+    Q_D(LibaccountsService);
+
+    DEBUG() << "Got request:" << msg;
+
+    /* The following line tells QtDBus not to generate a reply now */
+    setDelayedReply(true);
+
+    AccountChanges changes;
+
+    // signature: "ubbsa(ssua{sv}as)"
+    QList<QVariant> args = msg.arguments();
+    int n = 0;
+    changes.accountId = args.value(n++).toUInt();
+    changes.created = args.value(n++).toBool();
+    changes.deleted = args.value(n++).toBool();
+    changes.provider = args.value(n++).toString();
+
+    /* before continuing demarshalling the arguments, check if the provider ID
+     * matches the apparmor label of the peer; if it doesn't, we shouldn't
+     * honour this request. */
+    QString profile = apparmorProfileOfPeer(msg);
+    if (stripVersion(profile) != changes.provider) {
+        DEBUG() << "Declining AccountManager store request to" << profile <<
+            "for provider" << changes.provider;
+        QDBusMessage reply = msg.createErrorReply(QDBusError::AccessDenied,
+                                                  "Profile/provider mismatch");
+        connection().send(reply);
+        return;
+    }
+
+    const QDBusArgument dbusChanges = args.value(n++).value<QDBusArgument>();
+    dbusChanges.beginArray();
+    while (!dbusChanges.atEnd()) {
+        ServiceChanges sc;
+        dbusChanges.beginStructure();
+        dbusChanges >> sc.service;
+        dbusChanges >> sc.serviceType;
+        dbusChanges >> sc.serviceId;
+        dbusChanges >> sc.settings;
+        dbusChanges >> sc.removedKeys;
+        dbusChanges.endStructure();
+
+        changes.serviceChanges.append(sc);
+    }
+    dbusChanges.endArray();
+
+    d->writeChanges(changes);
+}
+
+#include "libaccounts-service.moc"

=== added file 'online-accounts-service/libaccounts-service.h'
--- online-accounts-service/libaccounts-service.h	1970-01-01 00:00:00 +0000
+++ online-accounts-service/libaccounts-service.h	2015-01-16 17:10:14 +0000
@@ -0,0 +1,69 @@
+/*
+ * 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 OAU_LIBACCOUNTS_SERVICE_H
+#define OAU_LIBACCOUNTS_SERVICE_H
+
+#include <QDBusContext>
+#include <QDBusMessage>
+#include <QObject>
+
+namespace OnlineAccountsUi {
+
+#define LIBACCOUNTS_OBJECT_PATH \
+    QStringLiteral("/com/google/code/AccountsSSO/Accounts/Manager")
+#define LIBACCOUNTS_BUS_NAME \
+    QStringLiteral("com.google.code.AccountsSSO.Accounts.Manager")
+
+class LibaccountsServicePrivate;
+
+class LibaccountsService: public QObject, protected QDBusContext
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface",
+                "com.google.code.AccountsSSO.Accounts.Manager")
+    Q_CLASSINFO("D-Bus Introspection", ""
+"  <interface name=\"com.google.code.AccountsSSO.Accounts.Manager\">\n"
+"    <method name=\"store\">\n"
+"      <arg direction=\"in\" type=\"u\" name=\"account_id\"/>\n"
+"      <arg direction=\"in\" type=\"b\"/>\n"
+"      <arg direction=\"in\" type=\"b\"/>\n"
+"      <arg direction=\"in\" type=\"s\"/>\n"
+"      <arg direction=\"in\" type=\"a(ssua{sv}as)\"/>\n"
+"      <arg direction=\"out\" type=\"u\" name=\"account_id\"/>\n"
+"    </method>\n"
+"  </interface>\n"
+        "")
+
+public:
+    explicit LibaccountsService(QObject *parent = 0);
+    ~LibaccountsService();
+
+public Q_SLOTS:
+    void store(const QDBusMessage &msg);
+
+private:
+    LibaccountsServicePrivate *d_ptr;
+    Q_DECLARE_PRIVATE(LibaccountsService)
+};
+
+} // namespace
+
+#endif // OAU_LIBACCOUNTS_SERVICE_H

=== modified file 'online-accounts-service/main.cpp'
--- online-accounts-service/main.cpp	2014-08-19 12:11:24 +0000
+++ online-accounts-service/main.cpp	2015-01-16 17:10:14 +0000
@@ -22,6 +22,7 @@
 #include "globals.h"
 #include "inactivity-timer.h"
 #include "indicator-service.h"
+#include "libaccounts-service.h"
 #include "request-manager.h"
 #include "service.h"
 #include "signonui-service.h"
@@ -79,6 +80,10 @@
     connection.registerObject(WEBCREDENTIALS_OBJECT_PATH,
                               indicatorService->serviceObject());
 
+    LibaccountsService *libaccountsService = new LibaccountsService();
+    connection.registerService(LIBACCOUNTS_BUS_NAME);
+    connection.registerObject(LIBACCOUNTS_OBJECT_PATH, libaccountsService,
+                              QDBusConnection::ExportAllContents);
 
     InactivityTimer *inactivityTimer = 0;
     if (daemonTimeout > 0) {
@@ -91,6 +96,10 @@
 
     int ret = app.exec();
 
+    connection.unregisterService(LIBACCOUNTS_BUS_NAME);
+    connection.unregisterObject(LIBACCOUNTS_OBJECT_PATH);
+    delete libaccountsService;
+
     connection.unregisterService(WEBCREDENTIALS_BUS_NAME);
     connection.unregisterObject(WEBCREDENTIALS_OBJECT_PATH);
     delete indicatorService;

=== modified file 'online-accounts-service/online-accounts-service.pro'
--- online-accounts-service/online-accounts-service.pro	2014-08-26 08:39:20 +0000
+++ online-accounts-service/online-accounts-service.pro	2015-01-16 17:10:14 +0000
@@ -14,6 +14,7 @@
     network
 
 PKGCONFIG += \
+    accounts-qt5 \
     libnotify \
     libsignon-qt5 \
     signon-plugins-common
@@ -46,13 +47,15 @@
     $${COMMON_SRC}/notification.cpp \
     inactivity-timer.cpp \
     indicator-service.cpp \
+    libaccounts-service.cpp \
     main.cpp \
     reauthenticator.cpp \
     request.cpp \
     request-manager.cpp \
     service.cpp \
     signonui-service.cpp \
-    ui-proxy.cpp
+    ui-proxy.cpp \
+    utils.cpp
 
 HEADERS += \
     $${COMMON_SRC}/debug.h \
@@ -61,13 +64,15 @@
     $${COMMON_SRC}/notification.h \
     inactivity-timer.h \
     indicator-service.h \
+    libaccounts-service.h \
     mir-helper.h \
     reauthenticator.h \
     request.h \
     request-manager.h \
     service.h \
     signonui-service.h \
-    ui-proxy.h
+    ui-proxy.h \
+    utils.h
 
 QMAKE_SUBSTITUTES += \
     com.ubuntu.OnlineAccountsUi.service.in

=== modified file 'online-accounts-service/request-manager.cpp'
--- online-accounts-service/request-manager.cpp	2014-10-13 10:48:54 +0000
+++ online-accounts-service/request-manager.cpp	2015-01-16 17:10:14 +0000
@@ -117,14 +117,16 @@
         return; // Nothing to do
     }
 
+    QObject::connect(request, SIGNAL(completed()),
+                     this, SLOT(onRequestCompleted()));
+
     UiProxy *proxy = new UiProxy(request->clientPid(), this);
     if (Q_UNLIKELY(!proxy->init())) {
         qWarning() << "UiProxy initialization failed!";
-        runQueue(queue);
+        request->fail(OAU_ERROR_PROMPT_SESSION,
+                      "Could not create a prompt session");
         return;
     }
-    QObject::connect(request, SIGNAL(completed()),
-                     this, SLOT(onRequestCompleted()));
     QObject::connect(proxy, SIGNAL(finished()),
                      this, SLOT(onProxyFinished()));
     m_proxies.append(proxy);

=== modified file 'online-accounts-service/request.cpp'
--- online-accounts-service/request.cpp	2014-11-21 13:50:15 +0000
+++ online-accounts-service/request.cpp	2015-01-16 17:10:14 +0000
@@ -21,6 +21,7 @@
 #include "debug.h"
 #include "globals.h"
 #include "request.h"
+#include "utils.h"
 
 #include <SignOn/uisessiondata_priv.h>
 
@@ -58,9 +59,6 @@
     }
 
 private:
-    QString findClientApparmorProfile();
-
-private:
     mutable Request *q_ptr;
     QDBusConnection m_connection;
     QDBusMessage m_message;
@@ -84,41 +82,13 @@
     m_inProgress(false),
     m_delay(0)
 {
-    m_clientApparmorProfile = findClientApparmorProfile();
+    m_clientApparmorProfile = apparmorProfileOfPeer(message);
 }
 
 RequestPrivate::~RequestPrivate()
 {
 }
 
-QString RequestPrivate::findClientApparmorProfile()
-{
-    QString uniqueConnectionId = m_message.service();
-    /* This is mainly for unit tests: real messages on the session bus always
-     * have a service name. */
-    if (uniqueConnectionId.isEmpty()) return QString();
-
-    QString appId;
-
-    QDBusMessage msg =
-        QDBusMessage::createMethodCall("org.freedesktop.DBus",
-                                       "/org/freedesktop/DBus",
-                                       "org.freedesktop.DBus",
-                                       "GetConnectionAppArmorSecurityContext");
-    QVariantList args;
-    args << uniqueConnectionId;
-    msg.setArguments(args);
-    QDBusMessage reply = QDBusConnection::sessionBus().call(msg, QDBus::Block);
-    if (reply.type() == QDBusMessage::ReplyMessage) {
-        appId = reply.arguments().value(0, QString()).toString();
-        DEBUG() << "App ID:" << appId;
-    } else {
-        qWarning() << "Error getting app ID:" << reply.errorName() <<
-            reply.errorMessage();
-    }
-    return appId;
-}
-
 Request::Request(const QDBusConnection &connection,
                  const QDBusMessage &message,
                  const QVariantMap &parameters,
@@ -192,6 +162,16 @@
     return d->m_message.interface();
 }
 
+QString Request::providerId() const
+{
+    Q_D(const Request);
+    if (interface() == OAU_INTERFACE) {
+        return d->m_parameters.value(OAU_KEY_PROVIDER, 0).toString();
+    } else {
+        return QString();
+    }
+}
+
 void Request::setDelay(int delay)
 {
     Q_D(Request);

=== modified file 'online-accounts-service/request.h'
--- online-accounts-service/request.h	2014-11-21 13:50:15 +0000
+++ online-accounts-service/request.h	2015-01-16 17:10:14 +0000
@@ -49,6 +49,7 @@
     const QVariantMap &parameters() const;
     QString clientApparmorProfile() const;
     QString interface() const;
+    QString providerId() const;
 
     void setDelay(int delay);
     int delay() const;

=== modified file 'online-accounts-service/signonui-service.cpp'
--- online-accounts-service/signonui-service.cpp	2014-08-22 11:31:24 +0000
+++ online-accounts-service/signonui-service.cpp	2015-01-16 17:10:14 +0000
@@ -156,15 +156,32 @@
 
 QString ServicePrivate::rootDirForIdentity(quint32 id)
 {
+    /* the BrowserRequest class instructs the webview to store its cookies and
+     * local data into
+     * ~/.cache/online-accounts-ui/id-<signon-id>-<provider-id>/; while we
+     * don't normally expect to find more than one entry for a given signon-id,
+     * it's a possibility we cannot completely discard, since in older versions
+     * we were not appending the "-<provider-id>" suffix. Besides, unless we
+     * look up into the accounts DB, we don't know the value for the provider
+     * ID.
+     * Because of both of these reasons, we list all the directories whose name
+     * starts with "id-<signon-id>" and pick the most recent one.
+     */
     QString cachePath =
         QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation);
-    return cachePath + QString("/online-accounts-ui/id-%1").arg(id);
+    QDir cacheDir(cachePath + QStringLiteral("/online-accounts-ui"));
+    QString nameFilter = QString("id-%1*").arg(id);
+    QStringList rootDirs = cacheDir.entryList(QStringList() << nameFilter,
+                                              QDir::Dirs, QDir::Time);
+    return rootDirs.count() > 0 ? cacheDir.filePath(rootDirs.at(0)) : QString();
 }
 
 void ServicePrivate::removeIdentityData(quint32 id)
 {
     /* Remove any data associated with the given identity. */
-    QDir rootDir(ServicePrivate::rootDirForIdentity(id));
+    QString rootDirName = rootDirForIdentity(id);
+    if (rootDirName.isEmpty()) return;
+    QDir rootDir(rootDirName);
     rootDir.removeRecursively();
 }
 

=== modified file 'online-accounts-service/ui-proxy.cpp'
--- online-accounts-service/ui-proxy.cpp	2014-11-21 13:50:15 +0000
+++ online-accounts-service/ui-proxy.cpp	2015-01-16 17:10:14 +0000
@@ -24,7 +24,11 @@
 #include "request.h"
 #include "ui-proxy.h"
 
+#include <Accounts/Manager>
+#include <Accounts/Provider>
 #include <QDir>
+#include <QDomDocument>
+#include <QDomElement>
 #include <QFileInfo>
 #include <QLocalServer>
 #include <QLocalSocket>
@@ -49,11 +53,14 @@
     inline UiProxyPrivate(pid_t clientPid, UiProxy *pluginProxy);
     inline ~UiProxyPrivate();
 
+    void setStatus(UiProxy::Status status);
     bool setupSocket();
     bool init();
     void sendOperation(const QVariantMap &data);
     void sendRequest(int requestId, Request *request);
-    void setupPromptSession();
+    bool setupPromptSession();
+    QString findAppArmorProfile();
+    void startProcess();
 
 private Q_SLOTS:
     void onNewConnection();
@@ -63,6 +70,7 @@
 
 private:
     QProcess m_process;
+    UiProxy::Status m_status;
     QLocalServer m_server;
     QLocalSocket *m_socket;
     OnlineAccountsUi::Ipc m_ipc;
@@ -71,7 +79,9 @@
     QMap<int,Request*> m_requests;
     QStringList m_handlers;
     pid_t m_clientPid;
+    QString m_providerId;
     PromptSessionP m_promptSession;
+    QStringList m_arguments;
     mutable UiProxy *q_ptr;
 };
 
@@ -79,6 +89,7 @@
 
 UiProxyPrivate::UiProxyPrivate(pid_t clientPid, UiProxy *uiProxy):
     QObject(uiProxy),
+    m_status(UiProxy::Null),
     m_socket(0),
     m_nextRequestId(0),
     m_clientPid(clientPid),
@@ -109,6 +120,14 @@
     m_server.close();
 }
 
+void UiProxyPrivate::setStatus(UiProxy::Status status)
+{
+    Q_Q(UiProxy);
+    if (m_status == status) return;
+    m_status = status;
+    Q_EMIT q->statusChanged();
+}
+
 void UiProxyPrivate::sendOperation(const QVariantMap &data)
 {
     QByteArray ba;
@@ -136,6 +155,8 @@
     m_ipc.setChannels(socket, socket);
     m_server.close(); // stop listening
 
+    setStatus(UiProxy::Ready);
+
     /* Execute any pending requests */
     QMapIterator<int, Request*> it(m_requests);
     while (it.hasNext()) {
@@ -178,7 +199,7 @@
     QDir socketDir(runtimeDir + "/online-accounts-ui");
     if (!socketDir.exists()) socketDir.mkpath(".");
 
-    QString uniqueName = QString("ui-%1").arg(socketCounter++);
+    QString uniqueName = QString("ui-%1-%2").arg(socketCounter++).arg(m_providerId);
 
     /* If the file exists, it's a stale file: online-accounts-ui is a single
      * instance process, and the only one creating files in this directory. */
@@ -190,57 +211,114 @@
     return m_server.listen(socketDir.filePath(uniqueName));
 }
 
-void UiProxyPrivate::setupPromptSession()
+bool UiProxyPrivate::setupPromptSession()
 {
     Q_Q(UiProxy);
 
-    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    if (!env.value("QT_QPA_PLATFORM").startsWith("ubuntu")) return;
-
     PromptSessionP session =
         MirHelper::instance()->createPromptSession(m_clientPid);
-    if (!session) return;
+    if (!session) return false;
 
     QString mirSocket = session->requestSocket();
     if (mirSocket.isEmpty()) {
-        return;
+        return false;
     }
 
     m_promptSession = session;
     QObject::connect(m_promptSession.data(), SIGNAL(finished()),
                      q, SIGNAL(finished()));
 
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
     env.insert("MIR_SOCKET", mirSocket);
     m_process.setProcessEnvironment(env);
+    return true;
 }
 
 bool UiProxyPrivate::init()
 {
-    if (Q_UNLIKELY(!setupSocket())) return false;
+    m_arguments.clear();
+    if (!m_promptSession) {
+        /* the first argument is required to be the desktop file */
+        m_arguments.append("--desktop_file_hint=/usr/share/applications/online-accounts-ui.desktop");
+    }
+
+    if (m_clientPid) {
+        setupPromptSession();
+    }
+
+    return true;
+}
+
+QString UiProxyPrivate::findAppArmorProfile()
+{
+    if (Q_UNLIKELY(m_providerId.isEmpty())) return QString();
+
+    /* Load the provider XML file */
+    Accounts::Manager manager;
+    Accounts::Provider provider = manager.provider(m_providerId);
+    if (Q_UNLIKELY(!provider.isValid())) {
+        qWarning() << "Provider not found:" << m_providerId;
+        return QString();
+    }
+
+    const QDomDocument doc = provider.domDocument();
+    QDomElement root = doc.documentElement();
+    return root.firstChildElement("profile").text();
+}
+
+void UiProxyPrivate::startProcess()
+{
+    if (Q_UNLIKELY(!setupSocket())) {
+        qWarning() << "Couldn't setup IPC socket";
+        setStatus(UiProxy::Error);
+        return;
+    }
+    m_arguments.append("--socket");
+    m_arguments.append(m_server.fullServerName());
+
+    QString profile = findAppArmorProfile();
+    if (profile.isEmpty()) {
+        profile = "unconfined";
+    } else {
+        /* Set TMPDIR to a location which the confined process can actually
+         * use */
+        QString tmpdir =
+            QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation) +
+            "/" + profile.split('_')[0];
+        QProcessEnvironment env = m_process.processEnvironment();
+        env.insert("TMPDIR", tmpdir);
+        m_process.setProcessEnvironment(env);
+    }
+
+    m_arguments.append("--profile");
+    m_arguments.append(profile);
 
     QString processName;
-    QStringList arguments;
     QString wrapper = QString::fromUtf8(qgetenv("OAU_WRAPPER"));
     QString accountsUi = QStringLiteral(INSTALL_BIN_DIR "/online-accounts-ui");
     if (wrapper.isEmpty()) {
         processName = accountsUi;
     } else {
         processName = wrapper;
-        arguments.append(accountsUi);
-    }
-    if (!m_promptSession) {
-        /* the first argument is required to be the desktop file */
-        arguments.append("--desktop_file_hint=/usr/share/applications/online-accounts-ui.desktop");
-    }
-    arguments.append("--socket");
-    arguments.append(m_server.fullServerName());
-
-    if (m_clientPid) {
-        setupPromptSession();
-    }
-
-    m_process.start(processName, arguments);
-    return m_process.waitForStarted();
+        m_arguments.prepend(accountsUi);
+    }
+
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    if (env.value("QT_QPA_PLATFORM").startsWith("ubuntu")) {
+        if (!setupPromptSession()) {
+            qWarning() << "Couldn't setup prompt session";
+            setStatus(UiProxy::Error);
+            return;
+        }
+    }
+
+    setStatus(UiProxy::Loading);
+    m_process.start(processName, m_arguments);
+    if (Q_UNLIKELY(!m_process.waitForStarted())) {
+        qWarning() << "Couldn't start account plugin process";
+        setStatus(UiProxy::Error);
+        return;
+    }
 }
 
 void UiProxyPrivate::sendRequest(int requestId, Request *request)
@@ -285,6 +363,13 @@
 
 UiProxy::~UiProxy()
 {
+    DEBUG();
+}
+
+UiProxy::Status UiProxy::status() const
+{
+    Q_D(const UiProxy);
+    return d->m_status;
 }
 
 bool UiProxy::init()
@@ -297,14 +382,19 @@
 {
     Q_D(UiProxy);
 
+    if (d->m_providerId.isEmpty()) {
+        d->m_providerId = request->providerId();
+    }
     int requestId = d->m_nextRequestId++;
     d->m_requests.insert(requestId, request);
     QObject::connect(request, SIGNAL(completed()),
                      d, SLOT(onRequestCompleted()));
     request->setInProgress(true);
 
-    if (d->m_socket && d->m_socket->isValid()) {
+    if (d->m_status == UiProxy::Ready) {
         d->sendRequest(requestId, request);
+    } else if (d->m_status == UiProxy::Null) {
+        d->startProcess();
     }
 }
 

=== modified file 'online-accounts-service/ui-proxy.h'
--- online-accounts-service/ui-proxy.h	2014-08-12 12:33:10 +0000
+++ online-accounts-service/ui-proxy.h	2015-01-16 17:10:14 +0000
@@ -37,11 +37,15 @@
     explicit UiProxy(pid_t clientPid, QObject *parent = 0);
     ~UiProxy();
 
+    enum Status { Null, Ready, Loading, Error };
+    Status status() const;
+
     bool init();
     void handleRequest(Request *request);
     bool hasHandlerFor(const QVariantMap &parameters);
 
 Q_SIGNALS:
+    void statusChanged();
     void finished();
 
 private:

=== added file 'online-accounts-service/utils.cpp'
--- online-accounts-service/utils.cpp	1970-01-01 00:00:00 +0000
+++ online-accounts-service/utils.cpp	2015-01-16 17:10:14 +0000
@@ -0,0 +1,57 @@
+/*
+ * 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 "utils.h"
+
+#include <QDBusConnection>
+#include <QDBusMessage>
+
+namespace OnlineAccountsUi {
+
+QString apparmorProfileOfPeer(const QDBusMessage &message)
+{
+    QString uniqueConnectionId = message.service();
+    /* This is mainly for unit tests: real messages on the session bus always
+     * have a service name. */
+    if (uniqueConnectionId.isEmpty()) return QString();
+
+    QString appId;
+
+    QDBusMessage msg =
+        QDBusMessage::createMethodCall("org.freedesktop.DBus",
+                                       "/org/freedesktop/DBus",
+                                       "org.freedesktop.DBus",
+                                       "GetConnectionAppArmorSecurityContext");
+    QVariantList args;
+    args << uniqueConnectionId;
+    msg.setArguments(args);
+    QDBusMessage reply = QDBusConnection::sessionBus().call(msg, QDBus::Block);
+    if (reply.type() == QDBusMessage::ReplyMessage) {
+        appId = reply.arguments().value(0, QString()).toString();
+        DEBUG() << "App ID:" << appId;
+    } else {
+        qWarning() << "Error getting app ID:" << reply.errorName() <<
+            reply.errorMessage();
+    }
+    return appId;
+}
+
+} // namespace

=== added file 'online-accounts-service/utils.h'
--- online-accounts-service/utils.h	1970-01-01 00:00:00 +0000
+++ online-accounts-service/utils.h	2015-01-16 17:10:14 +0000
@@ -0,0 +1,34 @@
+/*
+ * 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 OAU_UTILS_H
+#define OAU_UTILS_H
+
+#include <QString>
+
+class QDBusMessage;
+
+namespace OnlineAccountsUi {
+
+QString apparmorProfileOfPeer(const QDBusMessage &message);
+
+} // namespace
+
+#endif // OAU_UTILS_H

=== modified file 'online-accounts-ui/browser-request.cpp'
--- online-accounts-ui/browser-request.cpp	2014-10-09 12:24:45 +0000
+++ online-accounts-ui/browser-request.cpp	2015-01-16 17:10:14 +0000
@@ -70,7 +70,7 @@
     QUrl responseUrl() const { return m_responseUrl; }
     QUrl rootDir() const { return QUrl::fromLocalFile(m_rootDir); }
 
-    static QString rootDirForIdentity(quint32 id);
+    QString rootDirForIdentity() const;
 
 public Q_SLOTS:
     void setCookies(const QVariant &cookies);
@@ -120,11 +120,12 @@
     delete m_dialog;
 }
 
-QString BrowserRequestPrivate::rootDirForIdentity(quint32 id)
+QString BrowserRequestPrivate::rootDirForIdentity() const
 {
+    Q_Q(const BrowserRequest);
     QString cachePath =
         QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
-    return cachePath + QString("/id-%1").arg(id);
+    return cachePath + QString("/id-%1-%2").arg(q->identity()).arg(q->providerId());
 }
 
 void BrowserRequestPrivate::start()
@@ -134,7 +135,7 @@
     const QVariantMap &params = q->parameters();
     DEBUG() << params;
 
-    QDir rootDir(rootDirForIdentity(q->identity()));
+    QDir rootDir(rootDirForIdentity());
     if (!rootDir.exists()) {
         rootDir.mkpath(".");
     }

=== modified file 'online-accounts-ui/globals.h'
--- online-accounts-ui/globals.h	2014-09-15 12:16:50 +0000
+++ online-accounts-ui/globals.h	2015-01-16 17:10:14 +0000
@@ -40,6 +40,8 @@
     QStringLiteral(OAU_ERROR_PREFIX "InvalidParameters")
 #define OAU_ERROR_INVALID_APPLICATION \
     QStringLiteral(OAU_ERROR_PREFIX "InvalidApplication")
+#define OAU_ERROR_PROMPT_SESSION \
+    QStringLiteral(OAU_ERROR_PREFIX "NoPromptSession")
 
 /* SignOnUi service */
 #define SIGNONUI_SERVICE_NAME   QStringLiteral("com.nokia.singlesignonui")

=== modified file 'online-accounts-ui/main.cpp'
--- online-accounts-ui/main.cpp	2014-12-09 10:10:25 +0000
+++ online-accounts-ui/main.cpp	2015-01-16 17:10:14 +0000
@@ -32,6 +32,7 @@
 #else
 #include <QtGui/private/qopenglcontext_p.h>
 #endif
+#include <sys/apparmor.h>
 
 using namespace OnlineAccountsUi;
 
@@ -81,14 +82,27 @@
     QOpenGLContextPrivate::setGlobalShareContext(glcontext);
 #endif
 
+    QString socket;
+    QString profile;
     QStringList arguments = app.arguments();
-    int i = arguments.indexOf("--socket");
-    if (i < 0 || i + 1 >= arguments.count()) {
+    for (int i = 0; i < arguments.count(); i++) {
+        const QString &arg = arguments[i];
+        if (arg == "--socket") {
+            socket = arguments.value(++i);
+        } else if (arg == "--profile") {
+            profile = arguments.value(++i);
+        }
+    }
+    if (Q_UNLIKELY(socket.isEmpty())) {
         qWarning() << "Missing --socket argument";
         return EXIT_FAILURE;
     }
 
-    UiServer server(arguments[i + 1]);
+    if (!profile.isEmpty()) {
+        aa_change_profile(profile.toUtf8().constData());
+    }
+
+    UiServer server(socket);
     QObject::connect(&server, SIGNAL(finished()),
                      &app, SLOT(quit()));
     if (Q_UNLIKELY(!server.init())) {

=== modified file 'online-accounts-ui/online-accounts-ui.pro'
--- online-accounts-ui/online-accounts-ui.pro	2014-10-31 12:05:37 +0000
+++ online-accounts-ui/online-accounts-ui.pro	2015-01-16 17:10:14 +0000
@@ -52,7 +52,6 @@
     i18n.cpp \
     ipc.cpp \
     main.cpp \
-    notification.cpp \
     panel-request.cpp \
     provider-request.cpp \
     request.cpp \
@@ -67,7 +66,6 @@
     dialog-request.h \
     i18n.h \
     ipc.h \
-    notification.h \
     panel-request.h \
     provider-request.h \
     request.h \

=== modified file 'online-accounts-ui/signonui-request.cpp'
--- online-accounts-ui/signonui-request.cpp	2014-10-14 09:05:52 +0000
+++ online-accounts-ui/signonui-request.cpp	2015-01-16 17:10:14 +0000
@@ -24,13 +24,9 @@
 #include "debug.h"
 #include "dialog-request.h"
 #include "globals.h"
-#include "notification.h"
 
 #include <Accounts/Account>
-#include <Accounts/Application>
-#include <Accounts/Provider>
 #include <OnlineAccountsPlugin/account-manager.h>
-#include <OnlineAccountsPlugin/application-manager.h>
 #include <OnlineAccountsPlugin/request-handler.h>
 #include <QDBusArgument>
 #include <QPointer>
@@ -52,19 +48,13 @@
     ~RequestPrivate();
 
 private:
-    void setWindow(QWindow *window);
     Accounts::Account *findAccount();
 
-private Q_SLOTS:
-    void onActionInvoked(const QString &action);
-    void onNotificationClosed();
-
 private:
     mutable Request *q_ptr;
     QVariantMap m_clientData;
     QPointer<RequestHandler> m_handler;
-    OnlineAccountsUi::Notification *m_notification;
-    QWindow *m_window;
+    Accounts::Account *m_account;
 };
 
 } // namespace
@@ -72,9 +62,7 @@
 RequestPrivate::RequestPrivate(Request *request):
     QObject(request),
     q_ptr(request),
-    m_handler(0),
-    m_notification(0),
-    m_window(0)
+    m_handler(0)
 {
     const QVariantMap &parameters = request->parameters();
     if (parameters.contains(SSOUI_KEY_CLIENT_DATA)) {
@@ -83,55 +71,12 @@
             variant.toMap() :
             qdbus_cast<QVariantMap>(variant.value<QDBusArgument>());
     }
+
+    m_account = findAccount();
 }
 
 RequestPrivate::~RequestPrivate()
 {
-    delete m_notification;
-    m_notification = 0;
-}
-
-void RequestPrivate::setWindow(QWindow *window)
-{
-    Q_Q(Request);
-
-    /* Don't show the window yet: the user must be presented with a
-     * snap-decision, and we'll show the window only if he decides to
-     * authenticate. */
-    Accounts::Account *account = findAccount();
-    if (Q_UNLIKELY(!account)) {
-        QVariantMap result;
-        result[SSOUI_KEY_ERROR] = SignOn::QUERY_ERROR_FORBIDDEN;
-        q->setResult(result);
-        return;
-    }
-
-    OnlineAccountsUi::ApplicationManager *appManager =
-        OnlineAccountsUi::ApplicationManager::instance();
-    Accounts::Application application =
-        appManager->applicationFromProfile(q->clientApparmorProfile());
-
-    OnlineAccountsUi::AccountManager *accountManager =
-        OnlineAccountsUi::AccountManager::instance();
-    Accounts::Provider provider =
-        accountManager->provider(account->providerName());
-
-    QString summary =
-        QString("Please authorize %1 to access your %2 account %3").
-        arg(application.isValid() ? application.displayName() : "Ubuntu").
-        arg(provider.displayName()).
-        arg(account->displayName());
-    m_notification =
-        new OnlineAccountsUi::Notification("Authentication request", summary);
-    m_notification->addAction("cancel", "Cancel");
-    m_notification->addAction("continue", "Authorize...");
-    m_notification->setSnapDecision(true);
-    QObject::connect(m_notification, SIGNAL(actionInvoked(const QString &)),
-                     this, SLOT(onActionInvoked(const QString &)));
-    QObject::connect(m_notification, SIGNAL(closed()),
-                     this, SLOT(onNotificationClosed()));
-    m_notification->show();
-    m_window = window;
 }
 
 Accounts::Account *RequestPrivate::findAccount()
@@ -162,39 +107,6 @@
     return 0;
 }
 
-void RequestPrivate::onActionInvoked(const QString &action)
-{
-    Q_Q(Request);
-
-    DEBUG() << action;
-
-    QObject::disconnect(m_notification, 0, this, 0);
-    m_notification->deleteLater();
-    m_notification = 0;
-
-    if (action == QStringLiteral("continue")) {
-        q->setWindow(m_window);
-    } else {
-        q->cancel();
-    }
-}
-
-void RequestPrivate::onNotificationClosed()
-{
-    Q_Q(Request);
-
-    DEBUG();
-
-    /* setResult() should have been called by onActionInvoked(), but calling it
-     * twice won't harm because only the first invocation counts. */
-    QVariantMap result;
-    result[SSOUI_KEY_ERROR] = SignOn::QUERY_ERROR_FORBIDDEN;
-    q->setResult(result);
-
-    m_notification->deleteLater();
-    m_notification = 0;
-}
-
 #ifndef NO_REQUEST_FACTORY
 Request *Request::newRequest(int id,
                              const QString &clientProfile,
@@ -266,22 +178,13 @@
 {
     Q_D(Request);
 
-    /* While a notification is shown, ignore any further calls to
-     * setWindow(). */
-    if (d->m_notification) return;
-
-    /* The first time that this method is called, we handle it by presenting a
-     * snap decision to the user.
-     * Then, if this is called again with the same QWindow, it means that the
-     * snap decision was accepted, and we show the window.
-     */
-    if (window == d->m_window ||
-        /* If we are part of a prompt session, just show the window */
-        !qgetenv("MIR_SOCKET").isEmpty()) {
+    /* Show the window only if we are in a prompt session */
+    if (qgetenv("MIR_SOCKET").isEmpty()) {
+        QVariantMap result;
+        result[SSOUI_KEY_ERROR] = SignOn::QUERY_ERROR_FORBIDDEN;
+        setResult(result);
+    } else {
         OnlineAccountsUi::Request::setWindow(window);
-        d->m_window = 0;
-    } else {
-        d->setWindow(window);
     }
 }
 
@@ -300,6 +203,13 @@
     return parameters().value(SSOUI_KEY_MECHANISM).toString();
 }
 
+QString Request::providerId() const
+{
+    Q_D(const Request);
+    return d->m_account ? d->m_account->providerName() :
+        d->m_clientData.value("providerId").toString();
+}
+
 const QVariantMap &Request::clientData() const
 {
     Q_D(const Request);

=== modified file 'online-accounts-ui/signonui-request.h'
--- online-accounts-ui/signonui-request.h	2014-08-08 11:37:56 +0000
+++ online-accounts-ui/signonui-request.h	2015-01-16 17:10:14 +0000
@@ -45,6 +45,7 @@
     uint identity() const;
     QString method() const;
     QString mechanism() const;
+    QString providerId() const;
 
     const QVariantMap &clientData() const;
 

=== modified file 'plugins/module/OAuth.qml'
--- plugins/module/OAuth.qml	2014-06-10 14:48:22 +0000
+++ plugins/module/OAuth.qml	2015-01-16 17:10:14 +0000
@@ -169,6 +169,7 @@
         if (creds.credentialsId == 0) return
         var parameters = {}
         parameters[requestHandler.matchKey] = requestHandler.matchId
+        parameters["providerId"] = account.provider.id
         for (var p in authenticationParameters) {
             parameters[p] = authenticationParameters[p]
         }

=== modified file 'plugins/module/ServiceItem.qml'
--- plugins/module/ServiceItem.qml	2014-09-30 13:30:39 +0000
+++ plugins/module/ServiceItem.qml	2015-01-16 17:10:14 +0000
@@ -21,7 +21,7 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.OnlineAccounts 0.1
 
-Item {
+Column {
     property variant accountServiceHandle
 
     signal applicationAdded(string applicationId)
@@ -29,7 +29,6 @@
 
     anchors.left: parent.left
     anchors.right: parent.right
-    height: childrenRect.height
 
     Repeater {
         resources: AccountService {

=== modified file 'plugins/plugins.pro'
--- plugins/plugins.pro	2014-10-03 14:56:11 +0000
+++ plugins/plugins.pro	2015-01-16 17:10:14 +0000
@@ -1,6 +1,7 @@
 TEMPLATE = subdirs
-CONFIG += ordered
 SUBDIRS = \
     OnlineAccountsPlugin \
     module \
     example
+
+module.depends = OnlineAccountsPlugin

=== modified file 'tests/online-accounts-service/mock/request-mock.cpp'
--- tests/online-accounts-service/mock/request-mock.cpp	2014-11-25 13:34:16 +0000
+++ tests/online-accounts-service/mock/request-mock.cpp	2015-01-16 17:10:14 +0000
@@ -48,6 +48,11 @@
     m_clientApparmorProfile = profile;
 }
 
+void RequestPrivate::setProviderId(const QString &provider)
+{
+    m_providerId = provider;
+}
+
 Request::Request(const QDBusConnection &connection,
                  const QDBusMessage &message,
                  const QVariantMap &parameters,
@@ -96,6 +101,11 @@
     return d->m_message.interface();
 }
 
+QString Request::providerId() const {
+    Q_D(const Request);
+    return d->m_providerId;
+}
+
 void Request::setDelay(int delay)
 {
     Q_D(Request);

=== modified file 'tests/online-accounts-service/mock/request-mock.h'
--- tests/online-accounts-service/mock/request-mock.h	2014-11-25 13:34:16 +0000
+++ tests/online-accounts-service/mock/request-mock.h	2015-01-16 17:10:14 +0000
@@ -43,6 +43,7 @@
     static RequestPrivate *mocked(Request *r) { return r->d_ptr; }
 
     void setClientApparmorProfile(const QString &profile);
+    void setProviderId(const QString &provider);
 
 Q_SIGNALS:
     void cancelCalled();
@@ -54,6 +55,7 @@
     QDBusMessage m_message;
     QVariantMap m_parameters;
     QString m_clientApparmorProfile;
+    QString m_providerId;
     bool m_inProgress;
     int m_delay;
     mutable Request *q_ptr;

=== modified file 'tests/online-accounts-service/online-accounts-service.pro'
--- tests/online-accounts-service/online-accounts-service.pro	2014-08-25 14:54:38 +0000
+++ tests/online-accounts-service/online-accounts-service.pro	2015-01-16 17:10:14 +0000
@@ -1,6 +1,7 @@
 TEMPLATE = subdirs
 SUBDIRS = \
     tst_inactivity_timer.pro \
+    tst_libaccounts_service.pro \
     tst_service.pro \
     tst_signonui_service.pro \
     tst_ui_proxy.pro

=== added file 'tests/online-accounts-service/tst_libaccounts_service.cpp'
--- tests/online-accounts-service/tst_libaccounts_service.cpp	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-service/tst_libaccounts_service.cpp	2015-01-16 17:10:14 +0000
@@ -0,0 +1,522 @@
+/*
+ * Copyright (C) 2013 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 "libaccounts-service.h"
+
+#include <Accounts/Account>
+#include <Accounts/Manager>
+#include <Accounts/Service>
+#include <QDBusConnection>
+#include <QDebug>
+#include <QProcess>
+#include <QSignalSpy>
+#include <QString>
+#include <QTest>
+
+using namespace OnlineAccountsUi;
+
+#define TEST_SERVICE_NAME \
+    "com.ubuntu.OnlineAccountsUi.LibaccountsService.Test"
+#define TEST_OBJECT_PATH "/"
+
+class LibaccountsServiceTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    LibaccountsServiceTest();
+
+private:
+    QProcess *requestStore(const QString &args, bool showError = false) {
+        QString command = QStringLiteral("gdbus call --session "
+                                         "--dest " TEST_SERVICE_NAME " "
+                                         "--object-path " TEST_OBJECT_PATH " "
+                                         "--method com.google.code.AccountsSSO.Accounts.Manager.store ");
+        QProcess *process = new QProcess(this);
+        if (showError) {
+            process->setProcessChannelMode(QProcess::ForwardedErrorChannel);
+        }
+        process->start(command + args);
+        process->waitForStarted();
+        return process;
+    }
+
+private Q_SLOTS:
+    void init();
+    void testProfile_data();
+    void testProfile();
+    void testFailure();
+    void testAccount_data();
+    void testAccount();
+    void testSettings_data();
+    void testSettings();
+
+private:
+    LibaccountsService m_service;
+};
+
+/* Mocking libaccounts-qt { */
+class ManagerController {
+public:
+    ManagerController(): lastLoadedAccount(0) { m_instance = this; }
+    ~ManagerController() { m_instance = 0; }
+    static ManagerController *instance() { return m_instance; }
+
+    void setServices(const QStringList &services) { m_services = services; }
+
+public:
+    Accounts::Account *lastLoadedAccount;
+
+private:
+    friend class Accounts::Manager;
+    QStringList m_services;
+    static ManagerController *m_instance;
+};
+
+ManagerController *ManagerController::m_instance = 0;
+
+typedef QHash<QString,QVariantMap> ServiceSettings;
+typedef QHash<QString,QSet<QString> > RemovedKeys;
+
+class AccountController: public QObject {
+    Q_OBJECT
+public:
+    AccountController(Accounts::Account *account):
+        QObject(account),
+        m_id(0),
+        m_wasDeleted(false),
+        m_syncWasCalled(false),
+        m_account(account) {
+        m_controllers[account] = this;
+    }
+
+    static AccountController *mock(Accounts::Account *account) {
+        return m_controllers[account];
+    }
+
+    bool syncWasCalled() const { return m_syncWasCalled; }
+    void doSync(Accounts::Error error = Accounts::Error()) {
+        if (error.type() == Accounts::Error::NoError) {
+            QMetaObject::invokeMethod(m_account, "synced", Qt::QueuedConnection);
+        } else {
+            QMetaObject::invokeMethod(m_account, "error", Qt::QueuedConnection,
+                                      Q_ARG(Accounts::Error, error));
+        }
+    }
+
+protected:
+    void syncCalled() { m_syncWasCalled = true; }
+
+public:
+    quint32 m_id;
+    QString m_provider;
+    ServiceSettings m_serviceSettings;
+    RemovedKeys m_removedKeys;
+    bool m_wasDeleted;
+    bool m_syncWasCalled;
+private:
+    friend class Accounts::Account;
+    static QHash<Accounts::Account *,AccountController*> m_controllers;
+    Accounts::Account *m_account;
+};
+
+QHash<Accounts::Account *,AccountController*> AccountController::m_controllers;
+
+struct _AgService {
+    _AgService(const QString &name): name(name) {}
+    QString name;
+};
+
+namespace Accounts {
+
+Service::Service():
+    m_service(0),
+    m_tags(0)
+{
+}
+
+Service::Service(AgService *service, ReferenceMode):
+    m_service(service),
+    m_tags(0)
+{
+}
+
+Service::Service(const Service &other):
+    m_service(other.m_service ? new _AgService(other.m_service->name) : 0),
+    m_tags(0)
+{
+}
+
+Service &Service::operator=(const Service &other)
+{
+    delete m_service;
+    m_service = other.m_service ? new _AgService(other.m_service->name) : 0;
+    return *this;
+}
+
+Service::~Service()
+{
+    delete m_service;
+}
+
+bool Service::isValid() const
+{
+    return m_service != 0;
+}
+
+class Account::Private {
+public:
+    Private() {}
+
+    QString m_selectedService;
+    AccountController *m_controller;
+};
+
+Account::Account(Private *d, QObject *parent):
+    QObject(parent),
+    d(d)
+{
+    d->m_controller = new AccountController(this);
+}
+
+Account::~Account()
+{
+    delete d;
+}
+
+AccountId Account::id() const
+{
+    return d->m_controller->m_id;
+}
+
+void Account::selectService(const Service &service)
+{
+    d->m_selectedService = service.m_service ?
+        service.m_service->name : QString();
+}
+
+void Account::setValue(const QString &key, const QVariant &value)
+{
+    QVariantMap &settings =
+        d->m_controller->m_serviceSettings[d->m_selectedService];
+    settings.insert(key, value);
+}
+
+void Account::remove(const QString &key)
+{
+    QSet<QString> &removedKeys =
+        d->m_controller->m_removedKeys[d->m_selectedService];
+    removedKeys.insert(key);
+}
+
+void Account::sync()
+{
+    d->m_controller->syncCalled();
+}
+
+void Account::remove()
+{
+    d->m_controller->m_wasDeleted = true;
+}
+
+Watch::~Watch()
+{
+}
+
+class Manager::Private {
+public:
+    Private() {}
+
+    ManagerController m_controller;
+};
+
+Manager::Manager(QObject *parent):
+    QObject(parent),
+    d(new Private())
+{
+}
+
+Manager::~Manager()
+{
+    delete d;
+}
+
+Account *Manager::account(const AccountId &id) const
+{
+    Account::Private *accountD = new Account::Private();
+    d->m_controller.lastLoadedAccount =
+        new Account(accountD, const_cast<Manager*>(this));
+    accountD->m_controller->m_id = id;
+    return d->m_controller.lastLoadedAccount;
+}
+
+Account *Manager::createAccount(const QString &providerName)
+{
+    Account::Private *accountD = new Account::Private();
+    d->m_controller.lastLoadedAccount = new Account(accountD, this);
+    accountD->m_controller->m_provider = providerName;
+    return d->m_controller.lastLoadedAccount;
+}
+
+Service Manager::service(const QString &serviceName) const
+{
+    if (d->m_controller.m_services.contains(serviceName)) {
+        return Service(new _AgService(serviceName));
+    } else {
+        return Service();
+    }
+}
+
+} // namespace
+
+/* } mocking libaccounts-qt */
+
+/* mocking utils.cpp { */
+namespace OnlineAccountsUi {
+
+static QString staticApparmorProfile;
+
+QString apparmorProfileOfPeer(const QDBusMessage &)
+{
+    return staticApparmorProfile;
+}
+
+void setApparmorProfile(const QString &profile)
+{
+    staticApparmorProfile = profile;
+}
+
+} // namespace
+/* } mocking utils.cpp */
+
+Q_DECLARE_METATYPE(QProcess::ExitStatus)
+
+LibaccountsServiceTest::LibaccountsServiceTest():
+    QObject(0)
+{
+    QDBusConnection conn = QDBusConnection::sessionBus();
+    conn.registerService(TEST_SERVICE_NAME);
+    conn.registerObject(TEST_OBJECT_PATH, &m_service,
+                        QDBusConnection::ExportAllContents);
+
+    qRegisterMetaType<QProcess::ExitStatus>();
+    setLoggingLevel(2);
+}
+
+void LibaccountsServiceTest::init()
+{
+    ManagerController *mc = ManagerController::instance();
+    mc->lastLoadedAccount = 0;
+}
+
+void LibaccountsServiceTest::testProfile_data()
+{
+    QTest::addColumn<QString>("profile");
+    QTest::addColumn<QString>("provider");
+    QTest::addColumn<bool>("mustPass");
+
+    QTest::newRow("non click, mismatch") <<
+        "appProfile" << "OneProvider" << false;
+
+    QTest::newRow("non click, match") <<
+        "theProfile" << "theProfile" << true;
+
+    QTest::newRow("click, mismatch") <<
+        "com.ubuntu.package_app_0.1" << "com.ubuntu.package_other" << false;
+
+    QTest::newRow("click, match") <<
+        "com.ubuntu.package_app_0.2" << "com.ubuntu.package_app" << true;
+}
+
+void LibaccountsServiceTest::testProfile()
+{
+    QFETCH(QString, profile);
+    QFETCH(QString, provider);
+    QFETCH(bool, mustPass);
+
+    setApparmorProfile(profile);
+    QString params = QString::fromUtf8("0 true false %1 []").arg(provider);
+    QProcess *client = requestStore(params);
+    QSignalSpy finished(client, SIGNAL(finished(int,QProcess::ExitStatus)));
+
+    if (mustPass) {
+        ManagerController *mc = ManagerController::instance();
+        QTRY_VERIFY(mc->lastLoadedAccount != 0);
+        AccountController *ac = AccountController::mock(mc->lastLoadedAccount);
+        QTRY_COMPARE(ac->syncWasCalled(), true);
+        ac->doSync();
+    }
+
+    finished.wait();
+
+    QByteArray stdErr = client->readAllStandardError();
+    QCOMPARE(stdErr.contains("Profile/provider mismatch"), !mustPass);
+}
+
+void LibaccountsServiceTest::testFailure()
+{
+    setApparmorProfile("MyProvider");
+    QProcess *client = requestStore("0 true false MyProvider []");
+    QSignalSpy finished(client, SIGNAL(finished(int,QProcess::ExitStatus)));
+
+    ManagerController *mc = ManagerController::instance();
+    QTRY_VERIFY(mc->lastLoadedAccount != 0);
+    AccountController *ac = AccountController::mock(mc->lastLoadedAccount);
+    QTRY_COMPARE(ac->syncWasCalled(), true);
+
+    // return an error
+    Accounts::Error error(Accounts::Error::Database, "hi there");
+    ac->doSync(error);
+    finished.wait();
+
+    QVERIFY(client->readAllStandardError().contains("hi there"));
+}
+
+void LibaccountsServiceTest::testAccount_data()
+{
+    QTest::addColumn<QString>("clientSettings");
+    QTest::addColumn<QString>("provider");
+    QTest::addColumn<quint32>("accountId");
+    QTest::addColumn<bool>("deleted");
+
+    QTest::newRow("new account") <<
+        "0 true false Cool" <<
+        "Cool" << quint32(0) << false;
+
+    QTest::newRow("existing account") <<
+        "5 false false Bad" <<
+        "Bad" << quint32(5) << false;
+
+    QTest::newRow("deleting account") <<
+        "7 false true Die" <<
+        "Die" << quint32(7) << true;
+}
+
+void LibaccountsServiceTest::testAccount()
+{
+    QFETCH(QString, clientSettings);
+    QFETCH(QString, provider);
+    QFETCH(quint32, accountId);
+    QFETCH(bool, deleted);
+
+    setApparmorProfile(provider);
+
+    ManagerController *mc = ManagerController::instance();
+
+    QString params = QString::fromUtf8("%1 []").arg(clientSettings);
+    QProcess *client = requestStore(params, true);
+    QSignalSpy finished(client, SIGNAL(finished(int,QProcess::ExitStatus)));
+
+    QTRY_VERIFY(mc->lastLoadedAccount != 0);
+    AccountController *ac = AccountController::mock(mc->lastLoadedAccount);
+    QTRY_COMPARE(ac->syncWasCalled(), true);
+
+    QCOMPARE(ac->m_id, accountId);
+    if (accountId == 0) {
+        QCOMPARE(ac->m_provider, provider);
+    }
+    QCOMPARE(ac->m_wasDeleted, deleted);
+
+    ac->doSync();
+
+    finished.wait();
+}
+
+void LibaccountsServiceTest::testSettings_data()
+{
+    QTest::addColumn<QString>("clientSettings");
+    QTest::addColumn<ServiceSettings>("settings");
+    QTest::addColumn<RemovedKeys>("removedKeys");
+
+    QHash<QString,QVariantMap> settings;
+    QHash<QString,QSet<QString> > removedKeys;
+
+    QTest::newRow("no services") <<
+        "\"[]\"" <<
+        settings << removedKeys;
+    QTest::newRow("no settings") <<
+        "\"[('cool', 'type', 3, {}, [])]\"" <<
+        settings << removedKeys;
+
+    settings["cool"].insert("enabled", false);
+    settings["cool"].insert("name", QString("Bob"));
+    QTest::newRow("some keys changed") <<
+        "\"[('cool', 'type', 3, {'enabled': <false>, 'name': <'Bob'>}, [])]\"" <<
+        settings << removedKeys;
+    settings.clear();
+
+    removedKeys["cool"].insert("enabled");
+    removedKeys["cool"].insert("id");
+    QTest::newRow("some keys removed") <<
+        "\"[('cool', 'type', 3, {}, ['enabled','id'])]\"" <<
+        settings << removedKeys;
+    removedKeys.clear();
+
+    settings["cool"].insert("enabled", true);
+    settings["cool"].insert("name", QString("Tom"));
+    removedKeys["cool"].insert("id");
+    settings["bad"].insert("port", quint32(4000));
+    removedKeys["bad"].insert("name");
+    QTest::newRow("two services, lots of changes") <<
+        "\"["
+        "('cool', 'type', 3, {'enabled': <true>, 'name': <'Tom'>}, ['id']),"
+        "('bad', 'btype', 2, {'port': <uint32 4000>}, ['name'])"
+        "]\"" <<
+        settings << removedKeys;
+    settings.clear();
+    removedKeys.clear();
+
+    QTest::newRow("invalid service") <<
+        "\"[('findme', 'type', 3, {}, ['enabled','id'])]\"" <<
+        settings << removedKeys;
+}
+
+void LibaccountsServiceTest::testSettings()
+{
+    QFETCH(QString, clientSettings);
+    QFETCH(ServiceSettings, settings);
+    QFETCH(RemovedKeys, removedKeys);
+
+    setApparmorProfile("MyProvider");
+
+    ManagerController *mc = ManagerController::instance();
+    mc->setServices(QStringList() << "cool" << "bad");
+
+    QString params =
+        QString::fromUtf8("0 true false MyProvider %1").arg(clientSettings);
+    QProcess *client = requestStore(params, true);
+    QSignalSpy finished(client, SIGNAL(finished(int,QProcess::ExitStatus)));
+
+    QTRY_VERIFY(mc->lastLoadedAccount != 0);
+    AccountController *ac = AccountController::mock(mc->lastLoadedAccount);
+    QTRY_COMPARE(ac->syncWasCalled(), true);
+
+    QCOMPARE(ac->m_serviceSettings, settings);
+    QCOMPARE(ac->m_removedKeys, removedKeys);
+
+    ac->doSync();
+
+    finished.wait();
+}
+
+QTEST_MAIN(LibaccountsServiceTest);
+
+#include "tst_libaccounts_service.moc"

=== added file 'tests/online-accounts-service/tst_libaccounts_service.pro'
--- tests/online-accounts-service/tst_libaccounts_service.pro	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-service/tst_libaccounts_service.pro	2015-01-16 17:10:14 +0000
@@ -0,0 +1,38 @@
+include(../../common-project-config.pri)
+
+TARGET = tst_libaccounts_service
+
+CONFIG += \
+    debug \
+    link_pkgconfig
+
+QT += \
+    core \
+    dbus \
+    testlib \
+    xml
+
+ONLINE_ACCOUNTS_SERVICE_DIR = $${TOP_SRC_DIR}/online-accounts-service
+COMMON_SRC_DIR = $${TOP_SRC_DIR}/online-accounts-ui
+LIBACCOUNTS_QT_DIR = $$system(pkg-config --variable=includedir accounts-qt5)/Accounts
+
+SOURCES += \
+    $${COMMON_SRC_DIR}/debug.cpp \
+    $${ONLINE_ACCOUNTS_SERVICE_DIR}/libaccounts-service.cpp \
+    tst_libaccounts_service.cpp
+
+HEADERS += \
+    $${ONLINE_ACCOUNTS_SERVICE_DIR}/libaccounts-service.h \
+    $${ONLINE_ACCOUNTS_SERVICE_DIR}/utils.h \
+    $${LIBACCOUNTS_QT_DIR}/account.h \
+    $${LIBACCOUNTS_QT_DIR}/manager.h
+
+INCLUDEPATH += \
+    $${ONLINE_ACCOUNTS_SERVICE_DIR} \
+    $${COMMON_SRC_DIR} \
+    $$system(pkg-config --variable=includedir accounts-qt5)
+
+check.commands = "xvfb-run -s '-screen 0 640x480x24' -a dbus-test-runner -t ./$${TARGET}"
+check.depends = $${TARGET}
+QMAKE_EXTRA_TARGETS += check
+

=== modified file 'tests/online-accounts-service/tst_service.pro'
--- tests/online-accounts-service/tst_service.pro	2014-10-13 11:25:27 +0000
+++ tests/online-accounts-service/tst_service.pro	2015-01-16 17:10:14 +0000
@@ -25,6 +25,7 @@
     $${ONLINE_ACCOUNTS_SERVICE_DIR}/request.cpp \
     $${ONLINE_ACCOUNTS_SERVICE_DIR}/request-manager.cpp \
     $${ONLINE_ACCOUNTS_SERVICE_DIR}/service.cpp \
+    $${ONLINE_ACCOUNTS_SERVICE_DIR}/utils.cpp \
     tst_service.cpp
 
 HEADERS += \
@@ -33,6 +34,7 @@
     $${ONLINE_ACCOUNTS_SERVICE_DIR}/request-manager.h \
     $${ONLINE_ACCOUNTS_SERVICE_DIR}/service.h \
     $${ONLINE_ACCOUNTS_SERVICE_DIR}/ui-proxy.h \
+    $${ONLINE_ACCOUNTS_SERVICE_DIR}/utils.h \
 
 INCLUDEPATH += \
     $${ONLINE_ACCOUNTS_SERVICE_DIR} \

=== modified file 'tests/online-accounts-service/tst_signonui_service.pro'
--- tests/online-accounts-service/tst_signonui_service.pro	2014-08-19 11:14:34 +0000
+++ tests/online-accounts-service/tst_signonui_service.pro	2015-01-16 17:10:14 +0000
@@ -24,6 +24,7 @@
 SOURCES += \
     $${ONLINE_ACCOUNTS_SERVICE_DIR}/request.cpp \
     $${ONLINE_ACCOUNTS_SERVICE_DIR}/signonui-service.cpp \
+    $${ONLINE_ACCOUNTS_SERVICE_DIR}/utils.cpp \
     mock/request-manager-mock.cpp \
     tst_signonui_service.cpp
 
@@ -31,6 +32,7 @@
     $${ONLINE_ACCOUNTS_SERVICE_DIR}/request.h \
     $${ONLINE_ACCOUNTS_SERVICE_DIR}/request-manager.h \
     $${ONLINE_ACCOUNTS_SERVICE_DIR}/signonui-service.h \
+    $${ONLINE_ACCOUNTS_SERVICE_DIR}/utils.h \
     mock/request-manager-mock.h
 
 INCLUDEPATH += \

=== modified file 'tests/online-accounts-service/tst_ui_proxy.pro'
--- tests/online-accounts-service/tst_ui_proxy.pro	2014-08-26 08:39:20 +0000
+++ tests/online-accounts-service/tst_ui_proxy.pro	2015-01-16 17:10:14 +0000
@@ -16,6 +16,7 @@
     INSTALL_BIN_DIR=\\\"$${INSTALL_PREFIX}/bin\\\"
 
 PKGCONFIG += \
+    accounts-qt5 \
     signon-plugins-common
 
 ONLINE_ACCOUNTS_SERVICE_DIR = $${TOP_SRC_DIR}/online-accounts-service

=== modified file 'tests/online-accounts-ui/mock/signonui-request-mock.cpp'
--- tests/online-accounts-ui/mock/signonui-request-mock.cpp	2014-09-17 14:39:07 +0000
+++ tests/online-accounts-ui/mock/signonui-request-mock.cpp	2015-01-16 17:10:14 +0000
@@ -86,6 +86,12 @@
     return parameters().value(SSOUI_KEY_MECHANISM).toString();
 }
 
+QString Request::providerId() const
+{
+    Q_D(const Request);
+    return d->m_providerId;
+}
+
 const QVariantMap &Request::clientData() const
 {
     Q_D(const Request);

=== modified file 'tests/online-accounts-ui/mock/signonui-request-mock.h'
--- tests/online-accounts-ui/mock/signonui-request-mock.h	2014-10-09 12:24:45 +0000
+++ tests/online-accounts-ui/mock/signonui-request-mock.h	2015-01-16 17:10:14 +0000
@@ -39,10 +39,13 @@
     ~RequestPrivate();
     static RequestPrivate *mocked(Request *r) { return r->d_ptr; }
 
+    void setProviderId(const QString &id) { m_providerId = id; }
+
 private:
     mutable Request *q_ptr;
     QVariantMap m_clientData;
     QPointer<RequestHandler> m_handler;
+    QString m_providerId;
 };
 
 } // namespace

=== modified file 'tests/online-accounts-ui/tst_browser_request.cpp'
--- tests/online-accounts-ui/tst_browser_request.cpp	2014-10-09 12:24:45 +0000
+++ tests/online-accounts-ui/tst_browser_request.cpp	2015-01-16 17:10:14 +0000
@@ -85,6 +85,7 @@
 void BrowserRequestTest::testParametersWithHandler_data()
 {
     QTest::addColumn<QVariantMap>("parameters");
+    QTest::addColumn<QString>("providerId");
     QTest::addColumn<QString>("pageComponentUrl");
     QTest::addColumn<QString>("startUrl");
     QTest::addColumn<QString>("finalUrl");
@@ -95,10 +96,11 @@
 
     QTest::newRow("empty") <<
         QVariantMap() <<
+        QString() <<
         "DefaultPage.qml" <<
         QString() <<
         QString() <<
-        baseCacheDir + "/id-0";
+        baseCacheDir + "/id-0-";
 
     QVariantMap parameters;
     QVariantMap clientData;
@@ -107,10 +109,11 @@
     parameters.insert(SSOUI_KEY_IDENTITY, uint(4));
     QTest::newRow("with URLs and ID") <<
         parameters <<
+        "google" <<
         "DefaultPage.qml" <<
         "http://localhost/start.html" <<
         "http://localhost/end.html" <<
-        baseCacheDir + "/id-4";
+        baseCacheDir + "/id-4-google";
     parameters.clear();
 
     clientData.insert("X-PageComponent",
@@ -121,16 +124,18 @@
     parameters.insert(SSOUI_KEY_IDENTITY, uint(4));
     QTest::newRow("with page component") <<
         parameters <<
+        "com.ubuntu.app_plugin" <<
         "file:///usr/share/signon-ui/MyPage.qml" <<
         "http://localhost/start.html" <<
         "http://localhost/end.html" <<
-        baseCacheDir + "/id-4";
+        baseCacheDir + "/id-4-com.ubuntu.app_plugin";
     parameters.clear();
 }
 
 void BrowserRequestTest::testParametersWithHandler()
 {
     QFETCH(QVariantMap, parameters);
+    QFETCH(QString, providerId);
     QFETCH(QString, pageComponentUrl);
     QFETCH(QString, startUrl);
     QFETCH(QString, finalUrl);
@@ -140,6 +145,9 @@
     QSignalSpy requestChanged(&handler, SIGNAL(requestChanged()));
 
     TestRequest request(parameters);
+    SignOnUi::RequestPrivate *mockedRequest =
+        SignOnUi::RequestPrivate::mocked(&request);
+    mockedRequest->setProviderId(providerId);
     request.setHandler(&handler);
 
     request.start();

=== modified file 'tests/online-accounts-ui/tst_signonui_request.cpp'
--- tests/online-accounts-ui/tst_signonui_request.cpp	2014-10-09 12:24:45 +0000
+++ tests/online-accounts-ui/tst_signonui_request.cpp	2015-01-16 17:10:14 +0000
@@ -20,7 +20,6 @@
 
 #include "globals.h"
 #include "signonui-request.h"
-#include "mock/notification-mock.h"
 #include "mock/request-mock.h"
 #include "mock/ui-server-mock.h"
 
@@ -68,8 +67,6 @@
     void testParameters_data();
     void testParameters();
     void testHandler();
-    void testSnapDecision_data();
-    void testSnapDecision();
 
 private:
     bool mustCreateAccount(uint credentialsId) { return credentialsId > 10; }
@@ -167,171 +164,6 @@
     delete handler;
 }
 
-void SignonuiRequestTest::testSnapDecision_data()
-{
-    QTest::addColumn<uint>("credentialsId");
-    QTest::addColumn<QString>("accountName");
-    QTest::addColumn<QString>("clientProfile");
-    QTest::addColumn<QString>("applicationName");
-    QTest::addColumn<bool>("mustAccept");
-    QTest::addColumn<QVariantMap>("result");
-
-    QVariantMap acceptedResult;
-    acceptedResult.insert("some key", QString("some value"));
-
-    QVariantMap declinedResult;
-    declinedResult.insert(SSOUI_KEY_ERROR, SignOn::QUERY_ERROR_CANCELED);
-
-    QVariantMap errorResult;
-    errorResult.insert(SSOUI_KEY_ERROR, SignOn::QUERY_ERROR_FORBIDDEN);
-
-    QTest::newRow("no account") <<
-        uint(0) <<
-        "[e-mail]" <<
-        "com.ubuntu.tests_application_0.3" <<
-        QString() <<
-        false <<
-        errorResult;
-
-    QTest::newRow("invalid account") <<
-        uint(1) <<
-        "[e-mail]" <<
-        "com.ubuntu.tests_application_0.3" <<
-        QString() <<
-        false <<
-        errorResult;
-
-    QTest::newRow("valid application, accepted") <<
-        uint(14231) <<
-        "[e-mail]" <<
-        "com.ubuntu.tests_application_0.3" <<
-        "Easy Mailer" <<
-        true <<
-        acceptedResult;
-
-    QTest::newRow("valid application, declined") <<
-        uint(14231) <<
-        "[e-mail]" <<
-        "com.ubuntu.tests_application_0.3" <<
-        "Easy Mailer" <<
-        false <<
-        declinedResult;
-
-    QTest::newRow("unconfined application, accepted") <<
-        uint(14235) <<
-        "[e-mail]" <<
-        "unconfined" <<
-        "Ubuntu" <<
-        true <<
-        acceptedResult;
-
-    QTest::newRow("unconfined application, declined") <<
-        uint(14235) <<
-        "[e-mail]" <<
-        "unconfined" <<
-        "Ubuntu" <<
-        false <<
-        declinedResult;
-}
-
-void SignonuiRequestTest::testSnapDecision()
-{
-    QString providerId("cool");
-    QFETCH(uint, credentialsId);
-    QFETCH(QString, accountName);
-    QFETCH(QString, clientProfile);
-    QFETCH(QString, applicationName);
-    QFETCH(bool, mustAccept);
-    QFETCH(QVariantMap, result);
-
-    // First, create an account
-    Accounts::Manager *manager = new Accounts::Manager(this);
-    Accounts::Provider provider = manager->provider(providerId);
-    QVERIFY(provider.isValid());
-    if (mustCreateAccount(credentialsId)) {
-        Accounts::Account *account = manager->createAccount(providerId);
-        QVERIFY(account != 0);
-        account->setEnabled(true);
-        account->setDisplayName(accountName);
-        account->setCredentialsId(credentialsId);
-        account->syncAndBlock();
-    }
-
-    /* Then, create a request referring to the same credentials ID of the
-     * created account. */
-    QVariantMap parameters;
-    parameters.insert(SSOUI_KEY_IDENTITY, credentialsId);
-    parameters.insert(SSOUI_KEY_METHOD, "funnyMethod");
-    parameters.insert(SSOUI_KEY_MECHANISM, "funnyMechanism");
-    TestRequest request(clientProfile, parameters);
-    OnlineAccountsUi::RequestPrivate *mockRequest =
-        OnlineAccountsUi::RequestPrivate::mocked(&request);
-    QSignalSpy failCalled(mockRequest,
-                          SIGNAL(failCalled(const QString&, const QString&)));
-    QSignalSpy setResultCalled(mockRequest,
-                               SIGNAL(setResultCalled(const QVariantMap &)));
-    request.start();
-
-    /* Request to show a window; a snap decision should appear instead */
-    QWindow *window = new QWindow;
-    QSignalSpy setWindowCalled(mockRequest,
-                               SIGNAL(setWindowCalled(QWindow*)));
-    request.setWindow(window);
-    QCOMPARE(setWindowCalled.count(), 0);
-    if (mustCreateAccount(credentialsId)) {
-        QCOMPARE(NotificationPrivate::allNotifications.count(), 1);
-    } else {
-        /* If the account is not found, no notification should appear, and an
-         * error returned to the app */
-        QCOMPARE(NotificationPrivate::allNotifications.count(), 0);
-        QCOMPARE(setResultCalled.count(), 1);
-        QCOMPARE(setResultCalled.at(0).at(0).toMap(), result);
-        return;
-    }
-
-    /* Inspect the snap decision contents */
-    Notification *notification =
-        NotificationPrivate::allNotifications.first();
-    NotificationPrivate *mockNotification =
-        NotificationPrivate::mocked(notification);
-    QCOMPARE(mockNotification->m_summary, QString("Authentication request"));
-    QCOMPARE(mockNotification->m_body,
-             QString("Please authorize %1 to access your %2 account %3").
-             arg(applicationName).arg(provider.displayName()).arg(accountName));
-    QVERIFY(mockNotification->m_isSnapDecision);
-
-    /* Invoke the action on the snap decision */
-    QString action = mustAccept ? "continue" : "cancel";
-    QSignalSpy actionInvoked(notification,
-                             SIGNAL(actionInvoked(const QString &)));
-    mockNotification->invokeAction(action);
-    QCOMPARE(actionInvoked.count(), 1);
-    QCOMPARE(actionInvoked.at(0).at(0).toString(), action);
-
-    /* Here we iterate the main loop because the notification object is
-     * destroyed with deleteLater() */
-    QTest::qWait(5);
-
-    if (mustAccept) {
-        QCOMPARE(setWindowCalled.count(), 1);
-        QCOMPARE(setWindowCalled.at(0).at(0), QVariant::fromValue(window));
-        QCOMPARE(failCalled.count(), 0);
-        QCOMPARE(setResultCalled.count(), 0);
-
-        /* deliver the result */
-        request.sendResult(result);
-        QCOMPARE(setResultCalled.count(), 1);
-        QCOMPARE(setResultCalled.at(0).at(0).toMap(), result);
-    } else {
-        QCOMPARE(setWindowCalled.count(), 0);
-        QCOMPARE(failCalled.count(), 0);
-        QCOMPARE(setResultCalled.count(), 1);
-        QCOMPARE(setResultCalled.at(0).at(0).toMap(), result);
-    }
-    delete window;
-    delete manager;
-}
-
 QTEST_MAIN(SignonuiRequestTest);
 
 #include "tst_signonui_request.moc"

=== modified file 'tests/online-accounts-ui/tst_signonui_request.pro'
--- tests/online-accounts-ui/tst_signonui_request.pro	2014-10-14 11:19:19 +0000
+++ tests/online-accounts-ui/tst_signonui_request.pro	2015-01-16 17:10:14 +0000
@@ -27,18 +27,15 @@
 SOURCES += \
     $${ONLINE_ACCOUNTS_UI_DIR}/debug.cpp \
     $${ONLINE_ACCOUNTS_UI_DIR}/signonui-request.cpp \
-    mock/notification-mock.cpp \
     mock/request-mock.cpp \
     mock/qwindow.cpp \
     mock/ui-server-mock.cpp \
     tst_signonui_request.cpp
 
 HEADERS += \
-    $${ONLINE_ACCOUNTS_UI_DIR}/notification.h \
     $${ONLINE_ACCOUNTS_UI_DIR}/request.h \
     $${ONLINE_ACCOUNTS_UI_DIR}/signonui-request.h \
     $${ONLINE_ACCOUNTS_UI_DIR}/ui-server.h \
-    mock/notification-mock.h \
     mock/request-mock.h \
     mock/ui-server-mock.h \
     window-watcher.h