Merge lp:~mardy/account-plugins/onedrive_provider into lp:~gary-wzl77/account-plugins/onedrive_provider

[Alberto Mardegan]

Use new api to get username, log errors.

Unmerged revisions

181. By Alberto Mardegan on 2016-11-02

Update plugin to new API

=== modified file 'data/providers/microsoft.provider.in.in'
--- data/providers/microsoft.provider.in.in	2016-10-26 11:47:38 +0000
+++ data/providers/microsoft.provider.in.in	2016-11-02 12:04:34 +0000
@@ -17,7 +17,7 @@
           <setting name="RedirectUri">https://login.live.com/oauth20_desktop.srf</setting>
           <setting name="ResponseType">token</setting>
           <setting name="ClientId">@MICROSOFT_CLIENT_ID@</setting>
-          <setting type="as" name="Scope">['onedrive.readwrite onedrive.appfolder']</setting>          
+          <setting type="as" name="Scope">['onedrive.readwrite', 'onedrive.appfolder']</setting>          
           <setting type="b" name="DisableStateParameter">true</setting>
         </group>
       </group>

=== modified file 'qml/microsoft/Main.qml'
--- qml/microsoft/Main.qml	2016-11-02 08:34:54 +0000
+++ qml/microsoft/Main.qml	2016-11-02 12:04:34 +0000
@@ -2,7 +2,7 @@
 
 OAuthMain {
     creationComponent: OAuth {
-        function getUserName(reply) {
+        function getUserName(reply, callback) {
             var http = new XMLHttpRequest();
             var url = "https://api.onedrive.com/v1.0/drive";
             http.open("GET", url, true);
@@ -11,16 +11,17 @@
                 if (http.readyState === 4) {
                     if (http.status === 200) {
                         var response = JSON.parse(http.responseText);
-                        account.updateDisplayName(response.owner.user.displayName +
-                                                  " ( id: " + response.owner.user.id + ")");
-                        account.synced.connect(finished);
-                        account.sync();
+                        callback(response.owner.user.displayName +
+                                 " ( id: " + response.owner.user.id + ")");
                     } else {
+                        console.log("error: " + http.status);
+                        console.log("response text: " + http.responseText);
                         cancel();
                     }
                 }
             };
             http.send(null);
+            return true;
         }
-    } 
+    }
 }