Merge lp:~mardy/online-accounts-api/providers-1627001 into lp:online-accounts-api

[Alberto Mardegan]

Add provider information to public API

Allow clients to retrieve the list of available service providers, consisting of translated display name and icon URL.
Also, add a service() method to the Account class, to get the data associated with each account.

Add provider information to public API

Allow clients to retrieve the list of available service providers, consisting of translated display name and icon URL.
Also, add a service() method to the Account class, to get the data associated with each account.

[Michi Henning (michihenning)]

I may be missing something here, but (not being familiar with the code), it looks like the translated service name is not present? We need the translated name of the service too (such as "Google" or "Dropbox", or their equivalents in Arabic script, or whatever).

[lp:~mardy/online-accounts-api/providers-1627001]

35. By Alberto Mardegan on 2016-11-04

Bump dependency on libaccounts-qt

36. By Alberto Mardegan on 2016-11-07

Add missing files

37. By Alberto Mardegan on 2016-11-07

DOn't use qjsEngine() it doesn't exist in QT 5.4

[Alberto Mardegan (mardy)]

> I may be missing something here, but (not being familiar with the code), it
> looks like the translated service name is not present? We need the translated
> name of the service too (such as "Google" or "Dropbox", or their equivalents
> in Arabic script, or whatever).

It's there, line 549 of the diff. I'll soon prepare a test app to verify that everything is place, in case unit tests are not catching everything.

[lp:~mardy/online-accounts-api/providers-1627001]

38. By Alberto Mardegan on 2016-11-07

more of the same

39. By Alberto Mardegan on 2016-11-07

Cast QList<QString> to QStringList

40. By Alberto Mardegan on 2016-11-07

Don't use Q_GADGET functionality in Qt < 5.5

41. By Alberto Mardegan on 2016-11-07

Fix typo

42. By Alberto Mardegan on 2016-11-07

type conv for qt 5.4

43. By Alberto Mardegan on 2016-11-07

fix

44. By Alberto Mardegan on 2016-11-07

skip test

45. By Alberto Mardegan on 2016-11-07

fix

46. By Alberto Mardegan on 2016-11-08

Fallback to provider's icon and display name

47. By Alberto Mardegan on 2016-11-08

test debugging

48. By Alberto Mardegan on 2016-11-08

fix test

49. By Alberto Mardegan on 2016-11-09

remove debugging

50. By Alberto Mardegan on 2016-11-09

Don't crash if serviceList property is retrieved when the model is not ready

With this fix, we also need a signal to inform the QML engine of when the
property becomes available

51. By Alberto Mardegan on 2016-11-09

Skip missing providers

52. By Alberto Mardegan on 2016-11-09

Expose enums to QML

[Alberto Mardegan (mardy)]

This is implemented and available for testing here: https://bileto.ubuntu.com/#/ticket/2016

See the "Test plan" in that silo for a quick way to test it.

[Alexandre Abreu (abreu-alexandre)]

LGTM

one inlined question

review: Approve

[lp:~mardy/online-accounts-api/providers-1627001]

53. By Alberto Mardegan on 2016-11-10

Remove commented line

=== modified file 'debian/control'
--- debian/control	2016-10-03 07:46:50 +0000
+++ debian/control	2016-11-10 09:12:06 +0000
@@ -6,7 +6,7 @@
                debhelper (>= 9),
                pkg-config,
                python3:any,
-               libaccounts-qt5-dev,
+               libaccounts-qt5-dev (>= 1.15),
                libapparmor-dev,
                libonline-accounts-client-dev (>= 0.7),
                libqtdbusmock1-dev,
 
=== modified file 'src/lib/OnlineAccounts/CMakeLists.txt'
--- src/lib/OnlineAccounts/CMakeLists.txt	2016-11-01 09:48:22 +0000
+++ src/lib/OnlineAccounts/CMakeLists.txt	2016-11-10 09:12:06 +0000
@@ -22,6 +22,7 @@
     manager.cpp
     pending_call.cpp
     request_access_reply.cpp
+    service.cpp
 )
 set_target_properties(${CLIENT_LIB} PROPERTIES
     VERSION 1.0.0
@@ -52,5 +53,6 @@
     PasswordData
     PendingCall pending_call.h
     PendingCallWatcher
+    Service service.h
     DESTINATION include/${CLIENT_LIB}/OnlineAccounts
 )
 
=== added file 'src/lib/OnlineAccounts/Service'
--- src/lib/OnlineAccounts/Service	1970-01-01 00:00:00 +0000
+++ src/lib/OnlineAccounts/Service	2016-11-10 09:12:06 +0000
@@ -0,0 +1,1 @@
+#include "service.h"
 
=== modified file 'src/lib/OnlineAccounts/account.cpp'
--- src/lib/OnlineAccounts/account.cpp	2015-08-26 13:32:38 +0000
+++ src/lib/OnlineAccounts/account.cpp	2016-11-10 09:12:06 +0000
@@ -53,6 +53,11 @@
     }
 }
 
+Service AccountPrivate::service() const
+{
+    return m_manager->d_ptr->service(m_info.service());
+}
+
 Account::Account(AccountPrivate *priv, QObject *parent):
     QObject(parent),
     d_ptr(priv)
@@ -72,6 +77,12 @@
     return d->m_isValid;
 }
 
+Service Account::service() const
+{
+    Q_D(const Account);
+    return d->service();
+}
+
 AccountId Account::id() const
 {
     Q_D(const Account);
 
=== modified file 'src/lib/OnlineAccounts/account.h'
--- src/lib/OnlineAccounts/account.h	2015-08-26 13:32:38 +0000
+++ src/lib/OnlineAccounts/account.h	2016-11-10 09:12:06 +0000
@@ -26,6 +26,7 @@
 
 #include "global.h"
 #include "pending_call.h"
+#include "service.h"
 
 namespace OnlineAccounts {
 
@@ -43,6 +44,8 @@
     /* Returns false if account deleted or disabled */
     bool isValid() const;
 
+    Service service() const;
+
     AccountId id() const;
     QString displayName() const;
     QString serviceId() const;
 
=== modified file 'src/lib/OnlineAccounts/account_p.h'
--- src/lib/OnlineAccounts/account_p.h	2015-03-04 10:01:32 +0000
+++ src/lib/OnlineAccounts/account_p.h	2016-11-10 09:12:06 +0000
@@ -37,6 +37,8 @@
     void setInvalid();
     void update(const AccountInfo &info);
 
+    Service service() const;
+
 private:
     Manager *m_manager;
     AccountInfo m_info;
 
=== modified file 'src/lib/OnlineAccounts/dbus_interface.cpp'
--- src/lib/OnlineAccounts/dbus_interface.cpp	2015-03-03 07:09:50 +0000
+++ src/lib/OnlineAccounts/dbus_interface.cpp	2016-11-10 09:12:06 +0000
@@ -22,6 +22,7 @@
 
 #include <QDBusMetaType>
 #include <QDebug>
+#include <QVariantMap>
 #include <climits>
 
 using namespace OnlineAccounts;
@@ -37,6 +38,7 @@
 
     qDBusRegisterMetaType<AccountInfo>();
     qDBusRegisterMetaType<QList<AccountInfo>>();
+    qDBusRegisterMetaType<QList<QVariantMap>>();
 
     bool ok = connect("AccountChanged", "s(ua{sv})",
                       this, SLOT(onAccountChanged(const QString&,const OnlineAccounts::AccountInfo&)));
 
=== modified file 'src/lib/OnlineAccounts/manager.cpp'
--- src/lib/OnlineAccounts/manager.cpp	2016-11-01 09:48:22 +0000
+++ src/lib/OnlineAccounts/manager.cpp	2016-11-10 09:12:06 +0000
@@ -45,6 +45,7 @@
     q_ptr(q)
 {
     qRegisterMetaType<Account*>();
+    qRegisterMetaType<Service>("OnlineAccounts::Service");
 
     QObject::connect(&m_daemon,
                      SIGNAL(accountChanged(const QString&, const OnlineAccounts::AccountInfo&)),
@@ -125,7 +126,7 @@
 
     Q_ASSERT(m_getAccountsCall);
 
-    QDBusPendingReply<QList<AccountInfo> > reply = *m_getAccountsCall;
+    QDBusPendingReply<QList<AccountInfo>,QList<QVariantMap>> reply = *m_getAccountsCall;
     if (Q_UNLIKELY(reply.isError())) {
         qCWarning(DBG_ONLINE_ACCOUNTS) << "GetAccounts call failed:" <<
             reply.error();
@@ -136,6 +137,12 @@
         Q_FOREACH(const AccountInfo &info, accountInfos) {
             m_accounts.insert({info.id(), info.service()}, AccountData(info));
         }
+
+        QList<QVariantMap> services = reply.argumentAt<1>();
+        for (const QVariantMap &data: services) {
+            Service service(new Service::ServiceData(data));
+            m_services.insert(service.id(), service);
+        }
     }
     m_getAccountsCall->deleteLater();
     m_getAccountsCall = 0;
@@ -197,6 +204,12 @@
     }
 }
 
+QList<Service> Manager::availableServices() const
+{
+    Q_D(const Manager);
+    return d->m_services.values();
+}
+
 QList<Account*> Manager::availableAccounts(const QString &service)
 {
     Q_D(Manager);
 
=== modified file 'src/lib/OnlineAccounts/manager.h'
--- src/lib/OnlineAccounts/manager.h	2016-07-22 05:08:06 +0000
+++ src/lib/OnlineAccounts/manager.h	2016-11-10 09:12:06 +0000
@@ -27,12 +27,14 @@
 #include "error.h"
 #include "global.h"
 #include "pending_call.h"
+#include "service.h"
 
 class QDBusConnection;
 
 namespace OnlineAccounts {
 
 class Account;
+class AccountPrivate;
 class AuthenticationData;
 class RequestAccessReplyPrivate;
 
@@ -44,12 +46,14 @@
 public:
     explicit Manager(const QString &applicationId, QObject *parent = 0);
     Manager(const QString &applicationId, const QDBusConnection &bus,
-            QObject *parent = 0); 
+            QObject *parent = 0);
     ~Manager();
 
     bool isReady() const;
     void waitForReady();
 
+    QList<Service> availableServices() const;
+
     QList<Account*> availableAccounts(const QString &service = QString());
     Account *account(AccountId accountId);
     Account *account(AccountId accountId, const QString &service);
@@ -63,6 +67,7 @@
 
 private:
     friend class Account;
+    friend class AccountPrivate;
     friend class RequestAccessReplyPrivate;
     Q_DECLARE_PRIVATE(Manager)
     Q_DISABLE_COPY(Manager)
 
=== modified file 'src/lib/OnlineAccounts/manager_p.h'
--- src/lib/OnlineAccounts/manager_p.h	2016-07-22 05:08:06 +0000
+++ src/lib/OnlineAccounts/manager_p.h	2016-11-10 09:12:06 +0000
@@ -58,6 +58,11 @@
 
     Account *ensureAccount(const AccountInfo &info);
 
+    static Service serviceFromMap(const QVariantMap &map);
+    Service service(const QString &serviceId) {
+        return m_services.value(serviceId);
+    }
+
 private:
     void retrieveAccounts();
 
@@ -71,6 +76,7 @@
     DBusInterface m_daemon;
     QDBusPendingCallWatcher *m_getAccountsCall;
     QMap<QPair<AccountId,QString>,AccountData> m_accounts;
+    QMap<QString,Service> m_services;
     mutable Manager *q_ptr;
 };
 
 
=== added file 'src/lib/OnlineAccounts/service.cpp'
--- src/lib/OnlineAccounts/service.cpp	1970-01-01 00:00:00 +0000
+++ src/lib/OnlineAccounts/service.cpp	2016-11-10 09:12:06 +0000
@@ -0,0 +1,54 @@
+/*
+ * This file is part of libOnlineAccounts
+ *
+ * Copyright (C) 2016 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 Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "service.h"
+
+#include <QVariantMap>
+#include "OnlineAccountsDaemon/dbus_constants.h"
+
+using namespace OnlineAccounts;
+
+Service::ServiceData::ServiceData(const QVariantMap &map):
+    m_id(map.value(ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID).toString()),
+    m_displayName(map.value(ONLINE_ACCOUNTS_INFO_KEY_DISPLAY_NAME).toString()),
+    m_iconSource(map.value(ONLINE_ACCOUNTS_INFO_KEY_ICON_SOURCE).toString())
+{
+}
+
+Service::Service():
+    d(new ServiceData(QVariantMap()))
+{
+}
+
+Service::Service(const QVariantMap &map):
+    d(new ServiceData(map))
+{
+}
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
+QVariantMap Service::toMap() const
+{
+    return QVariantMap {
+        { "serviceId", id() },
+        { "displayName", displayName() },
+        { "iconSource", iconSource() },
+    };
+}
+#endif
 
=== added file 'src/lib/OnlineAccounts/service.h'
--- src/lib/OnlineAccounts/service.h	1970-01-01 00:00:00 +0000
+++ src/lib/OnlineAccounts/service.h	2016-11-10 09:12:06 +0000
@@ -0,0 +1,83 @@
+/*
+ * This file is part of libOnlineAccounts
+ *
+ * Copyright (C) 2016 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 Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ONLINE_ACCOUNTS_SERVICE_H
+#define ONLINE_ACCOUNTS_SERVICE_H
+
+#include <QObject>
+#include <QSharedData>
+#include <QSharedDataPointer>
+#include <QUrl>
+#include <QVariantMap>
+
+#include "global.h"
+
+namespace OnlineAccounts {
+
+class Manager;
+class ManagerPrivate;
+
+class ONLINE_ACCOUNTS_EXPORT Service
+{
+    Q_GADGET
+    Q_PROPERTY(QString serviceId READ id CONSTANT)
+    Q_PROPERTY(QString displayName READ displayName CONSTANT)
+    Q_PROPERTY(QUrl iconSource READ iconSource CONSTANT)
+
+private:
+    class ServiceData: public QSharedData {
+        ServiceData(const QVariantMap &map);
+        friend class ManagerPrivate;
+        friend class Service;
+        QString m_id;
+        QString m_displayName;
+        QUrl m_iconSource;
+    };
+
+public:
+    Service();
+    ~Service() {}
+
+    Service(const Service &other): d(other.d) {}
+
+    bool isValid() const { return !d->m_id.isEmpty(); }
+    QString id() const { return d->m_id; }
+    QString displayName() const { return d->m_displayName; }
+    QUrl iconSource() const { return d->m_iconSource; }
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
+    QVariantMap toMap() const;
+#endif
+
+protected:
+    Service(const QVariantMap &map);
+
+private:
+    friend class Manager;
+    friend class ManagerPrivate;
+    Service(ServiceData *d): d(d) {};
+    QSharedDataPointer<ServiceData> d;
+};
+
+} // namespace
+
+Q_DECLARE_METATYPE(OnlineAccounts::Service)
+
+#endif // ONLINE_ACCOUNTS_SERVICE_H
 
=== modified file 'src/lib/OnlineAccountsDaemon/CMakeLists.txt'
--- src/lib/OnlineAccountsDaemon/CMakeLists.txt	2015-09-04 08:32:00 +0000
+++ src/lib/OnlineAccountsDaemon/CMakeLists.txt	2016-11-10 09:12:06 +0000
@@ -23,6 +23,7 @@
     authentication_request.cpp
     authenticator.cpp
     client_registry.cpp
+    i18n.cpp
     manager.cpp
     manager_adaptor.cpp
     state_saver.cpp
 
=== modified file 'src/lib/OnlineAccountsDaemon/com.ubuntu.OnlineAccounts.Manager.xml'
--- src/lib/OnlineAccountsDaemon/com.ubuntu.OnlineAccounts.Manager.xml	2015-08-28 14:25:23 +0000
+++ src/lib/OnlineAccountsDaemon/com.ubuntu.OnlineAccounts.Manager.xml	2016-11-10 09:12:06 +0000
@@ -49,6 +49,7 @@
     -->
     <method name="GetAccounts">
       <arg name="filters" type="a{sv}" direction="in" />
+
       <!--
         The return value is a list of account IDs paired with a dictionary of account data.
         This will always include:
@@ -61,9 +62,22 @@
         the framework level.
       -->
       <arg name="accounts" type="a(ua{sv})" direction="out" />
+
+      <!--
+        The returned "services" is a list of dictionaries of the services' data.
+        This will always include:
+        - "serviceId" (s)
+        - "displayName" (s): the translated display name
+        - "iconSource" (s): URL to the service icon; if the URL starts with
+          "image://theme/", then what follows is the symbolic icon name
+      -->
+      <arg name="services" type="aa{sv}" direction="out" />
+
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0"
                   value="QList&lt;AccountInfo&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out1"
+                  value="QList&lt;QVariantMap&gt;"/>
     </method>
 
     <!--
 
=== modified file 'src/lib/OnlineAccountsDaemon/dbus_constants.h'
--- src/lib/OnlineAccountsDaemon/dbus_constants.h	2016-02-11 09:00:13 +0000
+++ src/lib/OnlineAccountsDaemon/dbus_constants.h	2016-11-10 09:12:06 +0000
@@ -42,6 +42,9 @@
 #  define ONLINE_ACCOUNTS_INFO_CHANGE_DISABLED 1
 #  define ONLINE_ACCOUNTS_INFO_CHANGE_UPDATED 2
 
+/* Keys for the service info dictionary */
+#define ONLINE_ACCOUNTS_INFO_KEY_ICON_SOURCE "iconSource"
+
 /* Error codes */
 #define ONLINE_ACCOUNTS_ERROR_PREFIX "com.ubuntu.OnlineAccounts.Error."
 #define ONLINE_ACCOUNTS_ERROR_NO_ACCOUNT \
 
=== added file 'src/lib/OnlineAccountsDaemon/i18n.cpp'
--- src/lib/OnlineAccountsDaemon/i18n.cpp	1970-01-01 00:00:00 +0000
+++ src/lib/OnlineAccountsDaemon/i18n.cpp	2016-11-10 09:12:06 +0000
@@ -0,0 +1,34 @@
+/*
+ * This file is part of OnlineAccountsDaemon
+ *
+ * Copyright (C) 2016 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 Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define NO_TR_OVERRIDE
+#include "i18n.h"
+
+#include <libintl.h>
+
+namespace OnlineAccountsDaemon {
+
+QString translate(const QString &text, const QString &domain)
+{
+    return QString::fromUtf8(dgettext(domain.toUtf8().constData(),
+                                      text.toUtf8().constData()));
+}
+
+}; // namespace
 
=== added file 'src/lib/OnlineAccountsDaemon/i18n.h'
--- src/lib/OnlineAccountsDaemon/i18n.h	1970-01-01 00:00:00 +0000
+++ src/lib/OnlineAccountsDaemon/i18n.h	2016-11-10 09:12:06 +0000
@@ -0,0 +1,32 @@
+/*
+ * This file is part of OnlineAccountsDaemon
+ *
+ * Copyright (C) 2016 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 Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ONLINE_ACCOUNTS_DAEMON_I18N_H
+#define ONLINE_ACCOUNTS_DAEMON_I18N_H
+
+#include <QString>
+
+namespace OnlineAccountsDaemon {
+
+QString translate(const QString &text, const QString &domain);
+
+} // namespace
+
+#endif // ONLINE_ACCOUNTS_DAEMON_I18N_H
 
=== modified file 'src/lib/OnlineAccountsDaemon/manager.cpp'
--- src/lib/OnlineAccountsDaemon/manager.cpp	2016-09-28 13:09:06 +0000
+++ src/lib/OnlineAccountsDaemon/manager.cpp	2016-11-10 09:12:06 +0000
@@ -36,6 +36,7 @@
 #include "authenticator.h"
 #include "client_registry.h"
 #include "dbus_constants.h"
+#include "i18n.h"
 #include "manager_adaptor.h"
 #include "state_saver.h"
 
@@ -78,8 +79,10 @@
                                     const QStringList &clients);
 
     AccountInfo readAccountInfo(const Accounts::AccountService *as);
+    QList<QVariantMap> buildServiceList(const Accounts::Application &app) const;
     QList<AccountInfo> getAccounts(const QVariantMap &filters,
-                                   const CallContext &context);
+                                   const CallContext &context,
+                                   QList<QVariantMap> &services);
     void authenticate(uint accountId, const QString &serviceId,
                       bool interactive, bool invalidate,
                       const QVariantMap &parameters,
@@ -89,6 +92,8 @@
                        const CallContext &context);
     bool canAccess(const QString &context, const QString &serviceId);
 
+    static QString applicationIdFromLabel(const QString &label);
+
     void notifyAccountChange(const ActiveAccount &account, uint change);
 
 private Q_SLOTS:
@@ -344,22 +349,82 @@
     return AccountInfo(as->account()->id(), info);
 }
 
+QList<QVariantMap>
+ManagerPrivate::buildServiceList(const Accounts::Application &app) const
+{
+    QList<QVariantMap> services;
+
+    const auto serviceList = m_manager.serviceList(app);
+    for (const Accounts::Service &service: serviceList) {
+        QString displayName = translate(service.displayName(),
+                                        service.trCatalog());
+        QString icon = service.iconName();
+
+        /* Applications might declare support for a service while the provider
+         * (and account plugin) for that account is not installed. We probably
+         * don't want to include these services in the list, as it would lead
+         * to empty/invalid UI elements. */
+        Accounts::Provider provider = m_manager.provider(service.provider());
+        if (!provider.isValid()) continue;
+
+        /* Now check the service data; if either display name or icon are
+         * empty, fetch this information from the provider file, as a fallback
+         */
+        if (displayName.isEmpty() ||
+            // sometimes we use a '.' as display name placeholder
+            displayName == ".") {
+            displayName = translate(provider.displayName(),
+                                    provider.trCatalog());
+        }
+        if (icon.isEmpty()) {
+            icon = provider.iconName();
+        }
+
+        QString iconSource;
+        if (icon.startsWith('/')) {
+            iconSource = QStringLiteral("file:/") + icon;
+        } else {
+            iconSource = QStringLiteral("image://theme/") + icon;
+        }
+
+        services.append({
+            { ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID, service.name() },
+            { ONLINE_ACCOUNTS_INFO_KEY_DISPLAY_NAME, displayName },
+            { ONLINE_ACCOUNTS_INFO_KEY_ICON_SOURCE, iconSource },
+        });
+    }
+
+    return services;
+}
+
 QList<AccountInfo> ManagerPrivate::getAccounts(const QVariantMap &filters,
-                                               const CallContext &context)
+                                               const CallContext &context,
+                                               QList<QVariantMap> &services)
 {
     QString desiredApplicationId = filters.value("applicationId").toString();
     QString desiredServiceId = filters.value("serviceId").toString();
     Accounts::AccountId desiredAccountId = filters.value("accountId").toUInt();
 
-    Accounts::Application application = desiredApplicationId.isEmpty() ?
-        Accounts::Application() : m_manager.application(desiredApplicationId);
-
-    if (application.isValid() &&
-        canAccess(context.securityContext(), desiredApplicationId)) {
+    QString applicationId = desiredApplicationId.isEmpty() ?
+        applicationIdFromLabel(context.securityContext()) : desiredApplicationId;
+
+    Accounts::Application application = m_manager.application(applicationId);
+
+    QList<AccountInfo> accounts;
+
+    if (!application.isValid() ||
+        !canAccess(context.securityContext(), applicationId)) {
+        if (!desiredApplicationId.isEmpty()) {
+            context.sendError(ONLINE_ACCOUNTS_ERROR_PERMISSION_DENIED,
+                              QString("App '%1' cannot act as '%2'").
+                              arg(applicationId).arg(desiredApplicationId));
+            return accounts;
+        }
+    } else {
         m_clients.insert(context.clientName(), application);
     }
 
-    QList<AccountInfo> accounts;
+    services = buildServiceList(application);
 
     Q_FOREACH(Accounts::AccountId accountId, m_manager.accountListEnabled()) {
         if (desiredAccountId != 0 && accountId != desiredAccountId) {
@@ -473,6 +538,16 @@
     return serviceId.left(pos) == pkgname;
 }
 
+QString ManagerPrivate::applicationIdFromLabel(const QString &label)
+{
+    QStringList parts = label.split('_');
+    if (parts.count() == 3) {
+        return QStringList(parts.mid(0, 2)).join('_');
+    } else {
+        return QString();
+    }
+}
+
 void ManagerPrivate::onAccountServiceEnabled(bool enabled)
 {
     auto as = qobject_cast<Accounts::AccountService*>(sender());
@@ -553,10 +628,11 @@
 }
 
 QList<AccountInfo> Manager::getAccounts(const QVariantMap &filters,
-                                        const CallContext &context)
+                                        const CallContext &context,
+                                        QList<QVariantMap> &services)
 {
     Q_D(Manager);
-    return d->getAccounts(filters, context);
+    return d->getAccounts(filters, context, services);
 }
 
 void Manager::authenticate(uint accountId, const QString &serviceId,
 
=== modified file 'src/lib/OnlineAccountsDaemon/manager.h'
--- src/lib/OnlineAccountsDaemon/manager.h	2015-09-03 13:28:30 +0000
+++ src/lib/OnlineAccountsDaemon/manager.h	2016-11-10 09:12:06 +0000
@@ -52,7 +52,8 @@
     bool isIdle() const;
 
     QList<AccountInfo> getAccounts(const QVariantMap &filters,
-                                   const CallContext &context);
+                                   const CallContext &context,
+                                   QList<QVariantMap> &services);
     void authenticate(uint accountId, const QString &serviceId,
                       bool interactive, bool invalidate,
                       const QVariantMap &parameters,
 
=== modified file 'src/lib/OnlineAccountsDaemon/manager_adaptor.cpp'
--- src/lib/OnlineAccountsDaemon/manager_adaptor.cpp	2015-08-28 14:25:23 +0000
+++ src/lib/OnlineAccountsDaemon/manager_adaptor.cpp	2016-11-10 09:12:06 +0000
@@ -147,6 +147,7 @@
     qRegisterMetaType<QList<AccountInfo> >("QList<AccountInfo>");
     qDBusRegisterMetaType<AccountInfo>();
     qDBusRegisterMetaType<QList<AccountInfo>>();
+    qDBusRegisterMetaType<QList<QVariantMap>>();
 
     setAutoRelaySignals(false);
 }
@@ -175,10 +176,13 @@
     return QVariantMap();
 }
 
-QList<AccountInfo> ManagerAdaptor::GetAccounts(const QVariantMap &filters)
+void ManagerAdaptor::GetAccounts(const QVariantMap &filters,
+                                 QList<AccountInfo> &accounts,
+                                 QList<QVariantMap> &services)
 {
-    return parent()->getAccounts(filters,
-                                 CallContext(dbusContext()));
+    accounts = parent()->getAccounts(filters,
+                                     CallContext(dbusContext()),
+                                     services);
 }
 
 AccountInfo ManagerAdaptor::RequestAccess(const QString &serviceId,
 
=== modified file 'src/lib/OnlineAccountsDaemon/manager_adaptor.h'
--- src/lib/OnlineAccountsDaemon/manager_adaptor.h	2015-09-02 11:42:04 +0000
+++ src/lib/OnlineAccountsDaemon/manager_adaptor.h	2016-11-10 09:12:06 +0000
@@ -85,6 +85,7 @@
 "    <method name=\"GetAccounts\">\n"
 "      <arg direction=\"in\" type=\"a{sv}\" name=\"filters\"/>\n"
 "      <arg direction=\"out\" type=\"a(ua{sv})\" name=\"accounts\"/>\n"
+"      <arg direction=\"out\" type=\"aa{sv}\" name=\"services\"/>\n"
 "    </method>\n"
 "    <method name=\"Authenticate\">\n"
 "      <arg direction=\"in\" type=\"u\" name=\"accountId\"/>\n"
@@ -123,7 +124,9 @@
     QVariantMap Authenticate(uint accountId, const QString &serviceId,
                              bool interactive, bool invalidate,
                              const QVariantMap &parameters);
-    QList<AccountInfo> GetAccounts(const QVariantMap &filters);
+    void GetAccounts(const QVariantMap &filters,
+                     QList<AccountInfo> &accounts,
+                     QList<QVariantMap> &services);
     AccountInfo RequestAccess(const QString &serviceId,
                               const QVariantMap &parameters,
                               QVariantMap &credentials);
 
=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/account.cpp'
--- src/lib/Ubuntu/OnlineAccounts.2/account.cpp	2016-01-13 14:23:12 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/account.cpp	2016-11-10 09:12:06 +0000
@@ -26,6 +26,9 @@
 #include "OnlineAccounts/AuthenticationReply"
 #include "OnlineAccounts/PendingCall"
 
+#include <QDebug>
+#include <QJSEngine>
+
 using namespace OnlineAccountsModule;
 
 namespace OnlineAccountsModule {
@@ -36,20 +39,25 @@
     Q_DECLARE_PUBLIC(Account)
 
 public:
-    AccountPrivate(OnlineAccounts::Account *account, Account *q);
+    AccountPrivate(OnlineAccounts::Account *account, QJSEngine *engine,
+                   Account *q);
 
 private Q_SLOTS:
     void onAuthenticationFinished();
 
 private:
     OnlineAccounts::Account *m_account;
+    QJSEngine *m_engine;
     mutable Account *q_ptr;
 };
 
 } // namespace
 
-AccountPrivate::AccountPrivate(OnlineAccounts::Account *account, Account *q):
+AccountPrivate::AccountPrivate(OnlineAccounts::Account *account,
+                               QJSEngine *engine,
+                               Account *q):
     m_account(account),
+    m_engine(engine),
     q_ptr(q)
 {
     QObject::connect(account, SIGNAL(changed()),
@@ -122,9 +130,10 @@
  * \endlist
  */
 
-Account::Account(OnlineAccounts::Account *account, QObject *parent):
+Account::Account(OnlineAccounts::Account *account, QJSEngine *engine,
+                 QObject *parent):
     QObject(parent),
-    d_ptr(new AccountPrivate(account, this))
+    d_ptr(new AccountPrivate(account, engine, this))
 {
 }
 
@@ -187,6 +196,27 @@
 }
 
 /*!
+ * \qmlproperty int Account::service
+ *
+ * Service data associated with this account. This is an object containing the
+ * following properties:
+ * \list
+ *   \li \c serviceId - same service ID returned by Account::serviceId
+ *   \li \c displayName - the localized display name for the service
+ *   \li \c iconSource - URL for the icon; can be a "file://" URL to a local
+ *   file, or an icon from the theme if the URL starts with "image://theme/"
+ */
+QJSValue Account::service() const
+{
+    Q_D(const Account);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+    return d->m_engine->toScriptValue(d->m_account->service());
+#else
+    return d->m_engine->toScriptValue(d->m_account->service().toMap());
+#endif
+}
+
+/*!
  * \qmlproperty enumeration Account::authenticationMethod
  *
  * The authentication method used when authenticating with the account.
 
=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/account.h'
--- src/lib/Ubuntu/OnlineAccounts.2/account.h	2016-01-13 14:23:12 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/account.h	2016-11-10 09:12:06 +0000
@@ -21,10 +21,13 @@
 #ifndef ONLINE_ACCOUNTS_MODULE_ACCOUNT_H
 #define ONLINE_ACCOUNTS_MODULE_ACCOUNT_H
 
+#include <QJSValue>
 #include <QObject>
 #include <QString>
 #include <QVariantMap>
 
+class QJSEngine;
+
 namespace OnlineAccounts {
 class Account;
 }
@@ -40,6 +43,7 @@
     Q_PROPERTY(QString displayName READ displayName NOTIFY accountChanged)
     Q_PROPERTY(int accountId READ accountId CONSTANT)
     Q_PROPERTY(QString serviceId READ serviceId CONSTANT)
+    Q_PROPERTY(QJSValue service READ service CONSTANT)
     Q_PROPERTY(AuthenticationMethod authenticationMethod \
                READ authenticationMethod CONSTANT)
     Q_PROPERTY(QVariantMap settings READ settings NOTIFY accountChanged)
@@ -64,13 +68,15 @@
         ErrorCodeInteractionRequired,
     };
 
-    explicit Account(OnlineAccounts::Account *account, QObject *parent = 0);
+    explicit Account(OnlineAccounts::Account *account, QJSEngine *engine,
+                     QObject *parent = 0);
     ~Account();
 
     bool isValid() const;
     QString displayName() const;
     int accountId() const;
     QString serviceId() const;
+    QJSValue service() const;
     AuthenticationMethod authenticationMethod() const;
     QVariantMap settings() const;
 
@@ -90,4 +96,7 @@
 
 } // namespace
 
+Q_DECLARE_METATYPE(OnlineAccountsModule::Account::AuthenticationMethod)
+Q_DECLARE_METATYPE(OnlineAccountsModule::Account::ErrorCode)
+
 #endif // ONLINE_ACCOUNTS_MODULE_ACCOUNT_H
 
=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/account_model.cpp'
--- src/lib/Ubuntu/OnlineAccounts.2/account_model.cpp	2016-01-18 12:23:07 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/account_model.cpp	2016-11-10 09:12:06 +0000
@@ -30,6 +30,7 @@
 #include <QDebug>
 #include <QQmlEngine>
 #include <QVariantMap>
+#include <QtQml>
 
 using namespace OnlineAccountsModule;
 
@@ -85,6 +86,7 @@
     roleNames[AccountModel::AuthenticationMethodRole] = "authenticationMethod";
     roleNames[AccountModel::SettingsRole] = "settings";
     roleNames[AccountModel::AccountRole] = "account";
+    roleNames[AccountModel::ServiceRole] = "service";
 }
 
 void AccountModelPrivate::queueUpdate()
@@ -122,13 +124,17 @@
 
 Account *AccountModelPrivate::handleAccount(OnlineAccounts::Account *account)
 {
+    Q_Q(AccountModel);
+
     /* First, check if the account is already handled */
     Q_FOREACH(Account *a, m_accounts) {
         if (account == a->internalObject()) {
             return a;
         }
     }
-    Account *a = new Account(account, this);
+
+    QQmlEngine *engine = qmlEngine(q);
+    Account *a = new Account(account, engine, this);
     QQmlEngine::setObjectOwnership(a, QQmlEngine::CppOwnership);
     QObject::connect(a, SIGNAL(validChanged()),
                      this, SLOT(onAccountValidChanged()));
@@ -386,6 +392,24 @@
     return objects;
 }
 
+QJSValue AccountModel::serviceList() const
+{
+    Q_D(const AccountModel);
+    QJSEngine *engine = qmlEngine(this);
+    QJSValue ret = engine->newArray();
+    if (!d->m_manager) return ret;
+    int i = 0;
+    Q_FOREACH(const auto &service, d->m_manager->availableServices()) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+        QJSValue v = engine->toScriptValue(service);
+#else
+        QJSValue v = engine->toScriptValue(service.toMap());
+#endif
+        ret.setProperty(i++, v);
+    }
+    return ret;
+}
+
 /*!
  * \qmlsignal AccountModel::accessReply(jsobject reply, jsobject authenticationData)
  *
@@ -495,6 +519,9 @@
     case AccountRole:
         ret = QVariant::fromValue<QObject*>(account);
         break;
+    case ServiceRole:
+        ret = QVariant::fromValue(account->service());
+        break;
     }
 
     return ret;
 
=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/account_model.h'
--- src/lib/Ubuntu/OnlineAccounts.2/account_model.h	2016-01-18 12:23:07 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/account_model.h	2016-11-10 09:12:06 +0000
@@ -21,8 +21,12 @@
 #ifndef ONLINE_ACCOUNTS_MODULE_ACCOUNT_MODEL_H
 #define ONLINE_ACCOUNTS_MODULE_ACCOUNT_MODEL_H
 
+#include "OnlineAccounts/Service"
+
 #include <QAbstractListModel>
 #include <QQmlParserStatus>
+#include <QQmlListProperty>
+#include <QJSValue>
 #include <QString>
 #include <QVariant>
 
@@ -43,6 +47,8 @@
                WRITE setServiceId NOTIFY serviceIdChanged)
     Q_PROPERTY(QList<QObject*> accountList READ accountList \
                NOTIFY accountListChanged)
+    Q_PROPERTY(QJSValue serviceList READ serviceList \
+               NOTIFY isReadyChanged)
 
 public:
     enum Roles {
@@ -53,6 +59,7 @@
         AuthenticationMethodRole,
         SettingsRole,
         AccountRole,
+        ServiceRole,
     };
 
     explicit AccountModel(QObject *parent = 0);
@@ -68,6 +75,8 @@
 
     QList<QObject*> accountList() const;
 
+    QJSValue serviceList() const;
+
     Q_INVOKABLE void requestAccess(const QString &service,
                                    const QVariantMap &params);
 
 
=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/plugin.cpp'
--- src/lib/Ubuntu/OnlineAccounts.2/plugin.cpp	2015-07-31 12:44:30 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/plugin.cpp	2016-11-10 09:12:06 +0000
@@ -20,6 +20,7 @@
 
 #include "plugin.h"
 
+#include "account.h"
 #include "account_model.h"
 
 #include <QDebug>
@@ -32,4 +33,8 @@
     qDebug() << Q_FUNC_INFO << uri;
 
     qmlRegisterType<AccountModel>(uri, 2, 0, "AccountModel");
+    qmlRegisterUncreatableType<Account>(uri, 2, 0, "Account",
+                                        "Cannot be created from QML");
+    qmlRegisterUncreatableType<OnlineAccounts::Service>(uri, 2, 0, "Service",
+                                                        "Cannot be created from QML");
 }
 
=== modified file 'tests/daemon/functional_tests/data/com.ubuntu.tests_application.application'
--- tests/daemon/functional_tests/data/com.ubuntu.tests_application.application	2015-07-07 12:58:49 +0000
+++ tests/daemon/functional_tests/data/com.ubuntu.tests_application.application	2016-11-10 09:12:06 +0000
@@ -5,9 +5,12 @@
   <desktop-entry>mailer.desktop</desktop-entry>
 
   <services>
-    <service id="coolshare">
+    <service id="com.ubuntu.tests_coolshare">
       <description>Mailer can even share stuff on CoolShare</description>
     </service>
+    <service id="missing-provider">
+      <description>service exists, provider does not</description>
+    </service>
   </services>
 	<profile>com.ubuntu.tests_application_0.3</profile>
 </application>
 
=== modified file 'tests/daemon/functional_tests/data/com.ubuntu.tests_coolshare.service'
--- tests/daemon/functional_tests/data/com.ubuntu.tests_coolshare.service	2016-09-28 13:09:06 +0000
+++ tests/daemon/functional_tests/data/com.ubuntu.tests_coolshare.service	2016-11-10 09:12:06 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<service id="coolshare">
+<service id="com.ubuntu.tests_coolshare">
   <type>sharing</type>
   <name>Cool Share</name>
   <icon>general_otherservice</icon>
 
=== modified file 'tests/daemon/functional_tests/data/coolmail.service'
--- tests/daemon/functional_tests/data/coolmail.service	2015-07-02 08:29:48 +0000
+++ tests/daemon/functional_tests/data/coolmail.service	2016-11-10 09:12:06 +0000
@@ -2,7 +2,6 @@
 <service id="coolmail">
   <type>e-mail</type>
   <name>Cool Mail</name>
-  <icon>general_myservice</icon>
   <provider>cool</provider>
 
   <template>
 
=== added file 'tests/daemon/functional_tests/data/missing-provider.service'
--- tests/daemon/functional_tests/data/missing-provider.service	1970-01-01 00:00:00 +0000
+++ tests/daemon/functional_tests/data/missing-provider.service	2016-11-10 09:12:06 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<service id="missing-provider">
+  <type>sharing</type>
+  <name>Orphan</name>
+  <icon>icon_missing_provider</icon>
+  <provider>missing</provider>
+
+  <template>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
+  </template>
+</service>
 
=== modified file 'tests/daemon/functional_tests/functional_tests.cpp'
--- tests/daemon/functional_tests/functional_tests.cpp	2016-10-13 13:42:12 +0000
+++ tests/daemon/functional_tests/functional_tests.cpp	2016-11-10 09:12:06 +0000
@@ -60,8 +60,28 @@
     return qstrdup(doc.toJson(QJsonDocument::Compact).data());
 }
 
+template<>
+char *toString(const QSet<QVariantMap> &set)
+{
+    QByteArray ba = "QSet<QVariantMap>(";
+    QStringList list;
+    Q_FOREACH(const QVariantMap &map, set) {
+        list.append(QJsonDocument::fromVariant(map).toJson(QJsonDocument::Compact));
+    }
+    ba += list.join(", ");
+    ba += ")";
+    return qstrdup(ba.data());
+}
+
 } // QTest namespace
 
+static inline uint qHash(const QVariantMap &m, uint seed = 0)
+{
+    QString signature = QStringList(m.keys()).join(' ') +
+        m.value(ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID).toString();
+    return ::qHash(signature, seed);
+}
+
 class TestProcess: public QProcess
 {
     Q_OBJECT
@@ -90,6 +110,12 @@
     void quit() { write("\n"); waitForFinished(); }
 
     QList<AccountInfo> getAccounts(const QVariantMap &filters) {
+        QList<QVariantMap> services;
+        return getAccounts(filters, services);
+    }
+
+    QList<AccountInfo> getAccounts(const QVariantMap &filters,
+                                   QList<QVariantMap> &services) {
         QJsonDocument doc(QJsonObject::fromVariantMap(filters));
         m_replyExpected = true;
         write("GetAccounts -f ");
@@ -97,16 +123,31 @@
 
         waitForReadyRead();
         doc = QJsonDocument::fromJson(readLine());
+        qDebug() << "Got Json:" << doc;
         m_replyExpected = false;
         QList<AccountInfo> accountInfos;
-        Q_FOREACH(const QJsonValue &v, doc.array()) {
+        if (checkError(doc)) return accountInfos;
+        const QJsonArray accountsJson = doc.array().at(0).toArray();
+        const QJsonArray servicesJson = doc.array().at(1).toArray();
+        Q_FOREACH(const QJsonValue &v, accountsJson) {
             QJsonArray a = v.toArray();
             accountInfos.append(AccountInfo(a.at(0).toInt(),
                                             a.at(1).toObject().toVariantMap()));
         }
+        Q_FOREACH(const QJsonValue &v, servicesJson) {
+            services.append(v.toObject().toVariantMap());
+        }
         return accountInfos;
     }
 
+    QString errorName() const { return m_errorName; }
+
+protected:
+    bool checkError(const QJsonDocument &doc) {
+        m_errorName = doc.object().value("error").toString();
+        return !m_errorName.isEmpty();
+    }
+
 private Q_SLOTS:
     void onReadyRead() {
         if (m_replyExpected) return;
@@ -128,6 +169,7 @@
 
 private:
     QString m_uniqueName;
+    QString m_errorName;
     bool m_replyExpected;
 };
 
@@ -275,35 +317,113 @@
     delete m_dbus;
 }
 
+
 void FunctionalTests::testGetAccountsFiltering_data()
 {
     QTest::addColumn<QVariantMap>("filters");
     QTest::addColumn<QString>("securityContext");
+    QTest::addColumn<QString>("expectedError");
     QTest::addColumn<QList<int> >("expectedAccountIds");
+    QTest::addColumn<QList<QVariantMap> >("expectedServices");
 
     QVariantMap filters;
     QTest::newRow("empty filters") <<
         filters <<
         "unconfined" <<
-        (QList<int>() << 1 << 2 << 3);
+        QString() <<
+        (QList<int>() << 1 << 2 << 3) <<
+        QList<QVariantMap> {};
 
     QTest::newRow("empty filters, confined") <<
         filters <<
         "com.ubuntu.tests_application_0.2" <<
-        (QList<int>() << 2);
-
-    filters[ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID] = "coolmail";
-    QTest::newRow("by service ID") <<
-        filters <<
-        "unconfined" <<
-        (QList<int>() << 1 << 3);
+        QString() <<
+        (QList<int>() << 2) <<
+        QList<QVariantMap> {
+            {
+                { ONLINE_ACCOUNTS_INFO_KEY_DISPLAY_NAME, "Cool Share" },
+                { ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID, "com.ubuntu.tests_coolshare" },
+                { ONLINE_ACCOUNTS_INFO_KEY_ICON_SOURCE, "image://theme/general_otherservice" },
+            },
+        };
+
+    filters[ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID] = "coolmail";
+    QTest::newRow("unconfined, by service ID") <<
+        filters <<
+        "unconfined" <<
+        QString() <<
+        (QList<int>() << 1 << 3) <<
+        QList<QVariantMap> {};
+    filters.clear();
+
+    filters[ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID] = "coolmail";
+    QTest::newRow("confined, by service ID") <<
+        filters <<
+        "com.ubuntu.tests_application_0.2" <<
+        QString() <<
+        (QList<int>()) <<
+        QList<QVariantMap> {
+            {
+                { ONLINE_ACCOUNTS_INFO_KEY_DISPLAY_NAME, "Cool Share" },
+                { ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID, "com.ubuntu.tests_coolshare" },
+                { ONLINE_ACCOUNTS_INFO_KEY_ICON_SOURCE, "image://theme/general_otherservice" },
+            },
+        };
+    filters.clear();
+
+    filters["applicationId"] = "com.ubuntu.tests_application";
+    QTest::newRow("by app ID") <<
+        filters <<
+        "unconfined" <<
+        QString() <<
+        (QList<int>() << 2) <<
+        QList<QVariantMap> {
+            {
+                { ONLINE_ACCOUNTS_INFO_KEY_DISPLAY_NAME, "Cool Share" },
+                { ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID, "com.ubuntu.tests_coolshare" },
+                { ONLINE_ACCOUNTS_INFO_KEY_ICON_SOURCE, "image://theme/general_otherservice" },
+            },
+        };
+    filters.clear();
+
+    filters["applicationId"] = "mailer";
+    QTest::newRow("confined app requesting other app ID") <<
+        filters <<
+        "com.ubuntu.tests_application_0.2" <<
+        ONLINE_ACCOUNTS_ERROR_PERMISSION_DENIED <<
+        (QList<int>()) <<
+        QList<QVariantMap> {};
+    filters.clear();
+
+    filters["applicationId"] = "mailer";
+    QTest::newRow("by app ID, with service fallback") <<
+        filters <<
+        "unconfined" <<
+        QString() <<
+        QList<int>{ 3, 1 } <<
+        QList<QVariantMap> {
+            {
+                { ONLINE_ACCOUNTS_INFO_KEY_DISPLAY_NAME, "OAuth 1 test" },
+                { ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID, "oauth1auth" },
+                { ONLINE_ACCOUNTS_INFO_KEY_ICON_SOURCE, "image://theme/general_myservice" },
+            },
+            {
+                { ONLINE_ACCOUNTS_INFO_KEY_DISPLAY_NAME, "Cool Mail" },
+                { ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID, "coolmail" },
+                { ONLINE_ACCOUNTS_INFO_KEY_ICON_SOURCE, "image://theme/general_myprovider" },
+            },
+        };
+    filters.clear();
+
 }
 
 void FunctionalTests::testGetAccountsFiltering()
 {
     QFETCH(QVariantMap, filters);
     QFETCH(QString, securityContext);
+    QFETCH(QString, expectedError);
     QFETCH(QList<int>, expectedAccountIds);
+    QFETCH(QList<QVariantMap>, expectedServices);
 
     DaemonInterface *daemon = new DaemonInterface(m_dbus->sessionConnection());
 
@@ -313,7 +433,10 @@
     };
     m_dbus->dbusApparmor().setCredentials(testProcess.uniqueName(), credentials);
 
-    QList<AccountInfo> accountInfos = testProcess.getAccounts(filters);
+    QList<QVariantMap> services;
+    QList<AccountInfo> accountInfos = testProcess.getAccounts(filters, services);
+    QCOMPARE(testProcess.errorName(), expectedError);
+    QCOMPARE(services.toSet(), expectedServices.toSet());
     QList<int> accountIds;
     Q_FOREACH(const AccountInfo &info, accountInfos) {
         accountIds.append(info.id() + m_firstAccountId);
 
=== modified file 'tests/daemon/functional_tests/test_process.py'
--- tests/daemon/functional_tests/test_process.py	2016-07-19 11:55:45 +0000
+++ tests/daemon/functional_tests/test_process.py	2016-11-10 09:12:06 +0000
@@ -30,8 +30,11 @@
         filters = dbus.Dictionary(signature='sv')
         if args.filters:
             filters.update(json.loads(args.filters))
-        print('%s' % json.dumps(self.manager.GetAccounts(filters), sort_keys=True),
-                flush=True)
+        try:
+            print('%s' % json.dumps(self.manager.GetAccounts(filters), sort_keys=True),
+                    flush=True)
+        except dbus.exceptions.DBusException as err:
+            print('{ "error": "%s" }' % err.get_dbus_name(), flush=True)
 
     def on_account_changed(self, serviceId, accountInfo):
         info = json.dumps(accountInfo, sort_keys=True)
 
=== modified file 'tests/lib/OnlineAccounts/functional_tests/functional_tests.cpp'
--- tests/lib/OnlineAccounts/functional_tests/functional_tests.cpp	2016-07-22 05:08:06 +0000
+++ tests/lib/OnlineAccounts/functional_tests/functional_tests.cpp	2016-11-10 09:12:06 +0000
@@ -26,18 +26,22 @@
 #include "OnlineAccounts/account_info.h"
 #include "OnlineAccountsDaemon/dbus_constants.h"
 #include <QDBusConnection>
+#include <QJsonDocument>
+#include <QJsonObject>
 #include <QObject>
 #include <QSignalSpy>
 #include <QTest>
 #include <libqtdbusmock/DBusMock.h>
 
 namespace QTest {
+
 template<>
 char *toString(const QVariantMap &map)
 {
     QJsonDocument doc(QJsonObject::fromVariantMap(map));
     return qstrdup(doc.toJson(QJsonDocument::Compact).data());
 }
+
 } // QTest namespace
 
 class FunctionalTests: public QObject
@@ -82,6 +86,8 @@
     void testManagerReady();
     void testManagerAvailableAccounts_data();
     void testManagerAvailableAccounts();
+    void testManagerAvailableServices_data();
+    void testManagerAvailableServices();
     void testManagerAccount();
     void testManagerRequestAccess_data();
     void testManagerRequestAccess();
@@ -132,7 +138,7 @@
     QFETCH(bool, haveGetAccountsMethod);
 
     if (haveGetAccountsMethod) {
-        addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})", "ret = []");
+        addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})aa{sv}", "ret = ([], [])");
     }
     OnlineAccounts::Manager manager("my-app");
 
@@ -150,12 +156,12 @@
     QTest::addColumn<QStringList>("expectedDisplayNames");
 
     QTest::newRow("no accounts") <<
-        "ret = []" <<
+        "ret = ([], [])" <<
         QList<int>() <<
         QStringList();
 
     QTest::newRow("one account, no data") <<
-        "ret = [(1, {'displayName': 'Tom'})]" <<
+        "ret = ([(1, {'displayName': 'Tom'})], [])" <<
         (QList<int>() << 1) <<
         (QStringList() << "Tom");
 }
@@ -166,7 +172,7 @@
     QFETCH(QList<int>, expectedIds);
     QFETCH(QStringList, expectedDisplayNames);
 
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})", reply);
+    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})aa{sv}", reply);
     OnlineAccounts::Manager manager("my-app");
 
     manager.waitForReady();
@@ -181,10 +187,77 @@
     QCOMPARE(displayNames, expectedDisplayNames);
 }
 
+void FunctionalTests::testManagerAvailableServices_data()
+{
+    QTest::addColumn<QString>("reply");
+    QTest::addColumn<QList<QVariantMap>>("expectedServices");
+
+    QTest::newRow("no services") <<
+        "ret = ([], [])" <<
+        QList<QVariantMap> {};
+
+    QTest::newRow("one service") <<
+        "ret = ([], [{"
+        "'" ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID "': 'app_coolshare',"
+        "'" ONLINE_ACCOUNTS_INFO_KEY_DISPLAY_NAME "': 'Cool Share',"
+        "'" ONLINE_ACCOUNTS_INFO_KEY_ICON_SOURCE "': 'image://theme/coolshare',"
+        "}])" <<
+        QList<QVariantMap> {
+            {
+                { "serviceId", "app_coolshare" },
+                { "displayName", "Cool Share" },
+                { "iconSource", "image://theme/coolshare"},
+            },
+        };
+}
+
+void FunctionalTests::testManagerAvailableServices()
+{
+    QFETCH(QString, reply);
+    QFETCH(QList<QVariantMap>, expectedServices);
+
+    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})aa{sv}", reply);
+    OnlineAccounts::Manager manager("my-app");
+
+    manager.waitForReady();
+    const auto availableServices = manager.availableServices();
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+    QList<QVariantMap> services;
+    for (const OnlineAccounts::Service &service: availableServices) {
+        QVariantMap data;
+
+        const QMetaObject &mo = service.staticMetaObject;
+        for (int i = mo.propertyOffset(); i < mo.propertyCount(); i++) {
+            const QMetaProperty prop = mo.property(i);
+            data.insert(prop.name(), prop.readOnGadget(&service));
+        }
+
+        services.append(data);
+    }
+
+    QCOMPARE(services, expectedServices);
+#else
+    QCOMPARE(availableServices.count(), expectedServices.count());
+#endif
+}
+
 void FunctionalTests::testManagerAccount()
 {
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})",
-                    "ret = [(1, {'displayName': 'John'})]");
+    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})aa{sv}",
+                    "ret = (["
+                    "  (1, {"
+                    "    'displayName': 'John',"
+                    "    'serviceId': 'app_coolshare',"
+                    "  }),"
+                    "  (2, {"
+                    "    'displayName': 'Bob',"
+                    "    'serviceId': 'a missing one',"
+                    "  }),"
+                    "], [{"
+                    "  'serviceId': 'app_coolshare',"
+                    "  'displayName': 'Cool Share',"
+                    "  'iconSource': 'image://theme/coolshare',"
+                    "}])");
     OnlineAccounts::Manager manager("my-app");
 
     manager.waitForReady();
@@ -193,10 +266,22 @@
     OnlineAccounts::Account *account = manager.account(4);
     QVERIFY(!account);
 
+    // valid account linking to invalid service
+    account = manager.account(2);
+    QVERIFY(account);
+    QCOMPARE(account->displayName(), QString("Bob"));
+    QCOMPARE(account->serviceId(), QString("a missing one"));
+    QVERIFY(!account->service().isValid());
+
     // valid account
     account = manager.account(1);
     QVERIFY(account);
     QCOMPARE(account->displayName(), QString("John"));
+    QCOMPARE(account->serviceId(), QString("app_coolshare"));
+    QVERIFY(account->service().isValid());
+    QCOMPARE(account->service().displayName(), QString("Cool Share"));
+    QCOMPARE(account->service().iconSource(),
+             QUrl("image://theme/coolshare"));
 }
 
 void FunctionalTests::testManagerRequestAccess_data()
@@ -236,7 +321,7 @@
     QFETCH(QString, displayName);
     QFETCH(QString, accessToken);
 
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})", "ret = []");
+    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})aa{sv}", "ret = ([], [])");
     addMockedMethod("RequestAccess", "sa{sv}", "(ua{sv})a{sv}", reply);
     OnlineAccounts::Manager manager("my-app");
 
@@ -277,12 +362,12 @@
     QTest::addColumn<QVariantMap>("settings");
 
     QTest::newRow("empty account") <<
-        "ret = [(1, {})]" <<
+        "[(1, {})]" <<
         1 <<
         "" << "" << 0 << QVariantMap();
 
     QTest::newRow("no settings") <<
-        "ret = [(3, {"
+        "[(3, {"
         "  'displayName': 'Bob',"
         "  'serviceId': 'MyService',"
         "  'authMethod': 1,"
@@ -297,7 +382,7 @@
     settings.insert("Host", "example.com");
     settings.insert("Port", int(7000));
     QTest::newRow("with settings") <<
-        "ret = [(4, {"
+        "[(4, {"
         "  'displayName': 'Tom',"
         "  'serviceId': 'MyService',"
         "  'authMethod': 2,"
@@ -320,7 +405,8 @@
     QFETCH(int, authenticationMethod);
     QFETCH(QVariantMap, settings);
 
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})", reply);
+    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})aa{sv}",
+                    QString("ret = (%1, [])").arg(reply));
     OnlineAccounts::Manager manager("my-app");
 
     manager.waitForReady();
@@ -347,7 +433,7 @@
 
 void FunctionalTests::testPendingCallWatcher()
 {
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})", "ret = []");
+    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})aa{sv}", "ret = ([], [])");
     addMockedMethod("RequestAccess", "sa{sv}", "(ua{sv})a{sv}",
                     "ret = ((1, {'displayName': 'Bob'}),{})");
     OnlineAccounts::Manager manager("my-app");
@@ -378,7 +464,7 @@
 
 void FunctionalTests::testAccountChanges()
 {
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})", "ret = []");
+    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})aa{sv}", "ret = ([], [])");
     OnlineAccounts::Manager manager("my-app");
     QSignalSpy accountAvailable(&manager,
                                 SIGNAL(accountAvailable(OnlineAccounts::Account*)));
@@ -442,8 +528,8 @@
 
 void FunctionalTests::testMultipleServices()
 {
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})",
-                    "ret = ["
+    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})aa{sv}",
+                    "ret = (["
                     "(1, {"
                     "  'displayName': 'One',"
                     "  'serviceId': 'service2',"
@@ -464,7 +550,7 @@
                     "  'serviceId': 'service1',"
                     "  'authMethod': 1,"
                     "}),"
-                    "]");
+                    "], [])");
     OnlineAccounts::Manager manager("my-app");
     manager.waitForReady();
 
@@ -494,8 +580,8 @@
 
 void FunctionalTests::testAuthentication()
 {
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})",
-                    "ret = ["
+    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})aa{sv}",
+                    "ret = (["
                     "(1, {"
                     "  'displayName': 'Bob',"
                     "  'serviceId': 'MyService0',"
@@ -516,7 +602,7 @@
                     "  'serviceId': 'MyService3',"
                     "  'authMethod': 4,"
                     "}),"
-                    "]");
+                    "], [])");
     addMockedMethod("Authenticate", "usbba{sv}", "a{sv}",
                     "if args[0] == 1:\n"
                     "  ret = {"
@@ -671,12 +757,12 @@
     QFETCH(int, errorCode);
     QFETCH(QString, errorMessage);
 
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})",
-                    "ret = [(1, {"
+    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})aa{sv}",
+                    "ret = ([(1, {"
                     "  'displayName': 'Bob',"
                     "  'serviceId': 'MyService0',"
                     "  'authMethod': 2,"
-                    "})]");
+                    "})], [])");
     addMockedMethod("Authenticate", "usbba{sv}", "a{sv}", reply);
     OnlineAccounts::Manager manager("my-app");
     manager.waitForReady();
 
=== modified file 'tests/lib/qml_module/tst_qml_module.cpp'
--- tests/lib/qml_module/tst_qml_module.cpp	2016-10-06 08:20:10 +0000
+++ tests/lib/qml_module/tst_qml_module.cpp	2016-11-10 09:12:06 +0000
@@ -55,14 +55,18 @@
     }
 
     void addMockedMethod(const QString &name,
-                                        const QString &in_sig,
-                                        const QString &out_sig,
-                                        const QString &code)
+                         const QString &in_sig,
+                         const QString &out_sig,
+                         const QString &code)
     {
         return mocked().AddMethod(ONLINE_ACCOUNTS_MANAGER_INTERFACE,
                                   name, in_sig, out_sig, code).waitForFinished();
     }
 
+    void addGetAccountsMethod(const QString &code) {
+        addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})aa{sv}", code);
+    }
+
     void emitAccountChanged(const QString &service,
                             uint accountId,
                             const QVariantMap &changes)
@@ -90,6 +94,8 @@
     void initTestCase();
     void testModuleImport();
     void testModelProperties();
+    void testServices_data();
+    void testServices();
     void testModelRoles_data();
     void testModelRoles();
     void testModelFilters_data();
@@ -156,9 +162,85 @@
     delete object;
 }
 
+void ModuleTest::testServices_data()
+{
+    QTest::addColumn<QString>("reply");
+    QTest::addColumn<QList<QVariantMap>>("expectedServices");
+
+    QTest::newRow("no services") <<
+        "[]" <<
+        QList<QVariantMap> {};
+
+    QTest::newRow("one service") <<
+        "[{"
+        "'" ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID "': 'app_coolshare',"
+        "'" ONLINE_ACCOUNTS_INFO_KEY_DISPLAY_NAME "': 'Cool Share',"
+        "'" ONLINE_ACCOUNTS_INFO_KEY_ICON_SOURCE "': 'image://theme/coolshare',"
+        "}]" <<
+        QList<QVariantMap> {
+            {
+                { "serviceId", "app_coolshare" },
+                { "displayName", "Cool Share" },
+                { "iconSource", "image://theme/coolshare"},
+            },
+        };
+}
+
+void ModuleTest::testServices()
+{
+    QFETCH(QString, reply);
+    QFETCH(QList<QVariantMap>, expectedServices);
+
+    addGetAccountsMethod(QString("ret = ([], %1)").arg(reply));
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    /* We could return the serviceList property directly, but that would be
+     * passing a OnlineAccounts::Service as QJSValue, which might not be a
+     * proof that every property is properly accessible from QML. Therefore, we
+     * explicitly run through the list and copy it as a new object. */
+    component.setData("import Ubuntu.OnlineAccounts 2.0\n"
+                      "AccountModel {\n"
+                      "  applicationId: \"foo\"\n"
+                      "  function getServices() {\n"
+                      "    var ret = [];\n"
+                      "    for (var i = 0; i < serviceList.length; i++) {\n"
+                      "      var s = serviceList[i];\n"
+                      "      var service = {};\n"
+                      "      for (var key in s) { service[key] = s[key]; }\n"
+                      "      ret.push(service);\n"
+                      "    }\n"
+                      "    return ret;\n"
+                      "  }\n"
+                      "}",
+                      QUrl());
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QAbstractListModel *model = qobject_cast<QAbstractListModel*>(object);
+    QVERIFY(model != 0);
+
+    QSignalSpy ready(object, SIGNAL(isReadyChanged()));
+    ready.wait();
+
+    QVariant serviceList;
+    bool ok = QMetaObject::invokeMethod(object, "getServices",
+                                        Q_RETURN_ARG(QVariant, serviceList));
+    QVERIFY(ok);
+
+    QVariantList serviceVariantList = serviceList.toList();
+    QList<QVariantMap> services;
+    for (const QVariant &v: serviceVariantList) {
+        services.append(v.toMap());
+    }
+
+    QCOMPARE(services, expectedServices);
+    delete object;
+}
+
 void ModuleTest::testModelRoles_data()
 {
     QTest::addColumn<QString>("accountData");
+    QTest::addColumn<QString>("serviceData");
     QTest::addColumn<QString>("displayName");
     QTest::addColumn<QString>("serviceId");
     QTest::addColumn<int>("authenticationMethod");
@@ -167,6 +249,7 @@
     QVariantMap settings;
     QTest::newRow("empty") <<
         "{}" <<
+        "" <<
         "" << "" << 0 << settings;
 
     settings.insert("Server", "www.example.com");
@@ -179,19 +262,23 @@
         " '" ONLINE_ACCOUNTS_INFO_KEY_SETTINGS "Server': 'www.example.com',"
         " '" ONLINE_ACCOUNTS_INFO_KEY_SETTINGS "Port': 9900,"
         "}" <<
+        "{"
+        " '" ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID "': 'cool',"
+        "}" <<
         "Tom" << "cool" << 2 << settings;
 }
 
 void ModuleTest::testModelRoles()
 {
     QFETCH(QString, accountData);
+    QFETCH(QString, serviceData);
     QFETCH(QString, displayName);
     QFETCH(QString, serviceId);
     QFETCH(int, authenticationMethod);
     QFETCH(QVariantMap, settings);
 
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})",
-                    QString("ret = [(1, %1)]").arg(accountData));
+    addGetAccountsMethod(QString("ret = ([(1, %1)], [%2])").
+                         arg(accountData).arg(serviceData));
 
     QQmlEngine engine;
     QQmlComponent component(&engine);
@@ -218,7 +305,6 @@
     QCOMPARE(get(model, 0, "serviceId").toString(), serviceId);
     QCOMPARE(get(model, 0, "authenticationMethod").toInt(),
              authenticationMethod);
-    // until https://bugs.launchpad.net/bugs/1479768 is fixed
     QCOMPARE(get(model, 0, "settings").toMap(), settings);
     QObject *account = get(model, 0, "account").value<QObject*>();
     QVERIFY(account != 0);
@@ -226,6 +312,10 @@
     QCOMPARE(account,
              model->property("accountList").value<QList<QObject*> >().first());
 
+    QJSValue service = get(model, 0, "service").value<QJSValue>();
+    QVERIFY(service.isObject());
+    QCOMPARE(service.property("serviceId").toString(), serviceId);
+
     delete object;
 }
 
@@ -237,17 +327,17 @@
     QTest::addColumn<QStringList>("expectedDisplayNames");
 
     QTest::newRow("no accounts") <<
-        "ret = []" <<
+        "[]" <<
         "" <<
         QList<int>();
 
     QTest::newRow("one account, no service filter") <<
-        "ret = [(1, {'displayName': 'Tom', 'serviceId': 'Foo' })]" <<
+        "[(1, {'displayName': 'Tom', 'serviceId': 'Foo' })]" <<
         "" <<
         (QList<int>() << 1);
 
     QTest::newRow("one account, with service filter") <<
-        "ret = [(1, {'displayName': 'Tom', 'serviceId': 'Foo' })]" <<
+        "[(1, {'displayName': 'Tom', 'serviceId': 'Foo' })]" <<
         "serviceId: \"bar\"" <<
         QList<int>();
 }
@@ -258,7 +348,7 @@
     QFETCH(QString, filters);
     QFETCH(QList<int>, expectedIds);
 
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})", reply);
+    addGetAccountsMethod(QString("ret = (%1, [])").arg(reply));
 
     QQmlEngine engine;
     QQmlComponent component(&engine);
@@ -287,7 +377,7 @@
 
 void ModuleTest::testModelChanges()
 {
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})", "ret = []");
+    addGetAccountsMethod("ret = ([], [])");
     QQmlEngine engine;
     QQmlComponent component(&engine);
     component.setData("import Ubuntu.OnlineAccounts 2.0\n"
@@ -397,8 +487,7 @@
     QFETCH(QVariantMap, expectedAccessReply);
     QFETCH(QVariantMap, expectedAuthenticationData);
 
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})",
-                    "ret = [(1, {'displayName': 'Tom', 'serviceId': 'Foo' })]");
+    addGetAccountsMethod("ret = ([(1, {'displayName': 'Tom', 'serviceId': 'Foo' })], [])");
     addMockedMethod("RequestAccess", "sa{sv}", "(ua{sv})a{sv}", reply);
 
     QQmlEngine engine;
@@ -536,12 +625,11 @@
     QFETCH(QVariantMap, params);
     QFETCH(QVariantMap, expectedAuthenticationData);
 
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})",
-                    QString("ret = [(1, {"
-                            "  'displayName': 'Bob',"
-                            "  'serviceId': 'MyService0',"
-                            "  'authMethod': %1,"
-                            "})]").arg(authMethod));
+    addGetAccountsMethod(QString("ret = ([(1, {"
+                                 "  'displayName': 'Bob',"
+                                 "  'serviceId': 'MyService0',"
+                                 "  'authMethod': %1,"
+                                 "})], [])").arg(authMethod));
     addMockedMethod("Authenticate", "usbba{sv}", "a{sv}", reply);
 
     QQmlEngine engine;