Merge lp:~abreu-alexandre/unity-webapps-qml/14.10-backport-oa-api-requestaccount into lp:unity-webapps-qml/14.10

[Alexandre Abreu]

Backport requestAccount() new OA API to 14.10

Backport requestAccount() new OA API to 14.10

[lp:~abreu-alexandre/unity-webapps-qml/14.10-backport-oa-api-requestaccount]

135. By Alexandre Abreu on 2015-03-16

fixes

[Alberto Mardegan (mardy)]

Yes, looks familiar :-)

review: Approve

Unmerged revisions

135. By Alexandre Abreu on 2015-03-16

fixes

134. By Alexandre Abreu on 2015-03-06

backport requestAccount() for OA API

=== modified file 'debian/control'
--- debian/control	2014-10-14 10:02:49 +0000
+++ debian/control	2015-03-16 20:19:48 +0000
@@ -36,7 +36,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-16 20:19:48 +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.js'
--- src/Ubuntu/UnityWebApps/UnityWebApps.js	2014-07-18 13:43:55 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.js	2015-03-16 20:19:48 +0000
@@ -75,8 +75,7 @@
             var cb = this._onMessageReceivedCallback.bind(self);
             self._bindeeProxies.messageReceivedConnect(cb);
 
-            cb = this._onLoadingStartedCallback.bind(self);
-            self._bindeeProxies.loadingStartedConnect(cb);
+	    this._onLoadingStartedCallback();
         },
 
         /**
 
=== 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-16 20:19:48 +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	2014-07-18 21:46:57 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2015-03-16 20:19:48 +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
 
 /*!
@@ -167,6 +168,7 @@
      */
     property string _opt_homepage: ""
 
+    signal userScriptsInjected()
 
     Settings {
         id: settings
@@ -237,6 +239,8 @@
 
         if (internal.backends)
             internal.instance.setBackends(internal.backends)
+
+	userScriptsInjected();
     }
 
     /*!
@@ -392,7 +396,11 @@
       \internal
 
      */
-    onModelChanged: model.modelContentChanged.connect(__setupNamedWebappEnvironment)
+    onModelChanged: {
+        if (model) {
+            model.modelContentChanged.connect(__setupNamedWebappEnvironment)
+        }
+    }
 
     /*!
       \internal
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-07-18 13:43:55 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2015-03-16 20:19:48 +0000
@@ -64,7 +64,7 @@
     this.disposer = disposer;
     this.makeSignalDisconnecter = makeSignalDisconnecter;
     this._userScriptInjected = false;
-    this._WEBAPPS_USER_SCRIPT_CONTEXT = "oxide://UnityWebappsApi";
+    this._WEBAPPS_USER_SCRIPT_CONTEXT = "oxide://main-world";
 }
 OxideWebviewAdapter.prototype = {
     injectUserScripts: function(userScriptUrls) {
@@ -82,7 +82,7 @@
             var scriptEnd = "}";
             var statement = scriptStart +
                     '"' + this._WEBAPPS_USER_SCRIPT_CONTEXT + '"' +
-                    '; matchAllFrames: false; url: "' +  userScriptUrls[i] + '";' + scriptEnd;
+                    '; matchAllFrames: false; emulateGreasemonkey: true; url: "' +  userScriptUrls[i] + '";' + scriptEnd;
             context.addUserScript(Qt.createQmlObject(statement, this.webview));
         }
         this._userScriptInjected = true;
 
=== 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-16 20:19:48 +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-16 20:19:48 +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-16 20:19:48 +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);
+            },
         },
 
 
 
=== modified file 'src/Ubuntu/UnityWebApps/common/js/unity-backend-messaging-proxy.js'
--- src/Ubuntu/UnityWebApps/common/js/unity-backend-messaging-proxy.js	2014-03-28 13:21:47 +0000
+++ src/Ubuntu/UnityWebApps/common/js/unity-backend-messaging-proxy.js	2015-03-16 20:19:48 +0000
@@ -4,7 +4,7 @@
             navigator.qt.postMessage) {
         return new UnityQtWebkitBackendMessagingProxy();
     }
-    else if (window.oxide) {
+    else if (oxide) {
         return new UnityOxideBackendMessagingProxy();
     }
     return null;