Merge lp:~mardy/account-plugins/mcloud-plugin-lp1587282 into lp:~gary-wzl77/account-plugins/mcloud-plugin-lp1587282

[Alberto Mardegan]

Use the web based flow for authentication

[lp:~mardy/account-plugins/mcloud-plugin-lp1587282]

165. By Alberto Mardegan on 2016-06-02

Enable state parameter

[Gary.Wang (gary-wzl77)]

Thanks for this MP, mandy.
It looks good to me.

I know the reason why you apply this change in the signon-plugin-oauth (https://gitlab.com/accounts-sso/signon-plugin-oauth2/commit/e812eb3e76a1221074e3cf27208aacced5091e42).
And modify the TokenPath here accordingly. :)
...
<setting name="TokenPath">https://ose.caiyun.feixin.10086.cn/oauthApp/OAuth2/getToken</setting>
...

I'd like to test it on my side with my phone, could you please give me the silo number for accounts-sso/signon-plugin-oauth2 with your patch applied after you finish verification.
Thanks.

[Alberto Mardegan (mardy)]

> I'd like to test it on my side with my phone, could you please give me the
> silo number for accounts-sso/signon-plugin-oauth2 with your patch applied
> after you finish verification.

That will probably take some days, as I still need people to review the upstream changes.

But I've uploaded the package to my personal PPA here:
https://launchpad.net/~mardy/+archive/ubuntu/phablet/+packages

While I'm writing this the signon-plugin-oauth is still building on armhf, but it should be ready soon.

[Gary.Wang (gary-wzl77)]

I install latest signon-plugin-oauth package (armhf) on my device from your PPA , and run several tests. Mcloud scopes and camera app with mcloud integration both works very well.
Thanks mandy.
So let's wait for signon-plugin-oauth upstream review.

review: Approve

[Alberto Mardegan (mardy)]

Upstream review was faster than expected. I've put the OAuth plugin in silo 59, the CI ticket is this one:
https://requests.ci-train.ubuntu.com/#/ticket/1497

If you don't have objections, I will also take this branch and put it in the same silo, so that it will be easier to test.

[Gary.Wang (gary-wzl77)]

That's so nice.
No problem.
Thanks.

[lp:~mardy/account-plugins/mcloud-plugin-lp1587282]

166. By Alberto Mardegan on 2016-06-16

Merge from trunk

* debian/control:
  Update package descriptions for all account plugins (LP: #1590786)
[ Alberto Mardegan ]
* Add account plugin for vk.com (LP: #1564883)
* Add ownCloud plugin (LP: #1570986)
[ Alberto Mardegan ]
* After the authentication, retrieve the username in Google, Facebook,
  Flickr and Twitter plugins (LP: #1565772)
* debian/control, debian/libaccount-plugin-facebook.install,
  debian/libaccount-plugin-flickr.install,
  debian/libaccount-plugin-twitter.install:
  add packages containing plugin modules.
* debian/account-plugin-facebook.install,
  debian/account-plugin-flickr.install,
  debian/account-plugin-twitter.install:
  remove unneeded webkit-options files.
[ CI Train Bot ]
* No-change rebuild.

167. By Alberto Mardegan on 2016-06-16

Update description

Unmerged revisions

167. By Alberto Mardegan on 2016-06-16

Update description

166. By Alberto Mardegan on 2016-06-16

Merge from trunk

* debian/control:
  Update package descriptions for all account plugins (LP: #1590786)
[ Alberto Mardegan ]
* Add account plugin for vk.com (LP: #1564883)
* Add ownCloud plugin (LP: #1570986)
[ Alberto Mardegan ]
* After the authentication, retrieve the username in Google, Facebook,
  Flickr and Twitter plugins (LP: #1565772)
* debian/control, debian/libaccount-plugin-facebook.install,
  debian/libaccount-plugin-flickr.install,
  debian/libaccount-plugin-twitter.install:
  add packages containing plugin modules.
* debian/account-plugin-facebook.install,
  debian/account-plugin-flickr.install,
  debian/account-plugin-twitter.install:
  remove unneeded webkit-options files.
[ CI Train Bot ]
* No-change rebuild.

165. By Alberto Mardegan on 2016-06-02

Enable state parameter

164. By Alberto Mardegan on 2016-06-02

Change token path

163. By Alberto Mardegan on 2016-06-01

Use web_server mechanism

=== modified file '.bzrignore'
--- .bzrignore	2016-05-31 08:53:33 +0000
+++ .bzrignore	2016-06-16 11:50:25 +0000
@@ -6,6 +6,7 @@
 *.service
 *.substvars
 *.stamp
+*.trs
 INSTALL
 Makefile
 Makefile.in
@@ -53,7 +54,11 @@
 .deps
 .dirstamp
 .libs
+/src/facebook.c
+/src/flickr.c
 /src/generic-oauth.c
 /src/google.c
+/src/twitter.c
+/test-driver
 /test-provider
 /test-service

=== modified file 'Makefile.am'
--- Makefile.am	2016-05-31 08:53:33 +0000
+++ Makefile.am	2016-06-16 11:50:25 +0000
@@ -8,8 +8,11 @@
 if ENABLE_LIBACCOUNT_PLUGIN
 # Binary account plugins.
 plugin_LTLIBRARIES = \
+	libfacebook.la \
+	libflickr.la \
 	libgeneric-oauth.la \
-	libgoogle.la
+	libgoogle.la \
+	libtwitter.la
 
 VALAFLAGS = \
 	--vapidir $(top_srcdir)/src \
@@ -36,12 +39,32 @@
 	-no-undefined \
 	-export-symbols-regex '^ap_module_get_object_type'
 
-libgoogle_la_CPPFLAGS = $(plugin_cppflags)
-libgoogle_la_LIBADD = $(plugin_libadd)
+libfacebook_la_CPPFLAGS = $(plugin_cppflags) $(RESTAPIS_CFLAGS)
+libfacebook_la_LIBADD = $(plugin_libadd) $(RESTAPIS_LIBS)
+libfacebook_la_LDFLAGS = $(plugin_ldflags)
+libfacebook_la_VALAFLAGS = --pkg libsoup-2.4 --pkg json-glib-1.0
+libfacebook_la_SOURCES = \
+	src/facebook.vala
+
+libflickr_la_CPPFLAGS = $(plugin_cppflags)
+libflickr_la_LIBADD = $(plugin_libadd)
+libflickr_la_LDFLAGS = $(plugin_ldflags)
+libflickr_la_SOURCES = \
+	src/flickr.vala
+
+libgoogle_la_CPPFLAGS = $(plugin_cppflags) $(RESTAPIS_CFLAGS)
+libgoogle_la_LIBADD = $(plugin_libadd) $(RESTAPIS_LIBS)
 libgoogle_la_LDFLAGS = $(plugin_ldflags)
+libgoogle_la_VALAFLAGS = --pkg libsoup-2.4 --pkg json-glib-1.0
 libgoogle_la_SOURCES = \
 	src/google.vala
 
+libtwitter_la_CPPFLAGS = $(plugin_cppflags)
+libtwitter_la_LIBADD = $(plugin_libadd)
+libtwitter_la_LDFLAGS = $(plugin_ldflags)
+libtwitter_la_SOURCES = \
+	src/twitter.vala
+
 libgeneric_oauth_la_CPPFLAGS = $(plugin_cppflags)
 libgeneric_oauth_la_LIBADD = $(plugin_libadd)
 libgeneric_oauth_la_LDFLAGS = $(plugin_ldflags)
@@ -107,12 +130,9 @@
 	data/webkit-options/api.instagram.com.conf \
 	data/webkit-options/api.weibo.com.conf \
 	data/webkit-options/api.t.sohu.com.conf \
-	data/webkit-options/api.twitter.com.conf \
 	data/webkit-options/foursquare.com.conf \
 	data/webkit-options/identi.ca.conf \
 	data/webkit-options/login.live.com.conf \
-	data/webkit-options/login.yahoo.com.conf \
-	data/webkit-options/www.facebook.com.conf \
 	data/webkit-options/www.linkedin.com.conf
 
 # Temporary until these bugs are fixed:

=== modified file 'configure.ac'
--- configure.ac	2016-05-31 08:53:33 +0000
+++ configure.ac	2016-06-16 11:50:25 +0000
@@ -41,7 +41,10 @@
       [have_libaccount_plugin=no])
 
 AS_IF([test "x$have_libaccount_plugin" = "xyes"],
-      [PKG_CHECK_MODULES([ACCOUNT_PLUGINS], [account-plugin >= 0.1.3])],
+      [
+        PKG_CHECK_MODULES([ACCOUNT_PLUGINS], [account-plugin >= 0.1.3])
+        PKG_CHECK_MODULES([RESTAPIS], [libsoup-2.4 json-glib-1.0])
+      ],
       [AS_IF([test "x$enable_libaccount_plugin" = "xyes"],
              [AC_MSG_ERROR([libaccount-plugin support enabled but required dependencies were not found])])])
 

=== modified file 'data/providers/facebook.provider.in.in'
--- data/providers/facebook.provider.in.in	2015-09-09 08:48:32 +0000
+++ data/providers/facebook.provider.in.in	2016-06-16 11:50:25 +0000
@@ -4,7 +4,7 @@
   <icon>facebook</icon>
   <translations>account-plugins</translations>
   <domains>.*facebook\.com</domains>
-  <plugin>generic-oauth</plugin>
+  <plugin>facebook</plugin>
   <single-account>true</single-account>
 
   <template>

=== modified file 'data/providers/flickr.provider.in.in'
--- data/providers/flickr.provider.in.in	2013-02-25 06:25:34 +0000
+++ data/providers/flickr.provider.in.in	2016-06-16 11:50:25 +0000
@@ -4,7 +4,7 @@
   <icon>flickr</icon>
   <translations>account-plugins</translations>
   <domains>.*flickr\.com</domains>
-  <plugin>generic-oauth</plugin>
+  <plugin>flickr</plugin>
 
   <template>
     <group name="auth">

=== modified file 'data/providers/mcloud.provider.in.in'
--- data/providers/mcloud.provider.in.in	2016-05-31 08:53:33 +0000
+++ data/providers/mcloud.provider.in.in	2016-06-16 11:50:25 +0000
@@ -9,18 +9,17 @@
   <template>
     <group name="auth">
       <setting name="method">oauth2</setting>
-      <setting name="mechanism">user_agent</setting>
+      <setting name="mechanism">web_server</setting>
       <group name="oauth2">
-        <group name="user_agent">
+        <group name="web_server">
           <setting name="Host">caiyun.feixin.10086.cn</setting>
           <setting name="AuthPath">authorize.jsp</setting>
-          <setting name="TokenPath">access_token</setting>
+          <setting name="TokenPath">https://ose.caiyun.feixin.10086.cn/oauthApp/OAuth2/getToken</setting>
           <setting name="RedirectUri">http://developer.ubuntu.com/en/</setting>
           <setting name="ResponseType">code</setting>
           <setting name="ClientId">@MCLOUD_CLIENT_ID@</setting>
+          <setting name="ClientSecret">@MCLOUD_CLIENT_SECRET@</setting>
           <setting type="as" name="Scope">['nd_cloud']</setting>          
-          <setting name="ForceClientAuthViaRequestBody" type="b">true</setting>
-          <setting name="DisableStateParameter" type="b">true</setting>
           <setting type="as" name="AllowedSchemes">['https', 'http']</setting>
         </group>
       </group>

=== modified file 'data/providers/twitter.provider.in.in'
--- data/providers/twitter.provider.in.in	2013-02-22 15:17:49 +0000
+++ data/providers/twitter.provider.in.in	2016-06-16 11:50:25 +0000
@@ -3,7 +3,7 @@
   <name>Twitter</name>
   <icon>twitter</icon>
   <translations>account-plugins</translations>
-  <plugin>generic-oauth</plugin>
+  <plugin>twitter</plugin>
   <domains>.*twitter\.com</domains>
 
   <template>

=== removed file 'data/webkit-options/api.twitter.com.conf'
--- data/webkit-options/api.twitter.com.conf	2012-06-19 06:08:30 +0000
+++ data/webkit-options/api.twitter.com.conf	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-UsernameField = input[id="username_or_email"]
-PasswordField = input[id="password"]

=== removed file 'data/webkit-options/login.yahoo.com.conf'
--- data/webkit-options/login.yahoo.com.conf	2012-06-18 14:24:03 +0000
+++ data/webkit-options/login.yahoo.com.conf	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-UsernameField = input[name="login"]
-PasswordField = input[name="passwd"]

=== removed file 'data/webkit-options/www.facebook.com.conf'
--- data/webkit-options/www.facebook.com.conf	2012-05-02 22:58:29 +0000
+++ data/webkit-options/www.facebook.com.conf	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-ViewportWidth = 420
-ViewportHeight = 320
-UsernameField = input[name="email"]
-PasswordField = input[name="pass"]
-#ZoomFactor = 2
-#PreferredWidth = 420
-

=== modified file 'debian/account-plugin-facebook.install'
--- debian/account-plugin-facebook.install	2015-04-17 08:53:11 +0000
+++ debian/account-plugin-facebook.install	2016-06-16 11:50:25 +0000
@@ -1,4 +1,3 @@
-etc/signon-ui/webkit-options.d/www.facebook.com.conf
 usr/share/accounts/services/facebook-sharing.service
 usr/share/accounts/services/facebook-microblog.service
 usr/share/accounts/providers/facebook.provider

=== modified file 'debian/account-plugin-flickr.install'
--- debian/account-plugin-flickr.install	2014-03-31 08:21:46 +0000
+++ debian/account-plugin-flickr.install	2016-06-16 11:50:25 +0000
@@ -1,4 +1,3 @@
-etc/signon-ui/webkit-options.d/login.yahoo.com.conf
 usr/share/accounts/services/flickr-*.service
 usr/share/accounts/providers/flickr.provider
 usr/share/accounts/qml-plugins/flickr/Main.qml

=== modified file 'debian/account-plugin-twitter.install'
--- debian/account-plugin-twitter.install	2013-06-07 11:56:25 +0000
+++ debian/account-plugin-twitter.install	2016-06-16 11:50:25 +0000
@@ -1,4 +1,3 @@
-etc/signon-ui/webkit-options.d/api.twitter.com.conf
 usr/share/accounts/services/twitter-microblog.service
 usr/share/accounts/providers/twitter.provider
 usr/share/accounts/qml-plugins/twitter/Main.qml

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-26 10:52:41 +0000
+++ debian/changelog	2016-06-16 11:50:25 +0000
@@ -1,3 +1,37 @@
+account-plugins (0.13+16.10.20160614-0ubuntu1) yakkety; urgency=medium
+
+  * debian/control:
+    Update package descriptions for all account plugins (LP: #1590786) 
+
+ -- Alberto Mardegan <[e-mail]>  Tue, 14 Jun 2016 09:07:28 +0000
+
+account-plugins (0.13+16.10.20160608-0ubuntu1) yakkety; urgency=medium
+
+  [ Alberto Mardegan ]
+  * Add account plugin for vk.com (LP: #1564883)
+  * Add ownCloud plugin (LP: #1570986)
+
+ -- David Barth <[e-mail]>  Wed, 08 Jun 2016 12:09:10 +0000
+
+account-plugins (0.13+16.04.20160405-0ubuntu1) xenial; urgency=medium
+
+  [ Alberto Mardegan ]
+  * After the authentication, retrieve the username in Google, Facebook,
+    Flickr and Twitter plugins (LP: #1565772)
+  * debian/control, debian/libaccount-plugin-facebook.install,
+    debian/libaccount-plugin-flickr.install,
+    debian/libaccount-plugin-twitter.install:
+    add packages containing plugin modules.
+  * debian/account-plugin-facebook.install,
+    debian/account-plugin-flickr.install,
+    debian/account-plugin-twitter.install:
+    remove unneeded webkit-options files.
+
+  [ CI Train Bot ]
+  * No-change rebuild.
+
+ -- David Barth <[e-mail]>  Tue, 05 Apr 2016 12:57:47 +0000
+
 account-plugins (0.12+16.04.20160126-0ubuntu1) xenial; urgency=medium
 
   [ Alberto Mardegan ]

=== modified file 'debian/control'
--- debian/control	2016-05-31 08:53:33 +0000
+++ debian/control	2016-06-16 11:50:25 +0000
@@ -7,9 +7,11 @@
                gobject-introspection,
                python3,
                pkg-config,
+               libaccount-plugin-1.0-dev (>= 0.1.9),
                libaccounts-glib-dev (>= 1.10),
+               libjson-glib-dev,
                libsignon-glib-dev,
-               libaccount-plugin-1.0-dev (>= 0.1.3),
+               libsoup2.4-dev,
                valac (>= 0.16),
                gnome-common,
                dh-autoreconf,
@@ -24,125 +26,151 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
          signon-plugin-oauth2,
-Replaces: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
-Breaks: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
-Conflicts: account-plugin-generic-oauth (<< 0.10bzr13.04.30),
-           account-plugin-windows-live,
-Description: GNOME Control Center account plugin for single signon - generic OAuth
- GNOME Control Center account plugins for single signon
+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
 
 Package: libaccount-plugin-google
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
          signon-plugin-oauth2,
-Replaces: account-plugin-google (<< 0.10bzr13.04.30)
-Breaks: account-plugin-google (<< 0.10bzr13.04.30)
-Conflicts: account-plugin-google (<< 0.10bzr13.04.30)
-Description: GNOME Control Center account plugin for single signon - Google Auth
- GNOME Control Center account plugins for single signon
+Description: Online account plugin support lib for Unity 7 - Google
+ Support library for the Unity 7 online account plugin
 
 Package: account-plugin-google
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends},
          libaccount-plugin-google | ubuntu-system-settings-online-accounts,
          unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
-Description: GNOME Control Center account plugin for single signon
- GNOME Control Center account plugins for single signon
+Description: Online account plugin for Unity - Google
+ This plugin adds support for creating Google accounts in the Unity Control
+ Center
+
+Package: libaccount-plugin-facebook
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+         signon-plugin-oauth2,
+Description: Online account plugin support lib for Unity 7 - Facebook
+ Support library for the Unity 7 online account plugin
 
 Package: account-plugin-facebook
 Architecture: all
 Depends: ${misc:Depends},
-         libaccount-plugin-generic-oauth | ubuntu-system-settings-online-accounts,
+         libaccount-plugin-facebook | ubuntu-system-settings-online-accounts,
          unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
-Description: GNOME Control Center account plugin for single signon - facebook
- GNOME Control Center account plugins for single signon
+Description: Online account plugin for Unity - Facebook
+ This plugin adds support for creating Facebook accounts in the Unity Control
+ Center
+
+Package: libaccount-plugin-twitter
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+         signon-plugin-oauth2,
+Description: Online account plugin support lib for Unity 7 - Twitter
+ Support library for the Unity 7 online account plugin
 
 Package: account-plugin-twitter
 Architecture: all
 Depends: ${misc:Depends},
-         libaccount-plugin-generic-oauth | ubuntu-system-settings-online-accounts,
+         libaccount-plugin-twitter | ubuntu-system-settings-online-accounts,
          unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
-Description: GNOME Control Center account plugin for single signon - twitter
- GNOME Control Center account plugins for single signon
+Description: Online account plugin for Unity - Twitter
+ This plugin adds support for creating Twitter accounts in the Unity Control
+ Center
+
+Package: libaccount-plugin-flickr
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+         signon-plugin-oauth2,
+Description: Online account plugin support lib for Unity 7 - Flickr
+ Support library for the Unity 7 online account plugin
 
 Package: account-plugin-flickr
 Architecture: all
 Depends: ${misc:Depends},
-         libaccount-plugin-generic-oauth | ubuntu-system-settings-online-accounts,
+         libaccount-plugin-flickr | ubuntu-system-settings-online-accounts,
          unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
-Description: GNOME Control Center account plugin for single signon - flickr
- GNOME Control Center account plugins for single signon
+Description: Online account plugin for Unity - Flickr
+ This plugin adds support for creating Flickr accounts in the Unity Control
+ Center
 
 Package: account-plugin-identica
 Architecture: all
 Depends: ${misc:Depends},
          libaccount-plugin-generic-oauth,
          unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
-Description: GNOME Control Center account plugin for single signon - identica
- GNOME Control Center account plugins for single signon
+Description: Online account plugin for Unity - identi.ca
+ This plugin adds support for creating identi.ca accounts in the Unity Control
+ Center
 
 Package: account-plugin-foursquare
 Architecture: all
 Depends: ${misc:Depends},
          libaccount-plugin-generic-oauth,
          unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
-Description: GNOME Control Center account plugin for single signon - foursquare
- GNOME Control Center account plugins for single signon
+Description: Online account plugin for Unity - FourSquare
+ This plugin adds support for creating FourSquare accounts in the Unity
+ Control Center
 
 Package: account-plugin-sohu
 Architecture: all
 Depends: ${misc:Depends},
          libaccount-plugin-generic-oauth,
          unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
-Description: GNOME Control Center account plugin for single signon - sohu
- GNOME Control Center account plugins for single signon
+Description: Online account plugin for Unity - Sohu
+ This plugin adds support for creating Sohu accounts in the Unity Control
+ Center
 
 Package: account-plugin-sina
 Architecture: all
 Depends: ${misc:Depends},
          libaccount-plugin-generic-oauth,
          unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
-Description: GNOME Control Center account plugin for single signon - sina
- GNOME Control Center account plugins for single signon
+Description: Online account plugin for Unity - Sina
+ This plugin adds support for creating Sina accounts in the Unity Control
+ Center
 
 Package: account-plugin-linkedin
 Architecture: all
 Depends: ${misc:Depends},
          libaccount-plugin-generic-oauth,
          unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
-Description: GNOME Control Center account plugin for single signon - LinkedIn
- GNOME Control Center account plugins for single signon
+Description: Online account plugin for Unity - LinkedIn
+ This plugin adds support for creating LinkedIn accounts in the Unity Control
+ Center
 
 Package: account-plugin-instagram
 Architecture: all
 Depends: ${misc:Depends},
          libaccount-plugin-generic-oauth,
          unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
-Description: GNOME Control Center account plugin for single signon - Instagram
- GNOME Control Center account plugins for single signon
+Description: Online account plugin for Unity - Instagram
+ This plugin adds support for creating Instagram accounts in the Unity Control
+ Center
 
 Package: account-plugin-mcloud
 Architecture: all
 Depends: ${misc:Depends},
          ubuntu-system-settings-online-accounts,
-Description: Account plugin for online accounts - mCloud
- Online Accounts plugin provide the user interface to create accounts for
- third party services.
+Description: Online account plugin for Unity - mCloud
+ This plugin adds support for creating mCloud accounts in the Unity Control
+ Center
 
 Package: account-plugin-owncloud
 Architecture: all
 Depends: ${misc:Depends},
          ubuntu-system-settings-online-accounts,
-Description: Account plugin for online accounts - ownCloud
- Online Accounts plugin provide the user interface to create accounts for
- third party services.
+Description: Online account plugin for Unity - ownCloud
+ This plugin adds support for creating ownCloud accounts in the Unity Control
+ Center
 
 Package: account-plugin-vk
 Architecture: all
 Depends: ${misc:Depends},
          libaccount-plugin-generic-oauth | ubuntu-system-settings-online-accounts,
-Description: GNOME Control Center account plugin for single signon - VKontakte
- GNOME Control Center account plugins for single signon
+Description: Online account plugin for Unity - VKontakte
+ This plugin adds support for creating VKontakte accounts in the Unity Control
+ Center
 
 Package: account-plugin-tools
 Architecture: all
@@ -154,12 +182,5 @@
          gir1.2-accounts-1.0,
          signon-plugin-oauth2,
          unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
-Description: GNOME Control Center account plugins for single signon - tools
- GNOME Control Center account plugins for single signon
-
-Package: account-plugin-icons
-Depends: unity-asset-pool, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+Description: Online account plugins for Unity - tools
+ Command line tools for managing Online Accounts.

=== added file 'debian/libaccount-plugin-facebook.install'
--- debian/libaccount-plugin-facebook.install	1970-01-01 00:00:00 +0000
+++ debian/libaccount-plugin-facebook.install	2016-06-16 11:50:25 +0000
@@ -0,0 +1,1 @@
+usr/lib/libaccount-plugin-1.0/providers/libfacebook.so

=== added file 'debian/libaccount-plugin-flickr.install'
--- debian/libaccount-plugin-flickr.install	1970-01-01 00:00:00 +0000
+++ debian/libaccount-plugin-flickr.install	2016-06-16 11:50:25 +0000
@@ -0,0 +1,1 @@
+usr/lib/libaccount-plugin-1.0/providers/libflickr.so

=== added file 'debian/libaccount-plugin-twitter.install'
--- debian/libaccount-plugin-twitter.install	1970-01-01 00:00:00 +0000
+++ debian/libaccount-plugin-twitter.install	2016-06-16 11:50:25 +0000
@@ -0,0 +1,1 @@
+usr/lib/libaccount-plugin-1.0/providers/libtwitter.so

=== modified file 'qml/Makefile.am'
--- qml/Makefile.am	2016-04-18 12:06:17 +0000
+++ qml/Makefile.am	2016-06-16 11:50:25 +0000
@@ -2,6 +2,7 @@
 	facebook/Main.qml \
 	flickr/Main.qml \
 	google/Main.qml \
+	mcloud/Main.qml \
 	owncloud/Main.qml \
 	owncloud/NewAccount.qml \
 	twitter/Main.qml \

=== removed file 'qml/mcloud/ErrorItem.qml'
--- qml/mcloud/ErrorItem.qml	2016-05-31 08:53:33 +0000
+++ qml/mcloud/ErrorItem.qml	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical Ltd.
- *
- * Contact: Alberto Mardegan <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-Item {
-    id: root
-
-    signal retryRequested()
-
-    Column {
-        anchors {
-            verticalCenter: parent.verticalCenter
-            left: parent.left; right: parent.right
-        }
-        spacing: units.gu(2)
-
-        Label {
-            anchors { left: parent.left; right: parent.right }
-            text: i18n.dtr("ubuntu-system-settings-online-accounts", "This service is not available right now. Try again later.")
-            wrapMode: Text.WordWrap
-            horizontalAlignment: Text.AlignHCenter
-        }
-
-        Button {
-            anchors.horizontalCenter: parent.horizontalCenter
-            text: i18n.dtr("ubuntu-system-settings-online-accounts", "Try Again")
-            onClicked: root.retryRequested()
-        }
-    }
-}

=== modified file 'qml/mcloud/Main.qml'
--- qml/mcloud/Main.qml	2016-05-31 08:53:33 +0000
+++ qml/mcloud/Main.qml	2016-06-16 11:50:25 +0000
@@ -1,7 +1,6 @@
 import Ubuntu.OnlineAccounts.Plugin 1.0
-import "." as Local
 
 OAuthMain {
-    creationComponent: Local.OAuth {
-  }
+    creationComponent: OAuth {
+    }
 }

=== removed file 'qml/mcloud/OAuth.qml'
--- qml/mcloud/OAuth.qml	2016-05-31 08:53:33 +0000
+++ qml/mcloud/OAuth.qml	1970-01-01 00:00:00 +0000
@@ -1,283 +0,0 @@
-/*
- * Copyright (C) 2013-2016 Canonical Ltd.
- *
- * Contact: Alberto Mardegan <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
-import Ubuntu.Components.Popups 1.3
-import Ubuntu.OnlineAccounts 0.1
-import Ubuntu.OnlineAccounts.Plugin 1.0
-
-Item {
-    id: root
-
-    /* To override the parameters coming from the .provider file: */
-    property variant authenticationParameters: {}
-    /* To override the default access control list: */
-    property variant accessControlList: ["unconfined"]
-
-    property variant authReply
-    property bool isNewAccount: false
-    property variant __account: account
-    property bool __isAuthenticating: false
-    property alias globalAccountService: globalAccountSettings
-    property bool loading: loader.status == Loader.Null || loader.status == Loader.Loading
-
-    signal authenticated(variant reply)
-    signal authenticationError(variant error)
-    signal finished
-
-    anchors.fill: parent
-
-    Component.onCompleted: {
-        isNewAccount = (account.accountId === 0)
-        enableAccount()
-        authenticate()
-    }
-
-    RequestHandler {
-        id: requestHandler
-        onRequestChanged: {
-            if (request) {
-                console.log("RequestHandler captured request!")
-                loader.setSource("WebView.qml", {
-                    "signonRequest": request
-                })
-            } else {
-                console.log("Request destroyed!")
-                loader.source = ""
-            }
-        }
-    }
-
-    Credentials {
-        id: creds
-        caption: account.provider.id
-        acl: accessControlList
-        onCredentialsIdChanged: root.credentialsStored()
-    }
-
-    AccountService {
-        id: globalAccountSettings
-        objectHandle: account.accountServiceHandle
-        credentials: creds
-        autoSync: false
-
-        onAuthenticated: {
-            __isAuthenticating = false
-            authReply = reply
-            root.authenticated(reply)
-        }
-        onAuthenticationError: {
-            __isAuthenticating = false
-            root.authenticationError(error)
-        }
-    }
-
-    AccountServiceModel {
-        id: accountServices
-        includeDisabled: true
-        account: __account.objectHandle
-    }
-
-    ListItem.Base {
-        visible: loading && !errorItem.visible
-        height: units.gu(7)
-        showDivider: false
-        anchors.top: parent.top
-
-        Item {
-            height: units.gu(5)
-            width: units.gu(30)
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.top: parent.top
-            anchors.margins: units.gu(1)
-
-            ActivityIndicator {
-                id: loadingIndicator
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.left: parent.left
-                anchors.leftMargin: units.gu(5)
-                running: loading
-                z: 1
-            }
-            Label {
-                text: i18n.dtr("ubuntu-system-settings-online-accounts", "Loading…")
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.left: loadingIndicator.right
-                anchors.leftMargin: units.gu(3)
-            }
-        }
-    }
-
-    Loader {
-        id: loader
-        anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-            bottom: Qt.inputMethod.visible ? osk.top : cancelButton.top
-        }
-        focus: true
-        visible: !loading
-    }
-
-    ErrorItem {
-        id: errorItem
-        anchors { fill: parent; margins: units.gu(4) }
-        visible: false
-        onRetryRequested: {
-            root.credentialsStored()
-            visible = false
-        }
-    }
-
-    KeyboardRectangle {
-        id: osk
-    }
-
-    ListItem.SingleControl {
-        id: cancelButton
-        anchors.bottom: parent.bottom
-        showDivider: false
-        control: Button {
-            text: i18n.dtr("ubuntu-system-settings-online-accounts", "Cancel")
-            width: parent.width - units.gu(4)
-            onClicked: root.cancel()
-        }
-    }
-
-    AccountServiceModel {
-        id: possiblyDuplicateAccounts
-        service: "global"
-        provider: __account.provider.id
-    }
-
-    function authenticate() {
-        console.log("Authenticating...")
-        creds.sync()
-    }
-
-    function credentialsStored() {
-        console.log("Credentials stored, id: " + creds.credentialsId)
-        if (creds.credentialsId == 0) return
-        var parameters = {}
-        parameters[requestHandler.matchKey] = requestHandler.matchId
-        parameters["providerId"] = account.provider.id
-        for (var p in authenticationParameters) {
-            parameters[p] = authenticationParameters[p]
-        }
-        __isAuthenticating = true
-        globalAccountSettings.authenticate(parameters)
-    }
-
-    function cancel() {
-        if (__isAuthenticating) {
-            /* This will cause the authentication to fail, and this method will
-             * be invoked again to delete the credentials. */
-            globalAccountSettings.cancelAuthentication()
-            return
-        }
-        if (isNewAccount && creds.credentialsId != 0) {
-            console.log("Removing credentials...")
-            creds.remove()
-            creds.removed.connect(finished)
-        } else {
-            finished()
-        }
-    }
-
-    function enableAccount() {
-        globalAccountSettings.updateServiceEnabled(true)
-    }
-
-    function getUserName(reply, callback) {
-        /* This should work for OAuth 1.0a; for OAuth 2.0 this function needs
-         * to be reimplemented */
-        if ('ScreenName' in reply) return reply.ScreenName
-        else if ('UserId' in reply) return reply.UserId
-        return ''
-    }
-
-    function accountIsDuplicate(userName) {
-        var model = possiblyDuplicateAccounts
-        for (var i = 0; i < model.count; i++) {
-            if (model.get(i, "displayName") == userName)
-                return true
-        }
-        return false
-    }
-
-    function __gotUserName(userName, reply) {
-        console.log("UserName: " + userName)
-        if (userName != '') {
-            if (accountIsDuplicate(userName)) {
-                var dialog = PopupUtils.open(Qt.resolvedUrl("DuplicateAccount.qml"))
-                dialog.closed.connect(cancel)
-                return
-            }
-            account.updateDisplayName(userName)
-        }
-        beforeSaving(reply)
-    }
-
-    function saveAccount() {
-        account.synced.connect(finished)
-        account.sync()
-    }
-
-    /* reimplement this function in plugins in order to perform some actions
-     * before quitting the plugin */
-    function beforeSaving(reply) {
-        saveAccount()
-    }
-
-    function __getUserNameAndSave(reply) {
-        /* If the completeCreation function is defined, run it */
-        if (typeof(completeCreation) == "function") {
-            console.warn("The completeCreation method is deprecated; use getUserName() or beforeSaving() instead")
-            completeCreation(reply)
-            return
-        }
-
-        var userName = getUserName(reply, function(name) {
-            __gotUserName(name, reply)
-        })
-        if (typeof(userName) == "string") {
-            __gotUserName(userName, reply)
-        } else if (userName === false) {
-            cancel()
-            return
-        }
-        // otherwise (userName === true), wait for the callback to be invoked
-    }
-
-    onAuthenticated: __getUserNameAndSave(reply)
-
-    onAuthenticationError: {
-        console.log("Authentication error, code " + error.code)
-        if (error.code == AccountService.NetworkError) {
-            console.log("Network error")
-            errorItem.visible = true
-            return
-        }
-        root.cancel()
-    }
-
-    onFinished: loading = false
-}

=== removed file 'qml/mcloud/WebView.qml'
--- qml/mcloud/WebView.qml	2016-05-31 08:53:33 +0000
+++ qml/mcloud/WebView.qml	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Web 0.2
-
-WebView {
-    id: root
-
-    property QtObject signonRequest
-    readonly property string token_url: "https://ose.caiyun.feixin.10086.cn/oauthApp/OAuth2/getToken"
-    readonly property string redirect_url: "http://developer.ubuntu.com/en/"
-    readonly property string client_id: "APP1ZtqoN3R0002"
-    readonly property string client_pass: "A70EFCDC91456349E7FDECF0A33574AC"
-
-    Component.onCompleted: {
-        signonRequest.authenticated.connect(onAuthenticated)
-        url = signonRequest.startUrl
-    }
-
-    //1.WORKAROUND: we need to retrieve refresh token instead of access token.
-    function fetchRefreshToken(code) {
-        var http = new XMLHttpRequest()
-        var body = "grant_type=authorization_code&code="+code+"&redirect_uri="+redirect_url
-
-        http.open("POST", token_url, true);
-        http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-        http.setRequestHeader("Authorization", "Basic " + Qt.btoa(client_id + ":" + client_pass));
-        http.onreadystatechange = function() {
-            if (http.readyState === 4 && http.status == 200) {
-                var response = JSON.parse(http.responseText)
-                //create a fake access_token with refresh token. 
-                var urlStr = redirect_url+"#access_token="+response.refresh_token
-                var authUrl = Qt.resolvedUrl(urlStr);
-                signonRequest.currentUrl = authUrl
-            } else {
-                console.log("error: " + http.status)
-            }   
-        };  
-
-        http.send(body);
-    } 
-
-    onLoadingStateChanged: {
-        if (loading) {
-            signonRequest.onLoadStarted()
-        } else if (lastLoadSucceeded) {
-            signonRequest.onLoadFinished(true)
-        } else {
-            signonRequest.onLoadFinished(false)
-        }
-    }
-
-    onUrlChanged: {
-        //2.WORKAROUND: retrieve refresh token if code is fetched
-        var code_pattern= new RegExp("\\?code=.*&");
-        var urlStr = url.toString()
-        if (code_pattern.test(urlStr)){
-            var code = urlStr.match(/\?code=(.*)&/)[1];
-            console.log("code::", code)
-            fetchRefreshToken(code)
-        } else {
-            signonRequest.currentUrl = url
-        }
-    }
-
-    //3.WORKAROUND: Apply desktop useragent to prevent server from detecting android client,
-    //which causes authentication failure.
-    context: WebContext {
-        dataPath: signonRequest ? signonRequest.rootDir : ""
-        userAgent: "Mozilla/5.0 (Linux; Ubuntu 14.04) AppleWebKit/537.36 Chromium/35.0.1870.2 Safari/537.36"
-    }
-
-    function onAuthenticated() {
-        /* Get the cookies and set them on the request */
-        console.log("Authenticated; getting cookies")
-        context.cookieManager.getCookiesResponse.connect(onGotCookies)
-        context.cookieManager.getAllCookies()
-        visible = false
-    }
-
-    function onGotCookies(requestId, cookies) {
-        signonRequest.setCookies(cookies)
-    }
-
-    /* Taken from webbrowser-app */
-    ProgressBar {
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        height: units.dp(3)
-        showProgressPercentage: false
-        visible: root.loading
-        value: root.loadProgress / 100
-    }
-}

=== added file 'src/facebook.vala'
--- src/facebook.vala	1970-01-01 00:00:00 +0000
+++ src/facebook.vala	2016-06-16 11:50:25 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2016 Canonical, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ * Authors:
+ *      Alberto Mardegan <[e-mail]>
+ */
+
+public class FacebookPlugin : Ap.OAuthPlugin {
+    private Soup.Session session;
+
+    public FacebookPlugin (Ag.Account account) {
+        Object (account: account);
+    }
+
+    private void fetch_username (string access_token) {
+        debug ("fetching username, AT = " + access_token);
+        Soup.URI destination_uri =
+            new Soup.URI ("https://graph.facebook.com/me?access_token=" +
+                          access_token);
+        var message = new Soup.Message.from_uri ("GET", destination_uri);
+        session = new Soup.Session ();
+        session.queue_message (message, (sess, msg) => {
+            debug ("Got message reply");
+            string body = (string) msg.response_body.data;
+            Json.Parser parser = new Json.Parser ();
+            try {
+                parser.load_from_data (body);
+
+                Json.Node root = parser.get_root ();
+                Json.Object response_object = root.get_object ();
+                var username = response_object.get_string_member ("name");
+                account.set_display_name (username);
+            } catch (Error error) {
+                warning ("Could not parse reply: " + body);
+            }
+
+            store_account ();
+        });
+    }
+
+    protected override void query_username () {
+        var reply = get_oauth_reply ();
+        Variant? v_token = reply.lookup_value ("AccessToken", null);
+        if (v_token != null) {
+            fetch_username (v_token.get_string ());
+        } else {
+            store_account ();
+        }
+    }
+}
+
+public GLib.Type ap_module_get_object_type ()
+{
+    return typeof (FacebookPlugin);
+}

=== added file 'src/flickr.vala'
--- src/flickr.vala	1970-01-01 00:00:00 +0000
+++ src/flickr.vala	2016-06-16 11:50:25 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2016 Canonical, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ * Authors:
+ *      Alberto Mardegan <[e-mail]>
+ */
+
+public class FlickrPlugin : Ap.OAuthPlugin {
+    public FlickrPlugin (Ag.Account account) {
+        Object (account: account);
+    }
+
+    protected override void query_username () {
+        var reply = get_oauth_reply ();
+        Variant? v_name = reply.lookup_value ("username", null);
+        if (v_name != null) {
+            account.set_display_name (v_name.get_string ());
+        }
+
+        store_account ();
+    }
+}
+
+public GLib.Type ap_module_get_object_type ()
+{
+    return typeof (FlickrPlugin);
+}

=== modified file 'src/google.vala'
--- src/google.vala	2013-06-06 13:16:51 +0000
+++ src/google.vala	2016-06-16 11:50:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Canonical, Inc
+ * Copyright (C) 2012-2016 Canonical, Inc
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -20,6 +20,8 @@
  */
 
 public class GooglePlugin : Ap.OAuthPlugin {
+    private Soup.Session session;
+
     public GooglePlugin (Ag.Account account) {
         Object (account: account);
     }
@@ -44,6 +46,43 @@
 
         set_ignore_cookies (true);
     }
+
+    private void fetch_username (string access_token) {
+        debug ("fetching username, AT = " + access_token);
+        Soup.URI destination_uri =
+            new Soup.URI ("https://www.googleapis.com/oauth2/v3/userinfo");
+        var message = new Soup.Message.from_uri ("POST", destination_uri);
+        message.request_headers.append ("Authorization", "Bearer " + access_token);
+        message.request_headers.set_content_length (0);
+        session = new Soup.Session ();
+        session.queue_message (message, (sess, msg) => {
+            debug ("Got message reply");
+            string body = (string) msg.response_body.data;
+            Json.Parser parser = new Json.Parser ();
+            try {
+                parser.load_from_data (body);
+
+                Json.Node root = parser.get_root ();
+                Json.Object response_object = root.get_object ();
+                var username = response_object.get_string_member ("email");
+                account.set_display_name (username);
+            } catch (Error error) {
+                warning ("Could not parse reply: " + body);
+            }
+
+            store_account ();
+        });
+    }
+
+    protected override void query_username () {
+        var reply = get_oauth_reply ();
+        Variant? v_token = reply.lookup_value ("AccessToken", null);
+        if (v_token != null) {
+            fetch_username (v_token.get_string ());
+        } else {
+            store_account ();
+        }
+    }
 }
 
 public GLib.Type ap_module_get_object_type ()

=== added file 'src/twitter.vala'
--- src/twitter.vala	1970-01-01 00:00:00 +0000
+++ src/twitter.vala	2016-06-16 11:50:25 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2016 Canonical, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ * Authors:
+ *      Alberto Mardegan <[e-mail]>
+ */
+
+public class TwitterPlugin : Ap.OAuthPlugin {
+    public TwitterPlugin (Ag.Account account) {
+        Object (account: account);
+    }
+
+    protected override void query_username () {
+        var reply = get_oauth_reply ();
+        Variant? v_name = reply.lookup_value ("ScreenName", null);
+        if (v_name != null) {
+            account.set_display_name (v_name.get_string ());
+        } else {
+            v_name = reply.lookup_value ("UserId", null);
+            if (v_name != null) {
+                account.set_display_name (v_name.get_string ());
+            }
+        }
+
+        store_account ();
+    }
+}
+
+public GLib.Type ap_module_get_object_type ()
+{
+    return typeof (TwitterPlugin);
+}