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

[Gary.Wang]

Add onedrive account plugin.

Add onedrive account plugin.

Please find the onedrive scope at the following link for a quick review.
https://drive.google.com/open?id=0B2H9ECPSSfqIeVhUTHo5dXZRcHM

[Alberto Mardegan (mardy)]

Hi Gary! I think that the plugin should be called Windows Live, because OneDrive it's only one of its services.

We already had a Windows Live plugin, it got removed here:
http://bazaar.launchpad.net/~online-accounts/account-plugins/trunk/revision/150

but the file in data/providers/facebook.provider.in.in is still there, so you can update it instead.
You should also update the debian/control file to remove the line "Conflicts: account-plugin-windows-live," which is no longer relevant now.

review: Needs Fixing

[Gary.Wang (gary-wzl77)]

Hi mandy
    Please check the following link
    https://msdn.microsoft.com/en-us/library/office/dn631819.aspx

    "Instead of using the Live SDK, you might want to try out the new OneDrive API. The OneDrive API is a RESTful API, that works directly with OneDrive, on many platforms, and *completely independent* of the Live SDK. This API provides a faster way to authenticate users, allows large file uploads, and more."

    Also you can find the onedrive oauth dev page here.
    https://dev.onedrive.com/auth/msa_oauth.htm

    On the other hand, in order to easily to find "correct" account plugin from scopes/apps, I tend to use 'onedrive' as account plugin name, instead of "window live".
    As we have onedrive scope and storage provider here already.
    https://code.launchpad.net/storage-provider-onedrive
    https://code.launchpad.net/~hanloon-team/hanloon/onedrive_scope

    I'd like to hear you options on this.
    Thanks.

[Alberto Mardegan (mardy)]

> Hi mandy
> Please check the following link
> https://msdn.microsoft.com/en-us/library/office/dn631819.aspx
>
> "Instead of using the Live SDK, you might want to try out the new OneDrive
> API. The OneDrive API is a RESTful API, that works directly with OneDrive, on
> many platforms, and *completely independent* of the Live SDK. This API
> provides a faster way to authenticate users, allows large file uploads, and
> more."

Yes, that's about the recommended API to use, but:

> Also you can find the onedrive oauth dev page here.
> https://dev.onedrive.com/auth/msa_oauth.htm

OneDrive is still using the Live account for authentication. Apart from a change in the scopes list, all other authentication parameters are the same. Given that in the future we might support other services provided by the Live account, it's not a good idea to refer to this provider as "onedrive".

> On the other hand, in order to easily to find "correct" account plugin
> from scopes/apps, I tend to use 'onedrive' as account plugin name, instead of
> "window live".
> As we have onedrive scope and storage provider here already.
> https://code.launchpad.net/storage-provider-onedrive
> https://code.launchpad.net/~hanloon-team/hanloon/onedrive_scope

Given that at the moment OneDrive is the only service we support for the Live account, I don't have any strong objections if you want to set the display name of the Live account to "OneDrive", so that users will find it more easily. However, the provider id should be not specific to OneDrive, but instead refer to Microsoft in general.

I now see that the Windows Live brand is actually discontinued [1], so even though the website is called live.com, it seems that Microsoft is trying to forget that name and instead call it just "Microsoft account", as in [2] and [3].
So, my suggestion is to use "microsoft" as provider ID.

[1] https://en.wikipedia.org/wiki/Windows_Live
[2] https://www.microsoft.com/en-us/account/
[3] https://login.live.com/login.srf

[lp:~gary-wzl77/account-plugins/onedrive_provider]

177. By Gary.Wang on 2016-10-14

1.use microsoft as added account plugin name.
2.remove the deprecated account(windows-live).

[Gary.Wang (gary-wzl77)]

As provider id is changed to "microsoft", the click package needs some adjustment accordingly.
Please find the latest onedrive scope here.
https://drive.google.com/open?id=0B2H9ECPSSfqIOU5iUHYxaWVPM2M

Thanks.

[Alberto Mardegan (mardy)]

Thanks Gary! Please have a look at the comments inline, there are a few changes I'd recommend doing, but otherwise it's good!

review: Needs Fixing

[Gary.Wang (gary-wzl77)]

Sorry for the late reply. Please see the inline comment.
Thanks.

[lp:~gary-wzl77/account-plugins/onedrive_provider]

178. By Gary.Wang on 2016-10-26

1.fixed translations field("Microsoft" -> "account-plugins")
2.fixed redirect URL with recommended one.

179. By Gary.Wang on 2016-11-02

query user information so that we can display it on account page.

[Alberto Mardegan (mardy)]

Looks good, thanks!

review: Approve

[lp:~gary-wzl77/account-plugins/onedrive_provider]

180. By Gary.Wang on 2016-11-02

minor code change as windows-live.provider is deprecated.

[Alberto Mardegan (mardy)]

Hi Gary, after trying out this branch I would like to request some changes. You can see that I've proposed a branch, please merge it into this one.

The most serious problem I've found is that I had a live.com account I had been using for testing, but I never used onedrive before with that account. When I tried to create the account in my phone the authentication went fine, I could get the access code, but then getting the username was failing:

=================
ui-proxy.cpp 184 onDataReady QMap(("code", QVariant(QString, "finished") ) ( "data" , QVariant(QVariantMap, QMap(("UrlResponse", QVariant(QString, "https://login.live.com/oauth20_desktop.srf?lc=1040#access_token=XXX&token_type=bearer&expires_in=3600&scope=onedrive.readwrite onedrive.appfolder onedrive.readonly&user_id=AAAAAAAAAAAAAAAAAAAAAPywB7MPl1COV-NhKCYqWDw") ) ) ) ) ( "delay" , QVariant(int, 0) ) ( "id" , QVariant(int, 1) ) ( "interface" , QVariant(QString, "com.nokia.singlesignonui") ) )
browser-request.cpp 125 ~BrowserRequestPrivate
browser-request.cpp 325 closeView
qml: error: 403
qml: response text: {"error":{"code":"accessDenied","message":"Access Denied"}}
qml: Removing credentials...
qml: ====== PLUGIN FINISHED ======
provider-request.cpp 175 deny
=================

I tried many times, and it always failed. Then I tried to go to the onedrive site from the browser, and after logging in (with the same account) I was asked to accept the terms & conditions, and then I got to the main web page of onedrive where I can see my folders (all empty, since I never used it).
After doing this step, I tried creating the account on the phone again, and this time it worked.

To me, it sounds like a bug in the onedrive server, but I wonder if we should handle it better; maybe you can change the code in the onedrive QML plugin, and if the username cannot be obtained you can just do 'callback("")' (that is, you return an empty username) instead of calling cancel(). What do you think?

Also, I don't think we should include the user ID in the display name, it makes the display name too long (in my phone, it occupies 2 rows!). Maybe we should use the user ID only if the user name is empty. Can you please change this?

review: Needs Fixing

[Gary.Wang (gary-wzl77)]

Yes, I hit the same problem if user's not accepted the terms & conditions yet.

1...Return an empty username instead of calling cancel
Basically, I think empty username is sth we need to avoid since we have been discussing this issue with michi and james that users can't distinguish two Microsoft account when they have two microsoft account logged in if they hit the above problem. Yes, I know it's a rare case.
2. Maybe we should use the user ID only if the user name is empty. Can you please change this?
The reason why I append user id here is that Microsoft didn't provider user email address in response body so that there is probably a rare case that two same accounts (e.g. two "Gary" in display name field) are shown in account page, which makes users confused.

However, I saw your merge proposal, You call cancel() if user name is not be obtained and still append user id into display name, which look good.

[lp:~gary-wzl77/account-plugins/onedrive_provider]

181. By Gary.Wang on 2016-11-08

Merge mardy's branch to use microsoft graph API.

=== modified file 'Makefile.am'
--- Makefile.am	2016-08-31 06:50:13 +0000
+++ Makefile.am	2016-11-08 08:02:34 +0000
@@ -90,12 +90,12 @@
 	data/providers/linkedin.provider.in.in \
 	data/providers/instagram.provider.in.in \
 	data/providers/mcloud.provider.in.in \
+	data/providers/microsoft.provider.in.in \
 	data/providers/owncloud.provider.in.in \
 	data/providers/sina.provider.in.in \
 	data/providers/sohu.provider.in.in \
 	data/providers/twitter.provider.in.in \
-	data/providers/vk.provider.in.in \
-	data/providers/windows-live.provider.in.in
+	data/providers/vk.provider.in.in
 
 providers_DATA = \
 	$(providers_in_in_files:.provider.in.in=.provider)
@@ -141,6 +141,7 @@
 iconsdir = $(datadir)/icons/hicolor/32x32/apps
 dist_icons_DATA = \
 	data/icons/mcloud.png \
+	data/icons/microsoft.png \
 	data/icons/owncloud.png \
 	data/icons/vk.png
 
 
=== modified file 'configure.ac'
--- configure.ac	2016-06-16 11:48:50 +0000
+++ configure.ac	2016-11-08 08:02:34 +0000
@@ -242,6 +242,14 @@
 AC_SUBST(MCLOUD_CLIENT_ID, ["$mcloud_client_id"])
 AC_SUBST(MCLOUD_CLIENT_SECRET, ["$mcloud_client_secret"])
 
+# Set microsoft client id
+AC_ARG_WITH(microsoft-client-id,
+            [AS_HELP_STRING([--with-microsoft-client-id],
+                            [Microsoft client id])],
+                            [microsoft_client_id=$withval],
+                            [microsoft_client_id="478797ed-02c1-442b-bebd-709401131e7d"])
+AC_SUBST(MICROSOFT_CLIENT_ID, ["$microsoft_client_id"])
+
 # Set VK client id
 AC_ARG_WITH(vk-client-id,
             [AS_HELP_STRING([--with-vk-client-id],
@@ -250,14 +258,6 @@
                             [vk_client_id="5404010"])
 AC_SUBST(VK_CLIENT_ID, ["$vk_client_id"])
 
-# Set Windows Live client id
-AC_ARG_WITH(windows-live-client-id,
-            [AS_HELP_STRING([--with-windows-live-client-id],
-                            [Windows Live client ID])],
-                            [windows_live_client_id=$withval],
-                            [windows_live_client_id="00000000480CBF28"])
-AC_SUBST(WINDOWS_LIVE_CLIENT_ID, ["$windows_live_client_id"])
-
 AC_CONFIG_FILES([
 	data/providers/facebook.provider.in
 	data/providers/flickr.provider.in
@@ -267,12 +267,12 @@
 	data/providers/linkedin.provider.in
 	data/providers/instagram.provider.in
 	data/providers/mcloud.provider.in
+	data/providers/microsoft.provider.in
 	data/providers/owncloud.provider.in
 	data/providers/sina.provider.in
 	data/providers/sohu.provider.in
 	data/providers/twitter.provider.in
 	data/providers/vk.provider.in
-	data/providers/windows-live.provider.in
 	Makefile
 	po/Makefile.in
 	qml/Makefile
 
=== added file 'data/icons/microsoft.png'
 Binary files data/icons/microsoft.png	1970-01-01 00:00:00 +0000 and data/icons/microsoft.png	2016-11-08 08:02:34 +0000 differ
=== added file 'data/providers/microsoft.provider.in.in'
--- data/providers/microsoft.provider.in.in	1970-01-01 00:00:00 +0000
+++ data/providers/microsoft.provider.in.in	2016-11-08 08:02:34 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="microsoft">
+  <name>Microsoft</name>
+  <icon>microsoft</icon>
+  <translations>account-plugins</translations>
+  <domains>.*live\.com</domains>
+  <plugin>generic-oauth</plugin>
+  <single-account>true</single-account>
+  <template>
+    <group name="auth">
+      <setting name="method">oauth2</setting>
+      <setting name="mechanism">user_agent</setting>
+      <group name="oauth2">
+        <group name="user_agent">
+          <setting name="Host">login.live.com</setting>
+          <setting name="AuthPath">oauth20_authorize.srf</setting>
+          <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">['User.Read', 'Files.ReadWrite']</setting>          
+          <setting type="b" name="DisableStateParameter">true</setting>
+        </group>
+      </group>
+    </group>
+  </template>
+</provider>
 
=== removed file 'data/providers/windows-live.provider.in.in'
--- data/providers/windows-live.provider.in.in	2013-11-14 11:42:15 +0000
+++ data/providers/windows-live.provider.in.in	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<provider id="windows-live">
-  <name>Windows Live</name>
-  <icon>live</icon>
-  <translations>account-plugins</translations>
-  <domains>.*live\.com</domains>
-  <plugin>generic-oauth</plugin>
-
-  <template>
-    <group name="auth">
-      <setting name="method">oauth2</setting>
-      <setting name="mechanism">web_server</setting>
-      <group name="oauth2">
-        <group name="web_server">
-          <setting name="Host">login.live.com</setting>
-          <setting name="AuthPath">/oauth20_authorize.srf</setting>
-          <setting name="TokenPath">/oauth20_token.srf</setting>
-          <setting name="RedirectUri">https://login.live.com/oauth20_desktop.srf</setting>
-          <setting name="ResponseType">code</setting>
-          <setting name="Scope" type="as">['wl.messenger','wl.offline_access','wl.emails', 'wl.imap']</setting>
-          <setting name="ClientId">@WINDOWS_LIVE_CLIENT_ID@</setting>
-        </group>
-      </group>
-    </group>
-  </template>
-</provider>
 
=== added file 'debian/account-plugin-microsoft.install'
--- debian/account-plugin-microsoft.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-microsoft.install	2016-11-08 08:02:34 +0000
@@ -0,0 +1,3 @@
+usr/share/accounts/providers/microsoft.provider
+usr/share/accounts/qml-plugins/microsoft/*.qml
+usr/share/icons/hicolor/32x32/apps/microsoft.png
 
=== modified file 'debian/control'
--- debian/control	2016-08-31 06:50:13 +0000
+++ debian/control	2016-11-08 08:02:34 +0000
@@ -26,7 +26,6 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
          signon-plugin-oauth2,
-Conflicts: account-plugin-windows-live,
 Description: Online account plugin support lib for Unity 7 - generic OAuth
  Support library for the Unity 7 OAuth-based online account plugins
 
@@ -156,6 +155,14 @@
  This plugin adds support for creating mCloud accounts in the Unity Control
  Center
 
+Package: account-plugin-microsoft
+Architecture: all
+Depends: ${misc:Depends},
+         ubuntu-system-settings-online-accounts,
+Description: Online account plugin for Unity - Microsoft
+ This plugin adds support for creating microsoft accounts in the Unity Control
+ Center
+
 Package: account-plugin-owncloud
 Architecture: all
 Depends: ${misc:Depends},
 
=== modified file 'debian/rules'
--- debian/rules	2016-05-31 08:53:33 +0000
+++ debian/rules	2016-11-08 08:02:34 +0000
@@ -11,7 +11,6 @@
 	dh_auto_configure -- --enable-qml-plugins \
 		--with-twitter-consumer-key="NGOB5S7sICsj6epjh0PhAw" \
 		--with-twitter-consumer-secret="rbUEJCBEokMnGZd8bubd0QL2cSmoCjJeyiSJpnx3OM0" \
-		--with-windows-live-client-id="00000000400D5635" \
 		--with-facebook-client-id="271112146382618" \
 		--with-foursquare-client-id="1I2UNJXPHNDZT3OPZOOA5LCPIUEUJFMKRXSF42UFCN1KXKTK" \
 		--with-google-client-id="759250720802-4sii0me9963n9fdqdmi7cepn6ub8luoh.apps.googleusercontent.com" \
@@ -24,12 +23,13 @@
 		--with-instagram-client-secret="4751ccdc39c648719ea83cfb1c866c26" \
 		--with-mcloud-client-id="APP1ZtqoN3R0002" \
 		--with-mcloud-client-secret="A70EFCDC91456349E7FDECF0A33574AC" \
+		--with-microsoft-client-id="478797ed-02c1-442b-bebd-709401131e7d" \
 		--with-vk-client-id="5402699"
 
 override_dh_install:
 	rm -f debian/*/usr/lib/*/*/*.la
 	# the service is not valid anymore so we don't ship those
-	rm debian/tmp/etc/signon-ui/webkit-options.d/login.live.com.conf debian/tmp/usr/share/accounts/providers/windows-live.provider
+	rm debian/tmp/etc/signon-ui/webkit-options.d/login.live.com.conf
 	mkdir -p debian/tmp/usr/share/account-plugins/tools
 	dh_install --fail-missing
 
 
=== modified file 'qml/Makefile.am'
--- qml/Makefile.am	2016-06-01 13:01:07 +0000
+++ qml/Makefile.am	2016-11-08 08:02:34 +0000
@@ -3,6 +3,7 @@
 	flickr/Main.qml \
 	google/Main.qml \
 	mcloud/Main.qml \
+	microsoft/Main.qml \
 	owncloud/Main.qml \
 	owncloud/NewAccount.qml \
 	twitter/Main.qml \
 
=== added directory 'qml/microsoft'
=== added file 'qml/microsoft/Main.qml'
--- qml/microsoft/Main.qml	1970-01-01 00:00:00 +0000
+++ qml/microsoft/Main.qml	2016-11-08 08:02:34 +0000
@@ -0,0 +1,27 @@
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+OAuthMain {
+    creationComponent: OAuth {
+        function getUserName(reply, callback) {
+            var http = new XMLHttpRequest();
+            var url = "https://graph.microsoft.com/v1.0/me";
+            http.open("GET", url, true);
+            http.setRequestHeader("Authorization", "bearer " + reply.AccessToken);
+            http.onreadystatechange = function() {
+                if (http.readyState === 4) {
+                    if (http.status === 200) {
+                        console.log("response text: " + http.responseText);
+                        var response = JSON.parse(http.responseText);
+                        callback(response.userPrincipalName ? response.userPrincipalName : response.displayName);
+                    } else {
+                        console.log("error: " + http.status);
+                        console.log("response text: " + http.responseText);
+                        cancel();
+                    }
+                }
+            };
+            http.send(null);
+            return true;
+        }
+    }
+}
 
=== modified file 'src/config.vapi'
--- src/config.vapi	2013-04-09 08:45:38 +0000
+++ src/config.vapi	2016-11-08 08:02:34 +0000
@@ -36,5 +36,4 @@
   public const string SINA_CONSUMER_SECRET;
   public const string SOHU_CLIENT_ID;
   public const string SOHU_CLIENT_SECRET;
-  public const string WINDOWS_LIVE_CLIENT_ID;
 }