Merge lp:~3v1n0/ubuntu-system-settings-online-accounts/webview-prefs into lp:ubuntu-system-settings-online-accounts

[Marco Trevisan (Treviño)]

OAuthMain: add ability to clients to change WebView preferences

Sometimes OAuthMain extenders might need to change the webview
preferences, this adds a webViewPreferences property that can
be filled with values for overriding defaults

I had to login to a service that needed the local storage to be available in the WebView when logging in, and this is not enabled by default in the account view.

I'm not sure whether is a good thing to enable that in the WebView for every account, so while I could just override the default OAuth.qml and WebView.qml in my app, this is not the best thing as it could lead to breakage on future changes.

So, I thought that it might be reasonable to add a webViewPreferences that every account that extends OAuthMain can easily change.

In this way I can get things working by just doing:

OAuthMain
{
  webViewPreferences: {"localStorageEnabled": true}
}

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/197/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1380/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/17
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1218/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1378
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18094

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

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

The code looks good, but do you have an example plugin to test this?

[Marco Trevisan (Treviño) (3v1n0)]

Yes, here it is: https://github.com/3v1n0/uBullet/tree/master/pushbullet-account

[Alberto Mardegan (mardy)]

Tested, works fine.

review: Approve

[Víctor R. Ruiz (vrruiz)]

The new feature needs an automated test.

review: Needs Fixing

[Alberto Mardegan (mardy)]

Marco do you think you could add the test? You can use a fake Ubuntu.WebView and just check that the preferences are propagated to it.

If not, I'll do that, but it will take some time as this is not currently in uour high-priority list.

[Marco Trevisan (Treviño) (3v1n0)]

Alberto, ok. I'll look into it.

Are there already some tests that I can use as example?

[Alberto Mardegan (mardy)]

On 20.05.2015 12:19, Marco Trevisan (Treviño) wrote:
> Alberto, ok. I'll look into it.

Thanks! :-)

> Are there already some tests that I can use as example?

Not really, the closest thing I can think of is
tests/client/tst_qml_client.cpp, because I think you'll need a C++ test
which asks the QML engine to run some QML code.

Your test should be in tests/plugin/

Unmerged revisions

238. By Marco Trevisan (Treviño) on 2015-02-16

OAuthMain: add ability to clients to change WebView preferences

Sometimes OAuthMain extenders might need to change the webview
preferences, this adds a webViewPreferences property that can
be filled with values for overriding defaults

=== modified file 'plugins/module/OAuth.qml'
--- plugins/module/OAuth.qml	2015-01-23 11:13:02 +0000
+++ plugins/module/OAuth.qml	2015-02-16 19:15:28 +0000
@@ -31,6 +31,7 @@
     property variant accessControlList: ["unconfined"]
 
     property variant authReply
+    property variant webViewPreferences
     property bool isNewAccount: false
     property variant __account: account
     property bool __isAuthenticating: false
@@ -55,7 +56,8 @@
             if (request) {
                 console.log("RequestHandler captured request!")
                 loader.setSource("WebView.qml", {
-                    "signonRequest": request
+                    "signonRequest": request,
+                    "webViewPreferences": webViewPreferences
                 })
             } else {
                 console.log("Request destroyed!")
 
=== modified file 'plugins/module/OAuthMain.qml'
--- plugins/module/OAuthMain.qml	2014-03-12 13:20:27 +0000
+++ plugins/module/OAuthMain.qml	2015-02-16 19:15:28 +0000
@@ -28,6 +28,9 @@
     property Component creationComponent: null
     property Component editingComponent: null
 
+    /* To override the WebView preferences */
+    property variant webViewPreferences: {}
+
     property alias source: loader.source
 
     signal finished
@@ -40,6 +43,11 @@
         source: sourceComponent === null ? (account.accountId != 0 ? editingComponentUrl : creationComponentUrl) : ""
         sourceComponent: account.accountId != 0 ? editingComponent : creationComponent
 
+        onLoaded: {
+            if (source === creationComponentUrl)
+                loader.item.webViewPreferences = webViewPreferences
+        }
+
         Connections {
             target: loader.item
             onFinished: root.finished()
 
=== modified file 'plugins/module/WebView.qml'
--- plugins/module/WebView.qml	2014-09-30 11:20:11 +0000
+++ plugins/module/WebView.qml	2015-02-16 19:15:28 +0000
@@ -6,10 +6,14 @@
     id: root
 
     property QtObject signonRequest
+    property variant webViewPreferences
 
     Component.onCompleted: {
         signonRequest.authenticated.connect(onAuthenticated)
         url = signonRequest.startUrl
+
+        for (var name in webViewPreferences)
+            preferences[name] = webViewPreferences[name];
     }
 
     onLoadingChanged: {