Merge lp:~mardy/unity-webapps-qml/app-access into lp:unity-webapps-qml

[Alberto Mardegan]

Bindings for the OnlineAccounts.Client module

Bindings for the OnlineAccounts.Client module

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/123/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-armhf-ci/9

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

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

- You should at least add a Suggests w/ qtdeclarative5-online-accounts-client0.1

I have an error when trying to instanciate the Setup object:

Cannot assign to non-existent property \"applicationId\"

I am pretty sure I already saw that ...

[Justin McPherson (justinmcp)]

review: Approve

[lp:~mardy/unity-webapps-qml/app-access]

105. By Alberto Mardegan on 2014-06-06

Add Suggests for qtdeclarative5-online-accounts-client0.1

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/129/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-armhf-ci/15/console

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

review: Needs Fixing (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

[lp:~mardy/unity-webapps-qml/app-access]

106. By Alberto Mardegan on 2014-06-10

Merge trunk

[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Bindings for the download manager (LP: #1295842)
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Cleanup the structure of the QML bindings to make it clearer. No
  Changes in functionality all features are still working & same, This
  is an updated version of: https://code.launchpad.net/~abreu-
  alexandre/unity-webapps-qml/restructure-cleanup-bindings-qml-
  structure/+merge/208148 with the latest changes that got in in
  between (LP: #1288801)
* Simplifies the manifest.json handling in some instances. More
  precisely when one is using a custom model search path for the
  webapp lookup, some restrictions are being put on what is expected
  to be found in the folder among which: a common/ subfolder (even if
  the webapp doesnt require one),. one or more unity-webapps-* folders
  with manifest.json & *.user.js files in it,. More over the manifest
  files do require user scripts to be defined. This imposes a set of
  constraints over a given webapp that simply wants to use the
  container (w/o js injection). This simplifies it an allows one to
  define a manifest.json file (still with some required elements, but
  a smaller set), directly in the model search path. E.g. something
  like: {     "name": "MyWebApp",     "homepage":
  "http://www.bbc.co.uk/news/",     "domain": "bbc.co.uk",
      "includes": [] } will do, or to avoid any confusion w/ the click
  manifest.json file, one also searches for a webapp-properties.json
  w/ the same content as above.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:106
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/131/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-armhf-ci/17

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

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

You need to update the install files ...

review: Needs Fixing

[lp:~mardy/unity-webapps-qml/app-access]

107. By Alberto Mardegan on 2014-06-13

Install missing file

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/133/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-armhf-ci/19

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

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

I am all +1 for this, but this doesnt solve the bug linked at all, it adds an API; could you please remove the attached bug #

[lp:~mardy/unity-webapps-qml/app-access]

108. By Alberto Mardegan on 2015-03-04

From trunk

[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* When using a webapp-properties file for an unamed webapp the user
  script does not get injected. (LP: #1409051)
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Make sure that the content hub bindings are fail safe since the
  content hub package is a suggests (which is fine since it is not
  there by default on desktop). (LP: #1395524)
* The content hub has been updated with some changes that caused the
  getPeers() fonction to break on the HTML5 API side.
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Improve testability for the desktop webapp search path
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Port qml bindings to oxide (LP: #1374100)
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Add small guard before url navigation (LP: #1378437)
* debian/control:
  - update libqt5webkit5-qmlwebkitplugin -> qml-module-qtwebkit
    (fixes a multiarch install failure)
[ Ken VanDine ]
* handle qtdeclarative5-ubuntu-content1 package rename
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Simplify the click webapp definition for things like overrides etc.
[ Alexandre Abreu ]
* Add bidirectional callback support between js <-> qml,
[ Alexandre Abreu ]
* Fix issue with qmlplugindump using 100% cpu Fix and expanded AP
  tests to properly test the installed webapps case (LP: #1300957)
[ Ken VanDine ]
* add content share
[ Alexandre Abreu ]
* add content share
[ Ubuntu daily release ]
* New rebuild forced
[ Olivier Tilloy ]
* Do not override existing message handlers. Oxide has this nice
  feature that it automatically attaches the instantiated message
  handler to the webview anyway, so this line was useless. (LP:
  #1323735)

=== modified file 'debian/control'
--- debian/control	2015-01-08 19:36:38 +0000
+++ debian/control	2015-03-04 17:01:07 +0000
@@ -35,7 +35,8 @@
          qtdeclarative5-accounts-plugin,
          ${misc:Depends},
          ${shlibs:Depends},
-Suggests: qtdeclarative5-ubuntu-content1,
+Suggests: qtdeclarative5-online-accounts-client0.1 (>= 0.3+14.10.20140530),
+          qtdeclarative5-ubuntu-content1,
           qtdeclarative5-ubuntu-download-manager0.1
 Description: Unity Webapps QML component
  Unity Webapps QML is a QML component that binds to a QML WebView and allows

=== modified file 'examples/api-bindings/online-accounts/www/js/app.js'
--- examples/api-bindings/online-accounts/www/js/app.js	2014-05-09 13:17:09 +0000
+++ examples/api-bindings/online-accounts/www/js/app.js	2015-03-04 17:01:07 +0000
@@ -4,13 +4,23 @@
     var api = external.getUnityObject('1.0');
     var oa = api.OnlineAccounts;
 
-    oa.api.getProviders({"applicationId": "webbrowser-app"}, function(providers) {
+    var appId = "shotwell";
+
+    oa.api.getProviders({"applicationId": appId}, function(providers) {
         var ul = document.querySelector('#providers ul');
 
         for (var i = 0; i < providers.length; ++i) {
             var li = document.createElement('li');
+            var button = document.createElement('input');
+            button.type = 'button';
+            button.providerId = providers[i].providerId;
+            button.value = 'Request account';
+            button.addEventListener('click', function() {
+                oa.api.requestAccount(appId, this.providerId, function() {});
+            });
             li.innerHTML = 'displayName: ' + providers[i].displayName
                     + ', providerId: ' + providers[i].providerId;
+            li.appendChild(button);
             ul.appendChild(li);
         }
     });

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.pro'
--- src/Ubuntu/UnityWebApps/UnityWebApps.pro	2014-07-11 17:13:18 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.pro	2015-03-04 17:01:07 +0000
@@ -60,7 +60,9 @@
 alarm_binding_backend_js_files.files = ./bindings/alarm-api/backend/alarm-api.js
 
 online_accounts_binding_backend_js_files.path = $$installPath/bindings/online-accounts/backend/
-online_accounts_binding_backend_js_files.files = ./bindings/online-accounts/backend/online-accounts.js
+online_accounts_binding_backend_js_files.files = \
+    ./bindings/online-accounts/backend/online-accounts.js \
+    ./bindings/online-accounts/backend/online-accounts-client.js
 
 runtime_api_binding_backend_js_files.path = $$installPath/bindings/runtime-api/backend/
 runtime_api_binding_backend_js_files.files = ./bindings/runtime-api/backend/runtime-api.js

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2015-01-08 19:36:38 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2015-03-04 17:01:07 +0000
@@ -26,6 +26,7 @@
 import "./bindings/alarm-api/backend/alarm-api.js" as AlarmApiBackend
 import "./bindings/content-hub/backend/content-hub.js" as ContentHubApiBackend
 import "./bindings/online-accounts/backend/online-accounts.js" as OnlineAccountsApiBackend
+import "./bindings/online-accounts/backend/online-accounts-client.js" as OnlineAccountsClientApiBackend
 import "./bindings/download-manager/backend/download-api.js" as DownloadApiBackend
 
 /*!

=== added file 'src/Ubuntu/UnityWebApps/bindings/online-accounts/backend/online-accounts-client.js'
--- src/Ubuntu/UnityWebApps/bindings/online-accounts/backend/online-accounts-client.js	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UnityWebApps/bindings/online-accounts/backend/online-accounts-client.js	2015-03-04 17:01:07 +0000
@@ -0,0 +1,87 @@
+/*
+ * 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/>.
+ */
+
+/**
+ *
+ * Online Accounts client API backend binding
+ *
+ */
+function createOnlineAccountsClientApi(backendDelegate) {
+    var PLUGIN_URI = 'Ubuntu.OnlineAccounts.Client';
+    var VERSION = 0.1;
+
+    function Setup(params) {
+        var result = backendDelegate.createQmlObject(
+                    PLUGIN_URI, VERSION, 'Setup', params);
+        this._id = result.id;
+        this._object = result.object;
+    };
+    Setup.prototype = {
+        _validate: function() {
+            if (! this._object)
+                throw new TypeError("Invalid object null");
+        },
+
+        destroy: function() {
+            if (! this._object)
+                return;
+            this._object.destroy();
+            backendDelegate.deleteId(this._id);
+        },
+
+        // object methods
+        serialize: function() {
+            this._validate();
+            return {
+                type: 'object-proxy',
+                apiid: 'OnlineAccounts.Client',
+                objecttype: 'Setup',
+                objectid: this._id,
+            }
+        },
+
+        // methods
+        exec: function(callback) {
+            this._validate();
+
+            var self = this;
+
+            var onFinished = function() {
+                self._object.onFinished.disconnect(onFinished);
+                callback();
+            }
+
+            this._object.onFinished.connect(onFinished);
+            this._object.exec();
+        }
+    };
+
+    return {
+        requestAccount: function(applicationId, providerId, callback) {
+            var setup = new Setup({
+                'applicationId': applicationId,
+                'providerId': providerId,
+            });
+            var onFinished = function() {
+                setup.destroy();
+                callback();
+            };
+            setup.exec(onFinished);
+        },
+    };
+}

=== modified file 'src/Ubuntu/UnityWebApps/bindings/online-accounts/backend/online-accounts.js'
--- src/Ubuntu/UnityWebApps/bindings/online-accounts/backend/online-accounts.js	2014-05-22 08:54:56 +0000
+++ src/Ubuntu/UnityWebApps/bindings/online-accounts/backend/online-accounts.js	2015-03-04 17:01:07 +0000
@@ -673,6 +673,8 @@
             }
         },
 
+        Client: OnlineAccountsClientApiBackend.createOnlineAccountsClientApi(backendDelegate),
+
         // Internal
 
         dispatchToObject: function(infos) {

=== modified file 'src/Ubuntu/UnityWebApps/bindings/online-accounts/client/online-accounts.js'
--- src/Ubuntu/UnityWebApps/bindings/online-accounts/client/online-accounts.js	2014-05-09 13:17:09 +0000
+++ src/Ubuntu/UnityWebApps/bindings/online-accounts/client/online-accounts.js	2015-03-04 17:01:07 +0000
@@ -161,7 +161,7 @@
              *
              * @method api.getAccounts
              * @param filters {Object} A dictionary of parameters to filter the result. The filtering keys are:
-             * - application: the ID of a application (see /usr/share/accounts/applications/ or ~/.local/share/accounts/applications/ for a list of the available applications)
+             * - applicationId: the ID of a application (see /usr/share/accounts/applications/ or ~/.local/share/accounts/applications/ for a list of the available applications)
              * - provider: the ID of a provider (see /usr/share/accounts/providers/ or ~/.local/share/accounts/providers/ for a list of the available providers)
              * - service: the ID of a service (see /usr/share/accounts/services/ or ~/.local/share/accounts/services/ for a list of the available services)
              *
@@ -215,6 +215,51 @@
                                    , [filters]
                                    , callback);
             },
+            /**
+             * Requests access to an account.
+             *
+             * Applications must invoke this method in order to obtain access
+             * to an account.  The user will be prompted to grant access to
+             * either an existing account, to create a new one or to decline
+             * the request.
+             *
+             * @method api.requestAccount
+             * @param applicationId {String} The ID of the application
+             * requesting the account (see /usr/share/accounts/applications/ or
+             * ~/.local/share/accounts/applications/ for a list of the
+             * available applications)
+             * @param providerId {String} The ID of the provider of the desired
+             * account (see /usr/share/accounts/providers/ or
+             * ~/.local/share/accounts/providers/ for a list of the available
+             * providers)
+             * @param callback {Function()} Callback which will be invoked
+             * after the access request has been decided (either with the
+             * access to an account being granted, or with a refusal).
+             *
+             * @example
+               var api = external.getUnityObject(1.0);
+               var oa = api.OnlineAccounts;
+
+               var appId = 'com.ubuntu.developer.me.MyPackage_MyApp';
+               oa.api.requestAccount(appId,
+                                     'facebook',
+                                     function() {
+                 oa.api.getAccounts({ 'application': appId }, function(result) {
+                   for (var i = 0; i < result.length; ++i) {
+                     console.log("name: " + result[i].displayName()
+                                 + ', id: ' + result[i].accountId()
+                                 + ', providerName: ' + result[i].provider().displayName
+                                 + ', enabled: ' + (result[i].enabled() ? "true" : "false")
+                                 );
+                   }
+                 });
+               });
+             */
+            requestAccount: function(applicationId, providerId, callback) {
+                backendBridge.call('OnlineAccounts.Client.requestAccount',
+                                   [ applicationId, providerId],
+                                   callback);
+            },
         },