Merge lp:~mardy/account-plugins/vkontakte-1564883 into lp:account-plugins

[Alberto Mardegan]

Add account plugin for vk.com

Add account plugin for vk.com

Test app: https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-system-settings-online-accounts?action=AttachFile&do=view&target=it.mardy.account-tester_0.10_all.click

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2013-03-19 08:52:34 +0000
+++ .bzrignore	2016-04-08 12:10:34 +0000
@@ -31,6 +31,7 @@
 /debian/account-plugin-sohu/
 /debian/account-plugin-tools/
 /debian/account-plugin-twitter/
+/debian/account-plugin-vk/
 /debian/account-plugin-windows-live/
 /debian/autoreconf.after
 /debian/autoreconf.before

=== modified file 'Makefile.am'
--- Makefile.am	2015-04-17 08:53:11 +0000
+++ Makefile.am	2016-04-08 12:10:34 +0000
@@ -69,6 +69,7 @@
 	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
 
 providers_DATA = \
@@ -112,6 +113,11 @@
 	data/webkit-options/www.facebook.com.conf \
 	data/webkit-options/www.linkedin.com.conf
 
+# Temporary until https://bugs.launchpad.net/bugs/1567908 is fixed
+iconsdir = $(datadir)/icons/hicolor/32x32/apps
+dist_icons_DATA = \
+	data/icons/vk.png
+
 dist_bin_SCRIPTS = \
 	tools/account-console
 

=== modified file 'configure.ac'
--- configure.ac	2014-09-11 10:07:28 +0000
+++ configure.ac	2016-04-08 12:10:34 +0000
@@ -225,6 +225,14 @@
 AC_SUBST(SOHU_CLIENT_ID, ["$sohu_client_id"])
 AC_SUBST(SOHU_CLIENT_SECRET, ["$sohu_client_secret"])
 
+# Set VK client id
+AC_ARG_WITH(vk-client-id,
+            [AS_HELP_STRING([--with-vk-client-id],
+                            [VK client ID])],
+                            [vk_client_id=$withval],
+                            [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],
@@ -244,6 +252,7 @@
 	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

=== added directory 'data/icons'
=== added file 'data/icons/vk.png'
Binary files data/icons/vk.png	1970-01-01 00:00:00 +0000 and data/icons/vk.png	2016-04-08 12:10:34 +0000 differ
=== added file 'data/providers/vk.provider.in.in'
--- data/providers/vk.provider.in.in	1970-01-01 00:00:00 +0000
+++ data/providers/vk.provider.in.in	2016-04-08 12:10:34 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="vk">
+  <name>VKontakte</name>
+  <icon>vk</icon>
+  <translations>account-plugins</translations>
+  <domains>.*vk\.com</domains>
+
+  <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">oauth.vk.com</setting>
+          <setting name="AuthPath">authorize</setting>
+          <setting name="TokenPath">access_token</setting>
+          <setting name="RedirectUri">https://oauth.vk.com/blank.html</setting>
+          <setting name="ResponseType">token</setting>
+          <setting name="ClientId">@VK_CLIENT_ID@</setting>
+          <setting type="as" name="Scope">['offline']</setting>
+          <setting type="s" name="v">5.50</setting>
+        </group>
+      </group>
+    </group>
+  </template>
+</provider>

=== added file 'debian/account-plugin-vk.install'
--- debian/account-plugin-vk.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-vk.install	2016-04-08 12:10:34 +0000
@@ -0,0 +1,3 @@
+usr/share/accounts/providers/vk.provider
+usr/share/accounts/qml-plugins/vk/Main.qml
+usr/share/icons/hicolor/32x32/apps/vk.png

=== modified file 'debian/control'
--- debian/control	2015-07-23 14:10:26 +0000
+++ debian/control	2016-04-08 12:10:34 +0000
@@ -121,6 +121,13 @@
 Description: GNOME Control Center account plugin for single signon - Instagram
  GNOME Control Center account plugins for single signon
 
+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
+
 Package: account-plugin-tools
 Architecture: all
 Depends: ${misc:Depends},

=== modified file 'debian/rules'
--- debian/rules	2015-07-23 14:10:26 +0000
+++ debian/rules	2016-04-08 12:10:34 +0000
@@ -21,7 +21,8 @@
 		--with-linkedin-consumer-key="34gnzrg96iq5" \
 		--with-linkedin-consumer-secret="BazRki2LE8eZtcqh" \
 		--with-instagram-client-id="01c3df41a2274a14882adea8e8ebbd46" \
-		--with-instagram-client-secret="4751ccdc39c648719ea83cfb1c866c26" 
+		--with-instagram-client-secret="4751ccdc39c648719ea83cfb1c866c26" \
+		--with-vk-client-id="5402699"
 
 override_dh_install:
 	rm -f debian/*/usr/lib/*/*/*.la

=== modified file 'qml/Makefile.am'
--- qml/Makefile.am	2013-06-07 11:56:25 +0000
+++ qml/Makefile.am	2016-04-08 12:10:34 +0000
@@ -2,4 +2,5 @@
 	facebook/Main.qml \
 	flickr/Main.qml \
 	google/Main.qml \
-	twitter/Main.qml
+	twitter/Main.qml \
+	vk/Main.qml

=== added directory 'qml/vk'
=== added file 'qml/vk/Main.qml'
--- qml/vk/Main.qml	1970-01-01 00:00:00 +0000
+++ qml/vk/Main.qml	2016-04-08 12:10:34 +0000
@@ -0,0 +1,36 @@
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+OAuthMain {
+    creationComponent: OAuth {
+        function completeCreation(reply) {
+            console.log("Access token: " + reply.AccessToken)
+            var http = new XMLHttpRequest()
+            var url = "https://api.vk.com/method/users.get?access_token=" + reply.AccessToken + "&fields=nickname,first_name,last_name";
+            http.open("GET", url, true);
+            http.onreadystatechange = function() {
+                if (http.readyState === 4){
+                    if (http.status == 200) {
+                        console.log("ok")
+                        console.log("response text: " + http.responseText)
+                        var response = JSON.parse(http.responseText)
+                        if (response.response && response.response.length > 0) {
+                            var data = response.response[0]
+                            var name = data.first_name + " " + data.last_name
+                            if (data.nickname) {
+                                name += " (" + data.nickname + ")"
+                            }
+                            account.updateDisplayName(name)
+                        }
+                        account.synced.connect(finished)
+                        account.sync()
+                    } else {
+                        console.log("error: " + http.status)
+                        cancel()
+                    }
+                }
+            };
+
+            http.send(null);
+        }
+    }
+}