Merge lp:~mardy/account-plugins/no-duplicates-1468599 into lp:account-plugins

[Alberto Mardegan]

Use the new methods to retrieve the username.

Use the new methods to retrieve the username.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:154
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-wily-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-wily-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-wily-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-wily-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/41/rebuild

review: Approve (continuous-integration)

=== modified file 'qml/facebook/Main.qml'
--- qml/facebook/Main.qml	2015-04-10 05:37:48 +0000
+++ qml/facebook/Main.qml	2016-01-22 15:00:31 +0000
@@ -2,7 +2,9 @@
 
 OAuthMain {
     creationComponent: OAuth {
-        function completeCreation(reply) {
+        property var __meData
+
+        function getUserName(reply, callback) {
             console.log("Access token: " + reply.AccessToken)
             var http = new XMLHttpRequest()
             var url = "https://graph.facebook.com/me?access_token=" + reply.AccessToken;
@@ -12,22 +14,24 @@
                     if (http.status == 200) {
                         console.log("ok")
                         console.log("response text: " + http.responseText)
-                        var response = JSON.parse(http.responseText)
-                        account.updateDisplayName(response.name)
-                        globalAccountService.updateSettings({
-                            'id': response.id
-                        })
-                        account.synced.connect(finished)
-                        account.sync()
-
+                        __meData = JSON.parse(http.responseText)
+                        callback(__meData.name)
+                        return true
                     } else {
                         console.log("error: " + http.status)
-                        cancel()
+                        return false
                     }
                 }
             };
 
             http.send(null);
         }
+
+        function beforeSaving(reply) {
+            globalAccountService.updateSettings({
+                'id': __meData.id
+            })
+            saveAccount()
+        }
     }
 }
 
=== modified file 'qml/google/Main.qml'
--- qml/google/Main.qml	2013-06-26 11:54:11 +0000
+++ qml/google/Main.qml	2016-01-22 15:00:31 +0000
@@ -6,7 +6,7 @@
             "AuthPath": "o/oauth2/auth?access_type=offline&approval_prompt=force"
         }
 
-        function completeCreation(reply) {
+        function getUserName(reply, callback) {
             console.log("Access token: " + reply.AccessToken)
             var http = new XMLHttpRequest()
             var url = "https://www.googleapis.com/oauth2/v3/userinfo";
@@ -18,13 +18,11 @@
                         console.log("ok")
                         console.log("response text: " + http.responseText)
                         var response = JSON.parse(http.responseText)
-                        account.updateDisplayName(response.email)
-                        account.synced.connect(finished)
-                        account.sync()
-
+                        callback(response.email)
+                        return true
                     } else {
                         console.log("error: " + http.status)
-                        cancel()
+                        return false
                     }
                 }
             };