Merge lp:~gary-wzl77/ubuntu-system-settings-online-accounts/OAtuh-userAgent into lp:ubuntu-system-settings-online-accounts

[Gary.Wang]

add a new property "userAgent" for OAuth item.

add a new property "userAgent" for OAuth item.

[Alberto Mardegan (mardy)]

Thanks Gary! Mostly good, just please have a look at the inline comments.

review: Needs Fixing

[lp:~gary-wzl77/ubuntu-system-settings-online-accounts/OAtuh-userAgent]

384. By Gary.Wang on 2016-08-29

code change according to inline comments.

[Alberto Mardegan (mardy)]

Thanks!

review: Approve

=== modified file 'plugins/module/OAuth.qml'
--- plugins/module/OAuth.qml	2016-03-22 14:02:27 +0000
+++ plugins/module/OAuth.qml	2016-08-29 07:55:17 +0000
@@ -37,6 +37,7 @@
     property bool __isAuthenticating: false
     property alias globalAccountService: globalAccountSettings
     property bool loading: loader.status == Loader.Null || loader.status == Loader.Loading
+    property string userAgent
 
     signal authenticated(variant reply)
     signal authenticationError(variant error)
@@ -56,7 +57,8 @@
             if (request) {
                 console.log("RequestHandler captured request!")
                 loader.setSource("WebView.qml", {
-                    "signonRequest": request
+                    "signonRequest": request,
+                    "userAgent": userAgent
                 })
             } else {
                 console.log("Request destroyed!")

=== modified file 'plugins/module/WebView.qml'
--- plugins/module/WebView.qml	2016-05-25 15:36:25 +0000
+++ plugins/module/WebView.qml	2016-08-29 07:55:17 +0000
@@ -6,6 +6,7 @@
     id: root
 
     property QtObject signonRequest
+    property string userAgent
 
     onNewViewRequested: {
         var popup = popupComponent.createObject(root, {
@@ -44,6 +45,7 @@
 
     context: WebContext {
         dataPath: signonRequest ? signonRequest.rootDir : ""
+        userAgent: root.userAgent ? root.userAgent : defaultUserAgent
     }
 
     function onAuthenticated() {