Merge lp:~mardy/unity-webapps-qml/oa-capture into lp:unity-webapps-qml

[Alberto Mardegan]

Send username and cookies to Online Accounts

This is the reimplementation in Qt of this:
http://bazaar.launchpad.net/~online-accounts/webaccounts-browser-extension/trunk/view/head:/lib/webaccounts/login-handler.c

Send username and cookies to Online Accounts

This is the reimplementation in Qt of this:
http://bazaar.launchpad.net/~online-accounts/webaccounts-browser-extension/trunk/view/head:/lib/webaccounts/login-handler.c

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:89
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/85/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/33/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/85/rebuild

review: Needs Fixing (continuous-integration)

[David Barth (dbarth)]

Hmmm, no unit tests?

[Alexandre Abreu (abreu-alexandre)]

L97: please do not enforce the getCookies bit. It works only in the context of the webapp-container but not in other (app related) contexts where the component is uses, e.g. html5 apps. Any binding injection will fail bc of this. I'd rather see a more flexible handling & validate at runtime L110 if getcookies() is there,

L226: validate username isEmpty()?

review: Needs Fixing

[lp:~mardy/unity-webapps-qml/oa-capture]

90. By Alberto Mardegan on 2014-03-10

Add unit tests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/88/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/36/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/88/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mardy/unity-webapps-qml/oa-capture]

91. By Alberto Mardegan on 2014-03-10

Don't enforce the presence of getCookies()

[Alberto Mardegan (mardy)]

Updated: added unit tests, remove the hard check on getCookies().

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/89/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/37/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/89/rebuild

review: Needs Fixing (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

[lp:~mardy/unity-webapps-qml/oa-capture]

92. By Alberto Mardegan on 2014-04-07

Merge from trunk

[ Alexandre Abreu ]
* Add some missing files striclty for doc generation for the runtime-
  api
* There is currently an issue on Ubuntu Desktop with webapps running
  in the container and bamf/unity that when a local desktop file
  exists (and a webapp icon has been pinned to the launcher through
  its global /usr/share desktop file), the webapp icons are duplicated
  in the launcher. Various fixes have been made to mitigate the issue
  in bamf but it seems to still be around. This is voluntarily
  discarded for now and left around to get to the bottom of the issue
  in a timely fashion. (LP: #1300864)
[ Alexandre Abreu ]
* Fixes to the runtime-api: have inputMethodName return its value,.
  have the client register listeners for property changed, .
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Add application api (LP: #1278485)
[ Alexandre Abreu ]
* Add integration with oxide (LP: #1290535)
[ Justin McPherson ]
* Add integration with oxide (LP: #1290535)
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Add support for the new content hub api
[ Alexandre Abreu ]
* Fix desktop file generation: dont do useless generation when not
  needed,. use the proper webapps-runner w/ the --chrome option. make
  sure that the webapp 'domain' is available (LP: #1288805)
* Make sure that priviledged APIs are only injected in the proper
  context (LP: #1293702)
* New rebuild forced
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Fix issue with the callback order for content hub's high level api.
  The order is reversed
[ Alexandre Abreu ]
* Fix online accounts inline docs
[ Alberto Mardegan ]
* API cleanups Add a getAccounts() method, and remove the
  getAccountsInfoFor() and getAccessTokenFor() methods.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/110/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/58/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/58/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/110/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mardy/unity-webapps-qml/oa-capture]

93. By Alberto Mardegan on 2014-04-08

From trunk

[ Alexandre Abreu ]
Update the oxide bits to account for oxide moving to 1.0

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/111/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/59/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/59/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/111/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

93. By Alberto Mardegan on 2014-04-08

From trunk

[ Alexandre Abreu ]
Update the oxide bits to account for oxide moving to 1.0

92. By Alberto Mardegan on 2014-04-07

Merge from trunk

[ Alexandre Abreu ]
* Add some missing files striclty for doc generation for the runtime-
  api
* There is currently an issue on Ubuntu Desktop with webapps running
  in the container and bamf/unity that when a local desktop file
  exists (and a webapp icon has been pinned to the launcher through
  its global /usr/share desktop file), the webapp icons are duplicated
  in the launcher. Various fixes have been made to mitigate the issue
  in bamf but it seems to still be around. This is voluntarily
  discarded for now and left around to get to the bottom of the issue
  in a timely fashion. (LP: #1300864)
[ Alexandre Abreu ]
* Fixes to the runtime-api: have inputMethodName return its value,.
  have the client register listeners for property changed, .
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Add application api (LP: #1278485)
[ Alexandre Abreu ]
* Add integration with oxide (LP: #1290535)
[ Justin McPherson ]
* Add integration with oxide (LP: #1290535)
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Add support for the new content hub api
[ Alexandre Abreu ]
* Fix desktop file generation: dont do useless generation when not
  needed,. use the proper webapps-runner w/ the --chrome option. make
  sure that the webapp 'domain' is available (LP: #1288805)
* Make sure that priviledged APIs are only injected in the proper
  context (LP: #1293702)
* New rebuild forced
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Fix issue with the callback order for content hub's high level api.
  The order is reversed
[ Alexandre Abreu ]
* Fix online accounts inline docs
[ Alberto Mardegan ]
* API cleanups Add a getAccounts() method, and remove the
  getAccountsInfoFor() and getAccessTokenFor() methods.

91. By Alberto Mardegan on 2014-03-10

Don't enforce the presence of getCookies()

90. By Alberto Mardegan on 2014-03-10

Add unit tests

89. By Alberto Mardegan on 2014-03-07

Install GSettings schema

88. By Alberto Mardegan on 2014-03-06

Send website username and cookies to OA

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2014-04-08 07:15:18 +0000
@@ -0,0 +1,32 @@
+*.log
+*.moc
+Makefile
+moc_*.cpp
+debian/files
+debian/qtdeclarative5-ubuntu-webapps-api/
+debian/*.debhelper
+debian/*.substvars
+debian/tmp/
+debian/unity-webapps-qml/
+debian/unity-webapps-qml-autopilot/
+debian/unity-webapps-qml-doc/
+debian/unity-webapps-qml-examples/
+docs/html/images/
+docs/html/qml-ubuntu-unitywebapps0-*.html
+docs/html/scripts/
+docs/html/style/
+docs/html/unity-webapps-qml-component.index
+examples/api-bindings/alarm/main.qml
+examples/api-bindings/content-hub/main.qml
+examples/api-bindings/content-hub-exporter/main.qml
+examples/api-bindings/online-accounts/main.qml
+src/Ubuntu/UnityWebApps/qmldir
+src/Ubuntu/UnityWebApps/unity-webapps-api.js
+tests/integration/autopilot/build/
+tests/integration/autopilot/unity_webapps_qml.egg-info/
+tests/unit/test_js/test_js
+tests/unit/test_online_accounts_capturer/test_online_accounts_capturer
+tests/unit/test_plugin/tst_plugin
+tests/unit/test_qml/test_qml
+tools/qml-launcher/unity-webapps-qml-launcher
+

=== modified file 'common-project-config.pri'
--- common-project-config.pri	2013-07-09 19:02:23 +0000
+++ common-project-config.pri	2014-04-08 07:15:18 +0000
@@ -13,3 +13,15 @@
 
 include(coverage.pri)
 
+INSTALL_PREFIX = /usr  # default installation prefix
+
+# default prefix can be overriden by defining PREFIX when running qmake
+isEmpty(PREFIX) {
+    message("====")
+    message("==== NOTE: To override the installation path run: `qmake PREFIX=/custom/path'")
+    message("==== (current installation path is `$${INSTALL_PREFIX}')")
+} else {
+    INSTALL_PREFIX = $${PREFIX}
+    message("====")
+    message("==== install prefix set to `$${INSTALL_PREFIX}'")
+}

=== modified file 'debian/control'
--- debian/control	2014-04-03 14:17:12 +0000
+++ debian/control	2014-04-08 07:15:18 +0000
@@ -4,6 +4,8 @@
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 Build-Depends: debhelper (>= 9),
                gdb,
+               libaccounts-qt5-dev,
+               libgsettings-qt-dev,
                libmessaging-menu-dev,
                libnotify-dev,
                libqt5webkit5-dev,

=== modified file 'debian/unity-webapps-qml.install'
--- debian/unity-webapps-qml.install	2013-08-27 04:45:47 +0000
+++ debian/unity-webapps-qml.install	2014-04-08 07:15:18 +0000
@@ -1,3 +1,4 @@
 usr/bin/unity-webapps-qml-launcher
 usr/lib/*/qt5/qml/Ubuntu/UnityWebApps/*
 usr/share/applications/unitywebappsqmllauncher.desktop
+usr/share/glib-2.0/schemas/*

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-03-26 15:52:46 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-04-08 07:15:18 +0000
@@ -81,9 +81,10 @@
 
         \code
             method getUnityWebappsProxies()
+            method getCookies()
         \endcode
 
-        that should return a BindeeExports:
+        the getUnityWebappsProxies() method should return a list of BindeeExports:
 
         \code
             interface BindeeExports {
@@ -493,6 +494,12 @@
                         var url = params.__unity_webapps_hidden && params.__unity_webapps_hidden.url
                                 ? params.__unity_webapps_hidden.url : "";
                         base.init(webappName, url, isLocal, params);
+
+                        // Online Accounts capture:
+                        if ('login' in params && (typeof bindee.getCookies === 'function')) {
+                            UbuntuUnityWebApps.OnlineAccounts.capture(params.login, params.domain,
+                                                                      bindee.getCookies());
+                        }
                     });
                 }
                 else {

=== added file 'src/Ubuntu/UnityWebApps/plugin/com.canonical.webcredentials.capture.gschema.xml'
--- src/Ubuntu/UnityWebApps/plugin/com.canonical.webcredentials.capture.gschema.xml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UnityWebApps/plugin/com.canonical.webcredentials.capture.gschema.xml	2014-04-08 07:15:18 +0000
@@ -0,0 +1,11 @@
+<schemalist>
+  <schema id="com.canonical.webcredentials.capture" path="/com/canonical/webcredentials/capture/" gettext-domain="webcredentials-browser-extension">
+    <key name="dontask-accounts" type="as">
+      <summary>A list of accounts (in the form domain:account) which we will not propose to create locally.</summary>
+      <default>[]</default>
+      <description>
+        This key lists all those accounts for which the creation of a local account has been already asked, and won't be asked again.
+      </description>
+    </key>
+  </schema>
+</schemalist>

=== added file 'src/Ubuntu/UnityWebApps/plugin/online-accounts-capturer.cpp'
--- src/Ubuntu/UnityWebApps/plugin/online-accounts-capturer.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UnityWebApps/plugin/online-accounts-capturer.cpp	2014-04-08 07:15:18 +0000
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of unity-webapps-qml.
+ *
+ * unity-webapps-qml is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * unity-webapps-qml is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <Accounts/Manager>
+#include <Accounts/Provider>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QDBusMetaType>
+#include <QDebug>
+#include <QGSettings>
+#include <QRegExp>
+#include "online-accounts-capturer.h"
+
+#define OA_CAPTURE_SERVICE "com.canonical.webcredentials.capture"
+#define OA_CAPTURE_OBJECT_PATH "/com/canonical/webcredentials/capture"
+#define OA_CAPTURE_INTERFACE OA_CAPTURE_SERVICE
+
+#define OA_CAPTURE_DCONF_SCHEMA "com.canonical.webcredentials.capture"
+
+using namespace OnlineAccounts;
+
+static QString accountId(const QString &domain, const QString &username)
+{
+    return QString(QStringLiteral("%1:%2")).arg(domain).arg(username);
+}
+
+Capturer::Capturer(QObject *parent):
+    QObject(parent),
+    m_manager(new Accounts::Manager(this))
+{
+    qRegisterMetaType<Cookies>("Cookies");
+    qDBusRegisterMetaType<Cookies>();
+}
+
+Capturer::~Capturer()
+{
+}
+
+Accounts::Provider Capturer::providerForDomain(const QString &domain)
+{
+    Q_FOREACH(const Accounts::Provider &provider, m_manager->providerList()) {
+        QRegExp domainsRegExp(provider.domainsRegExp());
+        if (domainsRegExp.exactMatch(domain)) {
+            return provider;
+        }
+    }
+
+    /* If not found, return an invalid one */
+    return Accounts::Provider();
+}
+
+bool Capturer::accountIsBlacklisted(const QString &domain,
+                                    const QString &username)
+{
+    QGSettings settings(OA_CAPTURE_DCONF_SCHEMA);
+
+    QStringList blacklistedAccounts =
+        settings.get("dontask-accounts").toStringList();
+
+    return blacklistedAccounts.contains(accountId(domain, username));
+}
+
+void Capturer::blacklistAccount(const QString &domain, const QString &username)
+{
+    QGSettings settings(OA_CAPTURE_DCONF_SCHEMA);
+
+    QStringList blacklistedAccounts =
+        settings.get("dontask-accounts").toStringList();
+    blacklistedAccounts.append(accountId(domain, username));
+    settings.set("dontask-accounts", blacklistedAccounts);
+}
+
+bool Capturer::accountExists(const Accounts::Provider &provider,
+                             const QString &username)
+{
+    Q_FOREACH(Accounts::AccountId id, m_manager->accountList()) {
+        Accounts::Account *account = m_manager->account(id);
+        if (!account) continue;
+
+        if (account->providerName() != provider.name()) continue;
+
+        /* Here we assume that the account username is used as display name; we
+         * might need to revisit this later. */
+        if (account->displayName() == username) return true;
+    }
+
+    return false;
+}
+
+void Capturer::capture(const QString &login, const QString &domain,
+                       const Cookies &cookies)
+{
+    if (login.isEmpty() || domain.isEmpty()) {
+        qDebug() << "Insufficient info: domain =" << domain << ", login =" << login;
+        return;
+    }
+
+    Accounts::Provider provider = providerForDomain(domain);
+    if (!provider.isValid()) {
+        qDebug() << "No provider support for domain" << domain;
+        return;
+    }
+
+    if (accountIsBlacklisted(domain, login)) {
+        qDebug() << "Account" << login << "on" << domain << "is blacklisted";
+        return;
+    }
+
+    /* If an account for the same provider with the same username already
+     * exists, stop processing here. */
+    if (accountExists(provider, login)) {
+        qDebug() << "Account already exists:" << login;
+        return;
+    }
+
+    QDBusMessage message =
+        QDBusMessage::createMethodCall(OA_CAPTURE_SERVICE,
+                                       OA_CAPTURE_OBJECT_PATH,
+                                       OA_CAPTURE_INTERFACE,
+                                       "LoginCaptured");
+    QList<QVariant> arguments;
+    arguments << provider.name();
+    arguments << login;
+    arguments << QStringLiteral(""); // password, we don't use it
+    arguments << QVariant::fromValue(cookies);
+    message.setArguments(arguments);
+
+    QDBusConnection connection = QDBusConnection::sessionBus();
+    connection.call(message, QDBus::NoBlock);
+
+    /* Don't propose to create this account ever again */
+    blacklistAccount(domain, login);
+}

=== added file 'src/Ubuntu/UnityWebApps/plugin/online-accounts-capturer.h'
--- src/Ubuntu/UnityWebApps/plugin/online-accounts-capturer.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UnityWebApps/plugin/online-accounts-capturer.h	2014-04-08 07:15:18 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of unity-webapps-qml.
+ *
+ * unity-webapps-qml is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * unity-webapps-qml is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __UNITY_WEBAPPS_ONLINE_ACCOUNTS_CAPTURER_H__
+#define __UNITY_WEBAPPS_ONLINE_ACCOUNTS_CAPTURER_H__
+
+#include <QMap>
+#include <QObject>
+#include <QString>
+
+namespace Accounts {
+    class Manager;
+    class Provider;
+};
+
+namespace OnlineAccounts {
+
+typedef QMap<QString, QString> Cookies;
+
+class Capturer: public QObject
+{
+    Q_OBJECT
+
+public:
+    Capturer(QObject *parent = 0);
+    ~Capturer();
+
+    Q_INVOKABLE void capture(const QString &login, const QString &domain,
+                             const Cookies &cookies);
+private:
+    Accounts::Provider providerForDomain(const QString &domain);
+    bool accountIsBlacklisted(const QString &domain, const QString &username);
+    void blacklistAccount(const QString &domain, const QString &username);
+    bool accountExists(const Accounts::Provider &provider,
+                       const QString &username);
+
+private:
+    Accounts::Manager *m_manager;
+};
+
+};
+
+Q_DECLARE_METATYPE(OnlineAccounts::Cookies);
+
+#endif // __UNITY_WEBAPPS_ONLINE_ACCOUNTS_CAPTURER_H__

=== modified file 'src/Ubuntu/UnityWebApps/plugin/plugin.pro'
--- src/Ubuntu/UnityWebApps/plugin/plugin.pro	2014-03-25 20:56:01 +0000
+++ src/Ubuntu/UnityWebApps/plugin/plugin.pro	2014-04-08 07:15:18 +0000
@@ -5,7 +5,10 @@
 
 unix {
     CONFIG += link_pkgconfig
-    PKGCONFIG += libnotify \
+    PKGCONFIG += \
+                accounts-qt5 \
+                gsettings-qt \
+                libnotify \
                 messaging-menu \
                 glib-2.0 \
                 gio-2.0 \
@@ -23,10 +26,14 @@
     plugin \
     qt
 
-QT += core qml
+QT += \
+    core \
+    dbus \
+    qml
 
 
 SOURCES += \
+    online-accounts-capturer.cpp \
     qml-plugin.cpp \
     unity-webapps-api.cpp \
     unity-webapps-api-notifications.cpp \
@@ -45,6 +52,7 @@
     application-signal-to-qt-bridge.cpp
 
 HEADERS += \
+    online-accounts-capturer.h \
     qml-plugin.h \
     unity-webapps-api.h \
     unity-webapps-api-notifications.h \
@@ -70,5 +78,10 @@
 PLUGIN_INSTALL_PATH = $$[QT_INSTALL_QML]/$$replace(API_URI, \\., /)
 target.path = $${PLUGIN_INSTALL_PATH}
 
+gsettings_schemas.files = \
+    com.canonical.webcredentials.capture.gschema.xml
+gsettings_schemas.path = $${INSTALL_PREFIX}/share/glib-2.0/schemas
+INSTALLS += gsettings_schemas
+
 INSTALLS += target
 

=== modified file 'src/Ubuntu/UnityWebApps/plugin/qml-plugin.cpp'
--- src/Ubuntu/UnityWebApps/plugin/qml-plugin.cpp	2014-03-21 20:07:16 +0000
+++ src/Ubuntu/UnityWebApps/plugin/qml-plugin.cpp	2014-04-08 07:15:18 +0000
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "online-accounts-capturer.h"
 #include "qml-plugin.h"
 
 #include <QtQml/QQmlEngine>
@@ -36,6 +37,14 @@
 
 #include <qqml.h>
 
+static QObject *createOnlineAccountsInstance(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+
+    return new OnlineAccounts::Capturer();
+}
+
 static QObject *createApplicationApi(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine);
@@ -58,6 +67,9 @@
     qmlRegisterType<UnityWebappsAppModelFilterProxy> (uri, 0, 1, "UnityWebappsAppModelFilterProxy");
     qmlRegisterType<UnityWebappsCallback> (uri, 0, 1, "UnityWebappsCallback");
     qmlRegisterType<UnityWebappsAppInfos> (uri, 0, 1, "UnityWebappsAppInfos");
+    // Online Accounts capture
+    qmlRegisterSingletonType<OnlineAccounts::Capturer>(uri, 0, 1, "OnlineAccounts",
+                                                       createOnlineAccountsInstance);
 
     // TODO bump version
     qmlRegisterType<AbstractItemModelAdaptor> (uri, 0, 1, "AbstractItemModelAdaptor");

=== added directory 'tests/unit/test_online_accounts_capturer'
=== added file 'tests/unit/test_online_accounts_capturer/capture-test.provider'
--- tests/unit/test_online_accounts_capturer/capture-test.provider	1970-01-01 00:00:00 +0000
+++ tests/unit/test_online_accounts_capturer/capture-test.provider	2014-04-08 07:15:18 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="capture-test">
+  <name>Capture test</name>
+  <description>Something meaningful</description>
+  <icon>whocares</icon>
+  <translations>account-plugins</translations>
+  <domains>.*mysite\.com</domains>
+</provider>

=== added file 'tests/unit/test_online_accounts_capturer/test_online_accounts_capturer.cpp'
--- tests/unit/test_online_accounts_capturer/test_online_accounts_capturer.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/test_online_accounts_capturer/test_online_accounts_capturer.cpp	2014-04-08 07:15:18 +0000
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of unity-webapps-qml.
+ *
+ * unity-webapps-qml is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * unity-webapps-qml is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <Accounts/Account>
+#include <Accounts/Manager>
+#include <QDir>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QGSettings>
+#include <QMap>
+#include <QTest>
+#include <QVariant>
+#include "online-accounts-capturer.h"
+
+using namespace OnlineAccounts;
+
+static QDBusMessage *capturedMessage = 0;
+
+QDBusMessage QDBusConnection::call(const QDBusMessage &message,
+                                   QDBus::CallMode mode,
+                                   int timeout) const
+{
+    Q_UNUSED(mode);
+    Q_UNUSED(timeout);
+    delete capturedMessage;
+    capturedMessage = new QDBusMessage(message);
+    return message;
+}
+
+/* Mock QGSettings */
+static struct QGSettingsData {
+    void init(const QByteArray &schema_id, const QByteArray &path) {
+        m_schemaId = schema_id;
+        m_path = path;
+    }
+
+    QVariantMap m_data;
+    QByteArray m_schemaId;
+    QByteArray m_path;
+} gsettingsData;
+
+QGSettings::QGSettings(const QByteArray &schema_id, const QByteArray &path,
+                       QObject *parent):
+    QObject(parent)
+{
+    gsettingsData.init(schema_id, path);
+}
+
+QGSettings::~QGSettings()
+{
+}
+
+QVariant QGSettings::get(const QString &key) const
+{
+    return gsettingsData.m_data.value(key);
+}
+
+void QGSettings::set(const QString &key, const QVariant &value)
+{
+    gsettingsData.m_data.insert(key, value);
+}
+
+
+class CapturerTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    CapturerTest();
+
+    void clearDb();
+    QDBusMessage *dbusMessage() const { return capturedMessage; }
+
+private Q_SLOTS:
+    void initTestCase();
+    void cleanup();
+    void testNoData();
+    void testUnsupportedDomain();
+    void testBlacklisted();
+    void testExisting();
+    void testCall();
+
+private:
+    Capturer *m_capturer;
+};
+
+CapturerTest::CapturerTest():
+    QObject(),
+    m_capturer(0)
+{
+}
+
+void CapturerTest::initTestCase()
+{
+    qputenv("ACCOUNTS", "/tmp/");
+    qputenv("AG_PROVIDERS", TEST_DATA_DIR);
+
+    m_capturer = new Capturer(this);
+}
+
+void CapturerTest::cleanup()
+{
+    delete capturedMessage;
+    capturedMessage = 0;
+
+    gsettingsData.m_data.clear();
+}
+
+void CapturerTest::clearDb()
+{
+    QDir dbroot(QString::fromLatin1(qgetenv("ACCOUNTS")));
+    dbroot.remove("accounts.db");
+}
+
+void CapturerTest::testNoData()
+{
+    m_capturer->capture(QString(), QString(), Cookies());
+    QVERIFY(!dbusMessage());
+
+    m_capturer->capture("username", QString(), Cookies());
+    QVERIFY(!dbusMessage());
+
+    m_capturer->capture("username", "", Cookies());
+    QVERIFY(!dbusMessage());
+
+    m_capturer->capture(QString(), "domain", Cookies());
+    QVERIFY(!dbusMessage());
+
+    m_capturer->capture("", "domain", Cookies());
+    QVERIFY(!dbusMessage());
+}
+
+void CapturerTest::testUnsupportedDomain()
+{
+    m_capturer->capture("John", "whatasite.com", Cookies());
+    QVERIFY(!dbusMessage());
+}
+
+void CapturerTest::testBlacklisted()
+{
+    QStringList blacklist;
+    blacklist << "something" << "www.mysite.com:John" << "somethingelse";
+    gsettingsData.m_data.insert("dontask-accounts", blacklist);
+    m_capturer->capture("John", "www.mysite.com", Cookies());
+    QVERIFY(!dbusMessage());
+}
+
+void CapturerTest::testExisting()
+{
+    // Create the account
+    Accounts::Manager *manager = new Accounts::Manager(this);
+    Accounts::Account *account = manager->createAccount("capture-test");
+    account->setDisplayName("Adam");
+    account->syncAndBlock();
+    delete manager;
+
+    m_capturer->capture("Adam", "www.mysite.com", Cookies());
+    QVERIFY(!dbusMessage());
+}
+
+void CapturerTest::testCall()
+{
+    Cookies cookies;
+    cookies.insert("first", "number one");
+    cookies.insert("second", "number two");
+    m_capturer->capture("New User", "www.mysite.com", cookies);
+
+    QDBusMessage *message = dbusMessage();
+    QVERIFY(message != 0);
+
+    QList<QVariant> arguments = message->arguments();
+    QCOMPARE(arguments.count(), 4);
+
+    QCOMPARE(arguments[0].toString(), QString("capture-test"));
+    QCOMPARE(arguments[1].toString(), QString("New User"));
+    QVERIFY(arguments[2].toString().isEmpty()); // no password
+    QCOMPARE(arguments[3].value<Cookies>(), cookies);
+}
+
+QTEST_MAIN(CapturerTest);
+#include "test_online_accounts_capturer.moc"

=== added file 'tests/unit/test_online_accounts_capturer/test_online_accounts_capturer.pro'
--- tests/unit/test_online_accounts_capturer/test_online_accounts_capturer.pro	1970-01-01 00:00:00 +0000
+++ tests/unit/test_online_accounts_capturer/test_online_accounts_capturer.pro	2014-04-08 07:15:18 +0000
@@ -0,0 +1,44 @@
+include(../../../common-project-config.pri)
+
+TEMPLATE = app
+TARGET = test_online_accounts_capturer
+
+QT += \
+    core \
+    dbus \
+    testlib
+
+CONFIG += \
+    debug \
+    link_pkgconfig \
+    no_keywords
+
+PKGCONFIG += \
+    accounts-qt5 \
+    gsettings-qt
+
+MODULE_DIR = $${TOP_SRC_DIR}/src/Ubuntu/UnityWebApps/plugin
+
+INCLUDEPATH += \
+    $${MODULE_DIR}
+
+SOURCES += \
+    $${MODULE_DIR}/online-accounts-capturer.cpp \
+    test_online_accounts_capturer.cpp
+
+HEADERS += \
+    $${MODULE_DIR}/online-accounts-capturer.h
+
+DATA_PATH = $${PWD}
+
+OTHER_FILES += \
+    capture-test.provider
+
+DEFINES += \
+    TEST_DATA_DIR=\\\"$$DATA_PATH\\\"
+
+# make check target
+check.target = check
+check.commands = "./$${TARGET}"
+check.depends = $${TARGET}
+QMAKE_EXTRA_TARGETS += check

=== modified file 'tests/unit/unit.pro'
--- tests/unit/unit.pro	2014-01-21 19:58:04 +0000
+++ tests/unit/unit.pro	2014-04-08 07:15:18 +0000
@@ -1,6 +1,8 @@
 TEMPLATE=subdirs
 
-SUBDIRS = test_plugin \
+SUBDIRS = \
+    test_online_accounts_capturer \
+    test_plugin \
     test_qml \
     test_js